diff --git a/quasar.config.ts b/quasar.config.ts index bc19cb6..93d749d 100644 --- a/quasar.config.ts +++ b/quasar.config.ts @@ -127,6 +127,8 @@ export default defineConfig((ctx) => { // animations: 'all', // --- includes all animations // https://v2.quasar.dev/options/animations animations: [ + 'fadeIn', + 'fadeOut', 'fadeInUp', 'zoomIn', 'zoomOut', diff --git a/src/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts index 94335df..58be958 100644 --- a/src/i18n/en-ca/index.ts +++ b/src/i18n/en-ca/index.ts @@ -297,6 +297,7 @@ export default { }, timeSheetValidations: { tableColumnLabelFullname: 'Full name', + tableColumnLabelEmail: 'email address', tableColumnLabelRegularHours: 'regular hours', tableColumnLabelEveningHours: 'evening', tableColumnLabelEmergencyHours: 'emergency', @@ -326,10 +327,8 @@ export default { consumedVacationTotalValidation: 'Consumed with vacation must be positive.', maxVacationPerYearValidation: 'Max Vacation Per Year must be positive.', resteVacationTotal: 'Rest of vacation', - validateToolTip: 'Validate', - unvalidateToolTip: 'Unvalidate', - lockToolTip: 'Lock the week', - unlockToolTip: 'Unlock the week', + tooltipTimeline: 'Daily breakdown', + tooltipTimesheet: 'Open timesheet', }, shiftColumns: { title: 'Shifts', diff --git a/src/i18n/fr-ca/index.ts b/src/i18n/fr-ca/index.ts index 8c5005a..c897ff9 100644 --- a/src/i18n/fr-ca/index.ts +++ b/src/i18n/fr-ca/index.ts @@ -347,6 +347,7 @@ export default { }, timeSheetValidations: { tableColumnLabelFullname: 'nom complet', + tableColumnLabelEmail: 'courriel', tableColumnLabelRegularHours: 'heures régulières', tableColumnLabelEveningHours: 'soir', tableColumnLabelEmergencyHours: 'urgence', @@ -373,10 +374,8 @@ export default { consumedVacationTotalValidation: 'Vacances utilisées doit être positif', maxVacationPerYearValidation: 'Maximum vacances annuel doit être positif.', resteVacationTotal: 'Reste des vacances', - validateToolTip: 'Valider', - unvalidateToolTip: 'Invalider', - lockToolTip: 'Verrouiller la semaine', - unlockToolTip: 'Déverrouiller la semaine', + tooltipTimeline: 'Vue journalière', + tooltipTimesheet: 'Feuille de temps', }, usersListPage: { tableHeader: 'Répertoire du personnel', diff --git a/src/modules/employee-list/types/employee-profile-interface.ts b/src/modules/employee-list/types/employee-profile-interface.ts index 9285c85..8c861d8 100644 --- a/src/modules/employee-list/types/employee-profile-interface.ts +++ b/src/modules/employee-list/types/employee-profile-interface.ts @@ -5,7 +5,7 @@ export interface EmployeeProfile { company_name: number; job_title: string; email: string; - phone_number: number; + phone_number: string; first_work_day: string; last_work_day: string; residence: string; diff --git a/src/modules/timesheet-approval/components/shifts/shift-preview-bar.vue b/src/modules/timesheet-approval/components/shifts/shift-preview-bar.vue new file mode 100644 index 0000000..398bff9 --- /dev/null +++ b/src/modules/timesheet-approval/components/shifts/shift-preview-bar.vue @@ -0,0 +1,147 @@ + + + + + + \ No newline at end of file diff --git a/src/modules/timesheet-approval/components/timesheet-approval-employee-details.vue b/src/modules/timesheet-approval/components/timesheet-approval-employee-details.vue new file mode 100644 index 0000000..2be8472 --- /dev/null +++ b/src/modules/timesheet-approval/components/timesheet-approval-employee-details.vue @@ -0,0 +1,111 @@ + + + \ No newline at end of file diff --git a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue index 003716a..a556b7e 100644 --- a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue +++ b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list-item.vue @@ -1,30 +1,70 @@