refactor(timesheet): UI overhaul, better separation of concerns with components, minor chatbot changes

This commit is contained in:
Nic D 2026-03-19 16:16:58 -04:00
parent 57334ed118
commit dcd3a5c188
21 changed files with 364 additions and 425 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -19,8 +19,8 @@
background: #fd4b2d !important;
}
.q-table tbody tr:hover {
background: #00ff260c;
.q-table tbody tr:hover > td {
background-color: var(--q-accent2) !important;
}
body.body--dark {
@ -71,6 +71,6 @@ input[type=number] {
}
.q-field--dark .q-field__control:hover::before, .q-field--outlined .q-field__control:hover::before {
border-color: var(--q-accent);
border-color: var(--q-accent2);
border-width: 2px;
}

View File

@ -15,15 +15,13 @@
$primary : #30303A;
$secondary : #DAE0E7;
$accent : #0c9a3b;
$accent2 : #0a7d32;
$dark-shadow-color : #000000;
$dark-shadow-color : #000;
$elevation-dark-umbra : rgba($dark-shadow-color, 1);
$elevation-dark-penumbra : rgba($dark-shadow-color, 0.75);
$elevation-dark-ambient : rgba($dark-shadow-color, 0.53);
$elevation-dark-umbra : rgba($dark-shadow-color, .2);
$elevation-dark-penumbra : rgba($dark-shadow-color, .14);
$elevation-dark-ambient : rgba($dark-shadow-color, .12);
$dark-shadow-2 : 2px 3px $elevation-dark-umbra, 2px 3px 6px $elevation-dark-penumbra, 2px 3px 14px $elevation-dark-ambient;
$layout-shadow-dark : 0 0 5px 5px rgba($dark-shadow-color, 0.5);
$input-text-color : #455A64;

View File

@ -250,6 +250,7 @@ export default {
name: "name",
lock: "",
unlock: "",
today: "today",
},
misc: {
or: "or",

View File

@ -250,6 +250,7 @@ export default {
name: "nom",
lock: "verrouiller",
unlock: "déverrouiller",
today: "aujourd'hui",
},
misc: {
or: "ou",

View File

@ -8,11 +8,12 @@
import ChatbotDrawer from 'src/modules/chatbot/components/chatbot-drawer.vue';
import { onMounted, watch, ref } from 'vue';
import { setCssVar } from 'quasar';
import { RouterView } from 'vue-router';
import { useUiStore } from 'src/stores/ui-store';
import { useAuthStore } from 'src/stores/auth-store';
setCssVar('accent2', '#36c45a44');
const ui_store = useUiStore();
const auth_store = useAuthStore();
const userPreferences = ref(ui_store.userPreferences);
@ -47,3 +48,13 @@
<FooterBar v-if="!$q.platform.is.mobile" />
</q-layout>
</template>
<style lang="css">
.text-accent2 {
color: '#36c45a44' !important;
}
.bg-accent2 {
background-color: '#36c45a44' !important;
}
</style>

View File

@ -12,7 +12,7 @@
const chatbot_store = useChatbotStore();
const text = ref('');
const is_showing_right_drawer = ref(true);
const isShowingRightDrawer = ref(true);
const drawer_width = ref(85);
const handleSend = async () => {
@ -28,7 +28,7 @@
<template>
<q-drawer
v-model="is_showing_right_drawer"
v-model="isShowingRightDrawer"
overlay
persistent
:width="drawer_width"
@ -82,27 +82,42 @@
<div
v-else
class="row col-auto q-pa-sm self-end"
class="row col-auto q-pa-xs self-end bg-secondary rounded-50"
>
<div class="bg-primary q-pa-xs rounded-50 chatbot-button">
<q-btn
dense
round
icon="las la-robot"
color="accent"
size="2em"
class="shadow-5"
style="pointer-events: auto;"
@click="chatbot_store.is_showing_chatbot = true"
/>
</div>
</div>
</transition>
</q-drawer>
</template>
<style scoped>
<style scoped lang="css">
:deep(.q-drawer) {
background: rgba(0, 0, 0, 0);
overflow: hidden;
pointer-events: none;
}
.chatbot-button {
transform: translateY(-10px);
box-shadow: 0 8px black;
}
.chatbot-button:active {
transform: translateY(-4px);
box-shadow: 0 2px black;
}
.chatbot-button:hover > :first-child {
background-color: var(--q-info) !important;
}
</style>

View File

@ -4,7 +4,6 @@
>
const { route = "" } = defineProps<{
iconImageSource: string,
bgImageSource: string,
name: string,
route?: string,
}>();
@ -16,36 +15,21 @@
<template>
<div
class="full-width cursor-pointer bg-dark shadow-2 rounded-15 q-pa-xs position-relative"
style="border: solid 1px var(--q-accent);"
class="full-width cursor-pointer rounded-50 bg-accent text-white link-btn"
@click="onClickExternalShortcut"
>
<span
v-if="$q.platform.is.mobile"
class="col text-uppercase text-bold text-accent absolute"
style="transform: translate(20px, -20px);"
>
<div class="row items-center q-px-lg q-py-xs rounded-50">
<span class="col text-uppercase text-bold">
{{ name }}
</span>
<div
class="row items-center q-px-lg q-py-sm link-card rounded-10 inset-shadow"
:style="`background-image: url(${bgImageSource}); background-size: ${$q.platform.is.mobile ? 'cover' : 'contain'};`"
>
<q-icon
round
color="dark"
size="md"
:name="`img:${iconImageSource}`"
class="col-auto q-pr-md"
:name="iconImageSource"
class="col-auto"
/>
<span
v-if="!$q.platform.is.mobile"
class="col text-uppercase text-bold"
>
{{ name }}
</span>
</div>
</div>
</template>
@ -54,11 +38,17 @@
scoped
lang="css"
>
.link-card {
background-blend-mode: multiply;
background-position: bottom right;
background-repeat: no-repeat;
background-color: var(--q-dark);
background-size: contain;
.link-btn {
box-shadow: 0 6px rgb(4, 77, 4);
transform: translateY(-6px);
}
.link-btn:hover {
background-color: var(--q-accent2) !important;
}
.link-btn:active {
box-shadow: 0 2px rgb(4, 77, 4);
transform: translateY(2px);
}
</style>

View File

@ -28,28 +28,34 @@
:autoplay="autoplayTimer"
control-color="accent"
control-type="outline"
class="bg-dark fit rounded-15 shadow-18"
class="bg-dark rounded-15 fit shadow-18"
@mouseenter="onCarouselMouseEvent('enter')"
@mouseleave="onCarouselMouseEvent('exit')"
>
<!-- welcome slide -->
<q-carousel-slide
name="welcome"
class="q-pa-none fit"
class="q-pa-none"
>
<div
class="column fit"
:class="$q.platform.is.mobile ? 'no-wrap' : ''"
>
<div class="column fit">
<q-img
src="src/assets/targo_building.png"
position="50% 25%"
fit="cover"
class="col-9"
>
<div class="absolute-bottom text-h6 text-uppercase text-weight-light">
<div class="absolute-bottom text-h5 text-uppercase text-weight-light">
{{ $t('dashboard.carousel.welcome_title') }}
</div>
</q-img>
<div class="col column flex-center q-px-md text-h5 text-weight-light">
<div
class="col column flex-center q-px-md text-weight-light"
:class="$q.platform.is.mobile ? 'text-h6' : 'text-h5'"
>
<span class="col-auto text-center">{{ $t('dashboard.carousel.welcome_message') }}</span>
</div>
</div>
@ -61,19 +67,25 @@
class="q-pa-none cursor-pointer"
@click="$router.push(RouteNames.HELP)"
>
<div class="column fit">
<div
class="column fit"
:class="$q.platform.is.mobile ? 'no-wrap' : ''"
>
<q-img
src="src/assets/targo_help_banner.png"
position="50% 25%"
fit="none"
class="col-9"
>
<div class="absolute-bottom text-h6 text-uppercase text-weight-light">
<div class="absolute-bottom text-h5 text-uppercase text-weight-light">
{{ $t('dashboard.carousel.help_title') }}
</div>
</q-img>
<div class="col column flex-center q-px-md text-h5 text-weight-light">
<div
class="col column flex-center q-px-md text-weight-light"
:class="$q.platform.is.mobile ? 'text-h6' : 'text-h5'"
>
<span class="col-auto text-center">{{ $t('dashboard.carousel.help_message') }}</span>
</div>
</div>

View File

@ -42,8 +42,6 @@
// ========== methods ========================================
// const timesheetRows = computed(() => timesheetStore.timesheets);
const addNewShift = (day_shifts: Shift[], date: string, timesheet_id: number) => {
uiStore.focusNextComponent = true;
const newShift = new Shift;
@ -52,14 +50,6 @@
day_shifts.push(newShift);
};
const deleteUnsavedShift = (timesheet_index: number, day_index: number) => {
if (timesheetStore.timesheets !== undefined) {
const day = timesheetStore.timesheets[timesheet_index]!.days[day_index]!;
const shifts_without_deleted_shift = day.shifts.filter(shift => shift.id !== 0);
day.shifts = shifts_without_deleted_shift;
}
};
const getDayApproval = (day: TimesheetDay) => {
if (day.shifts.length < 1) return false;
return day.shifts.every(shift => shift.is_approved === true);
@ -101,7 +91,7 @@
:class="$q.platform.is.mobile ? 'column no-wrap q-pb-lg' : 'row'"
>
<div
v-for="timesheet, timesheet_index of timesheetStore.timesheets"
v-for="timesheet of timesheetStore.timesheets"
:key="timesheet.timesheet_id"
class="no-wrap"
:class="$q.platform.is.mobile ? 'col-auto column' : 'col column fit items-center'"
@ -182,13 +172,10 @@
class="q-pa-none transparent"
>
<ShiftListDay
outlined
v-model="timesheet.days[day_index]!"
:timesheet-id="timesheet.timesheet_id"
:week-day-index="day_index"
:animation-delay-multiplier="day_index"
:approved="(getDayApproval(day) || timesheet.is_approved)"
:day="day"
@delete-unsaved-shift="deleteUnsavedShift(timesheet_index, day_index)"
:timesheet-approved="timesheet.is_approved"
/>
</q-card-section>
@ -226,13 +213,11 @@
/>
<ShiftListDay
v-model="timesheet.days[day_index]!"
:timesheet-id="timesheet.timesheet_id"
:week-day-index="day_index"
:day="day"
:holiday="timesheetStore.federal_holidays.some(holiday => holiday.date === day.date)"
:approved="getDayApproval(day) || timesheet.is_approved"
:approved="timesheet.is_approved"
class="col"
@delete-unsaved-shift="deleteUnsavedShift(timesheet_index, day_index)"
/>
</div>

View File

@ -8,10 +8,11 @@
const q = useQuasar();
const { extractDate } = date;
const { displayDate, dense = false, approved = false} = defineProps<{
const { displayDate, dense = false, approved = false } = defineProps<{
displayDate: string;
dense?: boolean;
approved?: boolean;
today?: boolean;
}>();
const date_font_size = computed(() => dense ? '1.5em' : '2.5em');
@ -26,21 +27,31 @@
class="column flex-center rounded-10 text-center self-center bg-transparent"
:style="date_box_size"
>
<span
v-if="today"
class="absolute-top-left text-uppercase text-weight-bolder q-pt-xs bordered-text"
style="transform: translate(20px, -8px);"
>
{{ $t('shared.label.today') }}
</span>
<span
v-if="!dense"
class="col-auto text-uppercase text-weight-bold"
:class="approved ? 'text-white' : ''"
:style="'font-size: ' + weekday_font_size"
>
{{ $d(display_date, { weekday: $q.platform.is.mobile ? 'short' : 'long'}) }}
{{ $d(display_date, { weekday: $q.platform.is.mobile ? 'short' : 'long' }) }}
</span>
<span
class="col-auto text-weight-bolder"
:class="approved ? 'text-white' : ''"
:class="today ? 'text-info' : (approved ? 'text-white' : '')"
:style="'font-size: ' + date_font_size + '; line-height: 90% !important;'"
>
{{ display_date.getDate() }}
</span>
<span
class="col-auto text-uppercase text-weight-bold"
:class="approved ? 'text-white' : ''"
@ -50,3 +61,13 @@
</span>
</div>
</template>
<style
scoped
lang="css"
>
.bordered-text {
text-shadow: 2px 0 var(--q-dark), -2px 0 var(--q-dark), 0 2px var(--q-dark), 0 -2px var(--q-dark),
1px 1px var(--q-dark), -1px -1px var(--q-dark), 1px -1px var(--q-dark), -1px 1px var(--q-dark);
}
</style>

View File

@ -3,73 +3,129 @@
lang="ts"
>
import ShiftListDayRow from 'src/modules/timesheets/components/shift-list-day-row.vue';
import ShiftListDayRowMobile from 'src/modules/timesheets/components/mobile/shift-list-day-row-mobile.vue';
import ShiftListDateWidget from 'src/modules/timesheets/components/shift-list-date-widget.vue';
import { inject, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { computed, inject, ref } from 'vue';
import { useUiStore } from 'src/stores/ui-store';
import { useTimesheetStore } from 'src/stores/timesheet-store';
import { useShiftApi } from 'src/modules/timesheets/composables/use-shift-api';
import { useTimesheetApi } from 'src/modules/timesheets/composables/use-timesheet-api';
import { isShiftOverlap } from 'src/modules/timesheets/utils/shift.util';
import type { Shift } from 'src/modules/timesheets/models/shift.models';
import { Shift } from 'src/modules/timesheets/models/shift.models';
import type { TimesheetDay } from 'src/modules/timesheets/models/timesheet.models';
// ================== State ==================
// ========== Constants ========================================
const { timesheetId, weekDayIndex, day, dense = false, approved = false, holiday = false } = defineProps<{
const CURRENT_DATE_STRING = new Date().toISOString().slice(0, 10);
// ========== State ========================================
const day = defineModel<TimesheetDay>({ required: true });
const { timesheetId, weekDayIndex, timesheetApproved = false } = defineProps<{
timesheetId: number;
weekDayIndex: number;
day: TimesheetDay;
dense?: boolean;
approved?: boolean;
holiday?: boolean;
timesheetApproved?: boolean;
}>();
const emit = defineEmits<{
'deleteUnsavedShift': [void];
}>();
const shift_api = useShiftApi();
const timesheet_api = useTimesheetApi();
const timesheet_store = useTimesheetStore();
const preset_mouseover = ref(false);
const shift_error_message = ref<string | undefined>();
const { locale } = useI18n();
const uiStore = useUiStore();
const shiftApi = useShiftApi();
const timesheetApi = useTimesheetApi();
const timesheetStore = useTimesheetStore();
const presetMouseover = ref(false);
const shiftErrorMessage = ref<string | undefined>();
const employeeEmail = inject<string>('employeeEmail');
// ========== Computed ========================================
const isDayApproved = computed(() => day.value.shifts.length > 0 && day.value.shifts.every(
shift => shift.is_approved === true));
const isHoliday = computed(() => timesheetStore.federal_holidays.some(
holiday => holiday.date === day.value.date));
const isToday = computed(() => CURRENT_DATE_STRING === day.value.date);
// ================== Methods ==================
const deleteCurrentShift = async (shift: Shift) => {
if (shift.id <= 0) {
shift.id = 0;
emit('deleteUnsavedShift');
} else {
await shift_api.deleteShiftById(shift.id, employeeEmail);
}
const addNewShift = () => {
uiStore.focusNextComponent = true;
const newShift = new Shift(day.value.date);
newShift.timesheet_id = timesheetId;
day.value.shifts.push(newShift);
};
if (day.shifts.length < 2 && shift_error_message.value !== undefined) {
const deleteCurrentShift = async (shiftId: number, index: number) => {
if (shiftId <= 0)
day.value.shifts.splice(index, 1);
else
await shiftApi.deleteShiftById(shiftId, employeeEmail);
if (day.value.shifts.length < 2 && shiftErrorMessage.value !== undefined) {
onTimeFieldBlur();
}
};
const onTimeFieldBlur = () => {
const is_error = isShiftOverlap(day.shifts);
day.shifts.map(shift => shift.has_error = is_error);
const is_error = isShiftOverlap(day.value.shifts);
day.value.shifts.map(shift => shift.has_error = is_error);
if (is_error)
shift_error_message.value = 'timesheet.errors.SHIFT_OVERLAP_SHORT';
shiftErrorMessage.value = 'timesheet.errors.SHIFT_OVERLAP_SHORT';
else
shift_error_message.value = undefined;
shiftErrorMessage.value = undefined;
}
const onClickApplyDailyPreset = async () => {
await timesheet_api.applyPreset(timesheetId, weekDayIndex, day.date, employeeEmail);
await timesheetApi.applyPreset(timesheetId, weekDayIndex, day.value.date, employeeEmail);
}
const getHolidayName = (date: string) => {
const holiday = timesheetStore.federal_holidays.find(holiday => holiday.date === date);
if (!holiday) return;
if (locale.value === 'fr-FR')
return holiday.nameFr;
else if (locale.value === 'en-CA')
return holiday.nameEn;
};
</script>
<template>
<div class="row fit rounded-10 ellipsis no-wrap">
<!-- optional label indicating which holiday if today is a holiday -->
<span
v-if="isHoliday"
class="absolute-top-left text-uppercase text-weight-bolder text-purple-5"
style="transform: translate(25px, -7px);"
>
{{ getHolidayName(day.date) }}
</span>
<div
class="column justify-center q-py-xs"
:class="approved ? '' : ''"
@mouseenter="preset_mouseover = true"
@mouseleave="preset_mouseover = false"
class="col"
:class="isToday ? 'z-top' : 'shadow-12'"
:style="isHoliday ? 'border: 2px solid #ab47bc' : ''"
>
<div
class="col row fit"
:class="(isDayApproved || timesheetApproved) ? (isHoliday ? 'bg-purple-5' : 'bg-accent') : 'bg-dark'"
>
<!-- Date block -->
<ShiftListDateWidget
:display-date="day.date"
:approved="isDayApproved || timesheetApproved"
:today="isToday"
class="col-auto"
/>
<div
class="col column justify-center q-py-xs full-width"
@mouseenter="presetMouseover = true"
@mouseleave="presetMouseover = false"
>
<!-- Button to apply preset to day -->
<transition
@ -78,7 +134,7 @@
leave-active-class="animated zoomOut fast"
>
<q-btn
v-if="!$q.platform.is.mobile && day.shifts.length < 1 && preset_mouseover && timesheet_store.has_timesheet_preset"
v-if="!$q.platform.is.mobile && day.shifts.length < 1 && presetMouseover && timesheetStore.has_timesheet_preset"
:disable="day.shifts.length > 0"
flat
dense
@ -97,33 +153,45 @@
</transition>
<div
v-for="shift, shift_index in day.shifts"
:key="shift_index"
v-for="shift, shiftIndex in day.shifts"
:key="shiftIndex"
class="col-auto"
>
<ShiftListDayRowMobile
v-if="$q.platform.is.mobile"
v-model:shift="day.shifts[shift_index]!"
:is-timesheet-approved="approved"
:error-message="shift_error_message"
:dense="dense"
:current-shifts="day.shifts"
:has-shift-after="shift_index < day.shifts.length - 1"
@request-delete="deleteCurrentShift(shift)"
@on-time-field-blur="onTimeFieldBlur()"
/>
<ShiftListDayRow
v-else
v-model:shift="day.shifts[shift_index]!"
:holiday="holiday"
v-model:shift="day.shifts[shiftIndex]!"
:holiday="isHoliday"
:current-shifts="day.shifts"
:is-timesheet-approved="approved"
:error-message="shift_error_message"
@request-delete="deleteCurrentShift(shift)"
:is-timesheet-approved="timesheetApproved"
:error-message="shiftErrorMessage"
@request-delete="deleteCurrentShift(shift.id, shiftIndex)"
@on-time-field-blur="onTimeFieldBlur()"
/>
</div>
</div>
<div class="col-auto self-stretch">
<q-icon
v-if="(isDayApproved || timesheetApproved)"
name="verified"
color="white"
size="xl"
class="full-height"
:class="(isDayApproved || timesheetApproved) ? (isHoliday ? 'bg-purple-5' : 'bg-accent') : ''"
/>
<q-btn
v-else
:dense="!$q.platform.is.mobile"
square
icon="more_time"
size="lg"
:color="isHoliday ? 'purple-5' : 'accent'"
text-color="white"
class="full-height"
@click="addNewShift"
/>
</div>
</div>
</div>
</div>
</template>

View File

@ -3,6 +3,7 @@
lang="ts"
>
import ShiftList from 'src/modules/timesheets/components/shift-list.vue';
import ShiftListMobile from 'src/modules/timesheets/components/mobile/shift-list-mobile.vue';
import { computed, ref } from 'vue';
import { useTimesheetStore } from 'src/stores/timesheet-store';
@ -66,7 +67,12 @@
</div>
<!-- Else show timesheets if found -->
<ShiftList @on-current-day-component-found="onTodayComponentFound" />
<ShiftListMobile
v-else-if="$q.platform.is.mobile"
@on-current-day-component-found="onTodayComponentFound"
/>
<ShiftList v-else />
</q-scroll-area>
<q-page-sticky

View File

@ -44,7 +44,7 @@
class="col row full-width"
>
<span class="col-auto text-uppercase text-caption text-bold text-accent">
{{ $t(`timesheet_approvals.table.weekly_hours_${index + 1}`) }}
{{ $t(`timesheet_approvals.table.weekly_hours_${index + 1}`) }}:
</span>
<span class="col text-right">{{ getHoursMinutesStringFromHoursFloat(hours) }}</span>

View File

@ -3,16 +3,12 @@
lang="ts"
>
import ShiftListDay from 'src/modules/timesheets/components/shift-list-day.vue';
import ShiftListDateWidget from 'src/modules/timesheets/components/shift-list-date-widget.vue';
import { date, useQuasar } from 'quasar';
import { ref, computed, watch, onMounted, inject } from 'vue';
import { useUiStore } from 'src/stores/ui-store';
import { useQuasar } from 'quasar';
import { ref, computed, watch, inject, onMounted } from 'vue';
import { useTimesheetStore } from 'src/stores/timesheet-store';
import { Shift } from 'src/modules/timesheets/models/shift.models';
import { useTimesheetApi } from 'src/modules/timesheets/composables/use-timesheet-api';
import type { TimesheetDay } from 'src/modules/timesheets/models/timesheet.models';
import { useI18n } from 'vue-i18n';
import { TimesheetDayDisplay } from 'src/modules/timesheets/models/timesheet.models';
// ========== constants ========================================
@ -25,59 +21,31 @@
}>();
const q = useQuasar();
const { extractDate } = date;
const { locale } = useI18n();
const uiStore = useUiStore();
const timesheetApi = useTimesheetApi();
const timesheetStore = useTimesheetStore();
const mobileAnimationDirection = ref('fadeInLeft');
const currentDayComponent = ref<HTMLElement[] | null>(null);
const currentDayComponentWatcher = ref(currentDayComponent);
const employeeEmail = inject<string>('employeeEmail');
// ========== computed ========================================
const animationStyle = computed(() => q.platform.is.mobile ? mobileAnimationDirection.value : 'fadeInDown');
const timesheetRows = computed(() => {
if (timesheetStore.is_loading) return [];
const rows: TimesheetDayDisplay[][] = Array.from({ length: 7 }, () => []);
timesheetStore.timesheets.flatMap(timesheet => timesheet.days.forEach((day, index) => {
rows[index]!.push(new TimesheetDayDisplay(timesheet, day));
}));
return rows;
});
const isShowingWeeklyPresets = computed(() => timesheetStore.timesheets.some(
timesheet => timesheet.days.every(day => day.shifts.length < 1)
) && timesheetStore.has_timesheet_preset);
// ========== methods ========================================
const addNewShift = (day_shifts: Shift[], date: string, timesheet_id: number) => {
uiStore.focusNextComponent = true;
const newShift = new Shift;
newShift.date = date;
newShift.timesheet_id = timesheet_id;
day_shifts.push(newShift);
};
const deleteUnsavedShift = (timesheet_index: number, day_index: number) => {
if (timesheetStore.timesheets !== undefined) {
const day = timesheetStore.timesheets[timesheet_index]!.days[day_index]!;
const shifts_without_deleted_shift = day.shifts.filter(shift => shift.id !== 0);
day.shifts = shifts_without_deleted_shift;
}
};
const getDayApproval = (day: TimesheetDay) => {
if (day.shifts.length < 1) return false;
return day.shifts.every(shift => shift.is_approved === true);
};
const getMobileDayRef = (iso_date_string: string): string => {
return iso_date_string === CURRENT_DATE_STRING ? 'currentDayComponent' : '';
};
const getHolidayName = (date: string) => {
const holiday = timesheetStore.federal_holidays.find(holiday => holiday.date === date);
if (!holiday) return;
if (locale.value === 'fr-FR')
return holiday.nameFr;
else if (locale.value === 'en-CA')
return holiday.nameEn;
};
const onClickApplyWeeklyPreset = async (timesheet_id: number) => {
await timesheetApi.applyPreset(timesheet_id, undefined, undefined, employeeEmail);
}
@ -95,191 +63,57 @@
<template>
<div
class="fit"
:class="$q.platform.is.mobile ? 'column no-wrap q-pb-lg' : 'row'"
:key="timesheetStore.is_loading ? 0 : 1"
class="fit column no-wrap q-pb-lg"
:class="$q.platform.is.mobile ? '' : ''"
>
<div
v-for="timesheet, timesheet_index of timesheetStore.timesheets"
:key="timesheet.timesheet_id"
class="no-wrap"
:class="$q.platform.is.mobile ? 'col-auto column' : 'col column fit items-center'"
v-if="isShowingWeeklyPresets"
class="row flex-center q-py-xs"
>
<transition
appear
enter-active-class="animated fadeInDown"
leave-active-class="animated fadeOutUp"
<div
v-for="timesheet, timesheetIndex in timesheetStore.timesheets"
:key="timesheetIndex"
class="col row flex-center full-width"
>
<q-btn
v-if="!$q.platform.is.mobile && timesheet.days.every(day => day.shifts.length < 1) && timesheetStore.has_timesheet_preset"
:disable="!timesheet.days.every(day => day.shifts.length < 1)"
flat
outline
dense
:label="$t('timesheet.apply_preset_week')"
class="col-auto text-uppercase text-weight-bold text-accent q-mx-lg q-py-none rounded-5"
@click="onClickApplyWeeklyPreset(timesheet.timesheet_id)"
>
<q-icon
name="las la-calendar-week"
color="accent"
size="md"
icon="schedule_send"
:label="$t('timesheet.apply_preset_week')"
class="text-uppercase text-weight-bold q-px-xl q-py-xs rounded-50"
:class="timesheet.days.every(day => day.shifts.length < 1) ? '' : 'invisible'"
@click="onClickApplyWeeklyPreset(timesheet.timesheet_id)"
/>
</q-btn>
</transition>
</div>
</div>
<transition-group
appear
:enter-active-class="`animated ${animationStyle}`"
enter-active-class="animated fadeInDown"
>
<div
v-for="day, day_index in timesheet.days"
:key="day.date"
:ref="getMobileDayRef(day.date)"
class="col-auto row q-pa-sm full-width relative-position"
:style="`animation-delay: ${day_index / 15}s;`"
v-for="row, rowIndex of timesheetRows"
:key="JSON.stringify(row)"
class="col-auto row items-stretch"
:style="`animation-delay: ${rowIndex / 10}s;`"
>
<!-- optional label indicating which holiday if today is a holiday -->
<span
v-if="timesheetStore.federal_holidays.some(holiday => holiday.date === day.date)"
class="absolute-top-left text-uppercase text-weight-bolder text-purple-5"
style="transform: translate(25px, -7px);"
>
{{ getHolidayName(day.date) }}
</span>
<!-- mobile version in portrait mode -->
<div
v-if="$q.platform.is.mobile && ($q.screen.width < $q.screen.height)"
class="col-auto full-width q-px-md q-py-sm"
>
<q-card
class="shadow-12"
:class="(getDayApproval(day) || timesheet.is_approved) ? 'bg-accent rounded-10' : 'bg-dark mobile-rounded-10'"
>
<q-card-section
class="text-weight-bolder text-uppercase text-h6 q-py-sm text-center relative-position"
:class="(getDayApproval(day) || timesheet.is_approved) ? 'bg-accent text-white' : 'bg-primary text-white'"
style="line-height: 1em;"
>
<span> {{ $d(extractDate(day.date, 'YYYY-MM-DD'), {
weekday: 'long', day: 'numeric', month:
'long'
}) }}</span>
<q-icon
v-if="(getDayApproval(day) || timesheet.is_approved)"
name="verified"
size="3em"
color="white"
class="absolute-top-left z-top"
style="top: -0.2em; left: 0px;"
/>
</q-card-section>
<q-card-section
v-if="day.shifts.filter(shift => shift.id !== 0).length > 0"
class="q-pa-none transparent"
v-for="day, dayIndex in row"
:key="day.day.date"
class="col row items-stretch q-pa-sm relative-position"
:class="day.day.date === CURRENT_DATE_STRING ? 'bg-info rounded-15 shadow-6' : ''"
>
<ShiftListDay
outlined
:timesheet-id="timesheet.timesheet_id"
:week-day-index="day_index"
:animation-delay-multiplier="day_index"
:approved="(getDayApproval(day) || timesheet.is_approved)"
:day="day"
@delete-unsaved-shift="deleteUnsavedShift(timesheet_index, day_index)"
v-model="row[dayIndex]!.day"
:week-day-index="dayIndex"
:timesheet-id="day.timesheetId"
:timesheet-approved="day.isTimesheetApproved"
/>
</q-card-section>
<q-card-section class="q-pa-none">
<q-btn
v-if="!(getDayApproval(day) || timesheet.is_approved)"
square
dense
size="xl"
color="accent"
icon="more_time"
class="full-width"
style="border-radius: 0 0 10px 10px;"
@click="addNewShift(day.shifts, day.date, timesheet.timesheet_id)"
/>
</q-card-section>
</q-card>
</div>
<!-- desktop version -->
<div
v-else
class="col row full-width rounded-10 ellipsis shadow-10"
:style="timesheetStore.federal_holidays.some(holiday => holiday.date === day.date) ? 'border: 2px solid #ab47bc' : ''"
>
<div
class="col row"
:class="(getDayApproval(day) || timesheet.is_approved) ? (timesheetStore.federal_holidays.some(holiday => holiday.date === day.date) ? 'bg-purple-5' : 'bg-accent') : 'bg-dark'"
>
<!-- Date block -->
<ShiftListDateWidget
:display-date="day.date"
:approved="(getDayApproval(day) || timesheet.is_approved)"
class="col-auto"
/>
<ShiftListDay
:timesheet-id="timesheet.timesheet_id"
:week-day-index="day_index"
:day="day"
:holiday="timesheetStore.federal_holidays.some(holiday => holiday.date === day.date)"
:approved="getDayApproval(day) || timesheet.is_approved"
class="col"
@delete-unsaved-shift="deleteUnsavedShift(timesheet_index, day_index)"
/>
</div>
<div class="col-auto self-stretch">
<q-icon
v-if="(getDayApproval(day) || timesheet.is_approved)"
name="verified"
color="white"
size="xl"
class="full-height"
:class="(getDayApproval(day) || timesheet.is_approved) ? (timesheetStore.federal_holidays.some(holiday => holiday.date === day.date) ? 'bg-purple-5' : 'bg-accent') : ''"
/>
<q-btn
v-else
:dense="!$q.platform.is.mobile"
square
icon="more_time"
size="lg"
:color="timesheetStore.federal_holidays.some(holiday => holiday.date === day.date) ? 'purple-5' : 'accent'"
text-color="white"
class="full-height"
:class="$q.platform.is.mobile ? 'q-px-xs' : ''"
@click="addNewShift(day.shifts, day.date, timesheet.timesheet_id)"
/>
</div>
</div>
</div>
</transition-group>
</div>
</div>
</template>
<style
scoped
lang="scss"
>
@each $size in (1, 2, 3, 4, 5, 10, 15, 20, 25, 50, 75, 100, 200) {
.mobile-rounded-#{$size} {
border-radius: #{$size}px !important;
}
.mobile-rounded-#{$size}>div:first-child {
border-radius: #{$size}px #{$size}px 0 0 !important;
}
.mobile-rounded-#{$size}>div:last-child {
border-radius: 0 0 #{$size}px #{$size}px !important;
}
}
</style>

View File

@ -27,10 +27,10 @@ export class Shift {
is_remote: boolean;
has_error: boolean;
constructor() {
constructor(date?: string) {
this.id = -1;
this.timesheet_id = -1;
this.date = '';
this.date = date ?? '';
this.type = 'REGULAR';
this.start_time = '';
this.end_time = '';

View File

@ -45,7 +45,14 @@ export interface TotalExpenses {
mileage: number;
}
export interface TimesheetDayDisplay extends TimesheetDay {
timesheet_id: number;
i18WeekdayKey: string;
export class TimesheetDayDisplay {
timesheetId: number;
isTimesheetApproved: boolean;
day: TimesheetDay;
constructor(timesheet: Timesheet, day: TimesheetDay) {
this.timesheetId = timesheet.timesheet_id;
this.isTimesheetApproved = timesheet.is_approved;
this.day = day;
}
}

View File

@ -12,67 +12,57 @@
class="q-pa-md justify-center items-stretch bg-secondary"
:class="$q.platform.is.mobile ? 'column' : 'row'"
>
<!-- center column -->
<!-- left column -->
<div class="column col items-center q-pa-md">
<div class="col-8 fit q-py-md">
<div class="col q-py-md">
<MainCarousel />
</div>
</div>
<!-- right column -->
<div class="column col-lg-4 items-center" :class="$q.platform.is.mobile ? 'q-px-md' : 'q-px-xl'">
<span
v-if="!$q.platform.is.mobile"
class="col-auto text-uppercase text-weight-bold self-start q-px-md q-pt-lg"
<div
class="column col-xs-12 col-md-4 col-lg-3 items-center"
:class="$q.platform.is.mobile ? 'q-px-md' : 'q-px-xl'"
>
<span class="col-auto text-uppercase text-weight-bold self-start q-px-md q-pt-lg">
{{ $t('dashboard.useful_links') }}
</span>
<div class="col-auto full-width"
:class="$q.platform.is.mobile ? 'q-py-md' : 'q-py-sm'">
<div class="col-auto full-width q-py-sm">
<ShortcutCard
icon-image-source="src/assets/links/logo_gmail.png"
bg-image-source="src/assets/links/google_bg.png"
icon-image-source="img:src/assets/links/logo_gmail.png"
name="Messagerie"
route="https://mail.google.com/mail/u/0/#inbox"
/>
</div>
<div class="col-auto full-width"
:class="$q.platform.is.mobile ? 'q-py-md' : 'q-py-sm'">
<div class="col-auto full-width q-py-sm">
<ShortcutCard
icon-image-source="src/assets/links/facturation-transparent.png"
bg-image-source="src/assets/links/facturation_bg.png"
icon-image-source="img:src/assets/links/facturation-transparent.png"
name="Facturation"
route="https://facturation.targo.ca/facturation/accueil.php?menu=ticket_open"
/>
</div>
<div class="col-auto full-width"
:class="$q.platform.is.mobile ? 'q-py-md' : 'q-py-sm'">
<div class="col-auto full-width q-py-sm">
<ShortcutCard
icon-image-source="src/assets/links/map-icon.png"
bg-image-source="src/assets/links/map_targo_banner.png"
icon-image-source="location_on"
name="Map Targo"
route="https://map.targointernet.com/infrastructure/map"
/>
</div>
<div class="col-auto full-width"
:class="$q.platform.is.mobile ? 'q-py-md' : 'q-py-sm'">
<div class="col-auto full-width q-py-sm">
<ShortcutCard
icon-image-source="src/assets/links/hydroQC_icon.png"
bg-image-source="src/assets/links/hydroQC_bg.png"
icon-image-source="img:src/assets/links/hydroQC_icon.png"
name="Info Pannes"
route="https://infopannes.solutions.hydroquebec.com/info-pannes/pannes/pannes-en-cours"
/>
</div>
<div class="col-auto full-width"
:class="$q.platform.is.mobile ? 'q-py-md' : 'q-py-sm'">
<div class="col-auto full-width q-py-sm">
<ShortcutCard
icon-image-source="src/assets/links/intranet_logo.png"
bg-image-source="src/assets/links/intranet_targo_bg.png"
icon-image-source="language"
name="Intranet"
route="https://intranet.facturation.targo.ca/"
/>