diff --git a/src/assets/ChromeSetup.exe b/src/assets/ChromeSetup.exe new file mode 100644 index 0000000..0b6a558 Binary files /dev/null and b/src/assets/ChromeSetup.exe differ diff --git a/src/assets/approvals-banner.png b/src/assets/approvals-banner.png new file mode 100644 index 0000000..2c5bbb3 Binary files /dev/null and b/src/assets/approvals-banner.png differ diff --git a/src/assets/event-banner.png b/src/assets/event-banner.png new file mode 100644 index 0000000..801ed06 Binary files /dev/null and b/src/assets/event-banner.png differ diff --git a/src/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts index 6e74dec..fce462c 100644 --- a/src/i18n/en-ca/index.ts +++ b/src/i18n/en-ca/index.ts @@ -23,6 +23,7 @@ export default { clearFilter: 'Clear filter', }, navBar: { + userMenuHome: 'Homepage', userMenuEmployeeList: 'Employee list', userMenuShiftValidation: 'Timesheet Approval', userMenuProfile: 'Profile', @@ -301,12 +302,12 @@ export default { tableColumnLabelMileage: 'of mileage', actionTitle: 'Please save the changes made.', actionButton: 'Save', - timeSheetStatusVerified: 'Verified', - timeSheetStatusUnverified: 'Unverified', - timeSheetStatus_partial: 'Partial', - timeSheetStatus_complete: 'Complete', - timeSheetStatus_empty: 'Empty', - timeSheetStatus_blocked: 'Blocked', + timeSheetStatusVerified: 'approved', + timeSheetStatusUnverified: 'pending', + timeSheetStatusPartial: 'partially approved', + timeSheetStatusComplete: 'complete', + timeSheetStatusEmpty: 'empty', + timeSheetStatusBlocked: 'blocked', showAllCheckbox: 'Show all', accumulatedSicknessTotal: 'Accumulated illnesses', consumedSicknessTotal: 'Consumed with illnesses', diff --git a/src/i18n/fr-ca/index.ts b/src/i18n/fr-ca/index.ts index 9c61ea5..7f9db97 100644 --- a/src/i18n/fr-ca/index.ts +++ b/src/i18n/fr-ca/index.ts @@ -162,6 +162,7 @@ export default { clearFilter: 'Effacer le filtre', }, navBar: { + userMenuHome: 'Accueil', userMenuEmployeeList: 'Liste employés', userMenuShiftValidation: 'Valider les heures', userMenuProfile: 'Profil', @@ -347,12 +348,12 @@ export default { tableColumnLabelMileage: 'de kilométrage', actionTitle: 'Veuillez enregistrer les changements effectués.', actionButton: 'Enregistrer', - timeSheetStatusVerified: 'Vérifié', - timeSheetStatusUnverified: 'Invérifié', - timeSheetStatus_partial: 'Partiel', - timeSheetStatus_complete: 'Complet', - timeSheetStatus_empty: 'Vide', - timeSheetStatus_blocked: 'Bloqué', + timeSheetStatusVerified: 'validé', + timeSheetStatusUnverified: 'à valider', + timeSheetStatusPartial: 'partiellement validé', + timeSheetStatusComplete: 'complet', + timeSheetStatusEmpty: 'vide', + timeSheetStatusBlocked: 'bloqué', showAllCheckbox: 'Afficher tous', accumulatedSicknessTotal: 'Accumulées de maladies', consumedSicknessTotal: 'Consommées de maladies', diff --git a/src/modules/shared/components/navigation/right-drawer.vue b/src/modules/shared/components/navigation/right-drawer.vue index 49700c6..9a65f45 100644 --- a/src/modules/shared/components/navigation/right-drawer.vue +++ b/src/modules/shared/components/navigation/right-drawer.vue @@ -31,6 +31,16 @@ const handleLogout = () => { @mouseleave="miniState = true" v-model="uiStore.isRightDrawerOpen"> + + + + + + + {{ $t('navBar.userMenuHome') }} + + + diff --git a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue index 929a0b2..b63112c 100644 --- a/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue +++ b/src/modules/timesheet-approval/components/timesheet-approval-employee-overview-list.vue @@ -27,28 +27,42 @@