Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(PWA): green color for present days now shows up in the attendance calendar #2400

Merged
merged 2 commits into from
Nov 8, 2024
Merged

fix(PWA): green color for present days now shows up in the attendance calendar #2400

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7abf2fd
fix: green color for present days now shows up in the attendance cale…
asmitahase Nov 8, 2024
b4087ce
fix: 1. removed dynamic class names for attendance colours
asmitahase Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions frontend/src/components/AttendanceCalendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<div v-for="index in firstOfMonth.endOf('M').get('D')">
<div
class="h-8 w-8 flex rounded-full mx-auto"
:class="getEventOnDate(index) && `bg-${colorMap[getEventOnDate(index)]}`"
:class="getEventOnDate(index) && colorMap[getEventOnDate(index)]"
>
<span class="text-gray-800 text-sm font-medium m-auto">
{{ index }}
Expand All @@ -47,7 +47,7 @@
<div class="grid grid-cols-4 mx-2">
<div v-for="status in summaryStatuses" class="flex flex-col gap-1">
<div class="flex flex-row gap-1 items-center">
<span class="rounded full h-3 w-3" :class="`bg-${colorMap[status]}`" />
<span class="rounded full h-3 w-3" :class="colorMap[status]" />
<span class="text-gray-600 text-sm font-medium leading-5"> {{ __(status) }} </span>
</div>
<span class="text-gray-800 text-base font-semibold leading-6 mx-auto">
Expand All @@ -69,12 +69,12 @@ const __ = inject("$translate")
const firstOfMonth = ref(dayjs().date(1).startOf("D"))

const colorMap = {
Present: "green-200",
"Work From Home": "green-200",
"Half Day": "yellow-100",
Absent: "red-100",
"On Leave": "blue-100",
Holiday: "gray-100",
Present: "bg-green-300",
"Work From Home": "bg-green-300",
"Half Day": "bg-yellow-200",
Absent: "bg-red-200",
"On Leave": "bg-blue-300",
Holiday: "bg-gray-300",
}

// __("Present"), __("Half Day"), __("Absent"), __("On Leave"), __("Work From Home")
Expand Down
Loading