From 21b98ec825cd29445a7d62fd089f267ce642da83 Mon Sep 17 00:00:00 2001 From: Nicolas Drolet Date: Wed, 20 Aug 2025 17:03:32 -0400 Subject: [PATCH] refactor(approvals): remake entire card appearance, hook up to pay period picker to backend, make the period picker actually functional. --- src/css/app.scss | 2 +- src/i18n/en-ca/index.ts | 10 +- src/i18n/fr-ca/index.ts | 10 +- .../supervisor/supervisor-crew-table-item.vue | 4 +- .../supervisor/supervisor-crew-table.vue | 17 +- .../types/pay-period-bundle-interface.ts | 6 + .../shared/types/pay-period-interface.ts | 11 +- ...t-approval-employee-overview-list-item.vue | 74 ++- ...esheet-approval-employee-overview-list.vue | 20 +- .../timesheet-approval-period-picker.vue | 13 +- .../composables/use-timesheet-approval-api.ts | 9 +- .../services/services-timesheet-approval.ts | 19 +- .../timesheet-approval-test-constants.ts | 570 +++++++++--------- src/stores/timesheet-store.ts | 30 +- 14 files changed, 434 insertions(+), 361 deletions(-) create mode 100644 src/modules/shared/types/pay-period-bundle-interface.ts diff --git a/src/css/app.scss b/src/css/app.scss index 74df4ee..2acab20 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -1,7 +1,7 @@ // app global css in SCSS form @each $size in (5, 10, 15, 20, 25) { .rounded-#{$size} { - border-radius: #{$size}px; + border-radius: #{$size}px !important; } } diff --git a/src/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts index 34868c8..5ac2cfd 100644 --- a/src/i18n/en-ca/index.ts +++ b/src/i18n/en-ca/index.ts @@ -297,11 +297,11 @@ export default { tableHeader: 'List of employees', tableColumnLabelFullname: 'Full name', tableColumnLabelRegularHours: 'regular hours', - tableColumnLabelEveningHours: 'evening hours', - tableColumnLabelEmergencyHours: 'emergency hours', - tableColumnLabelOvertime: 'overtime hours', - tableColumnLabelExpenses: 'of expenses', - tableColumnLabelMileage: 'of mileage', + tableColumnLabelEveningHours: 'evening', + tableColumnLabelEmergencyHours: 'emergency', + tableColumnLabelOvertime: 'overtime', + tableColumnLabelExpenses: 'expenses', + tableColumnLabelMileage: 'mileage', actionTitle: 'Please save the changes made.', actionButton: 'Save', timeSheetStatusVerified: 'approved', diff --git a/src/i18n/fr-ca/index.ts b/src/i18n/fr-ca/index.ts index e489482..e710a53 100644 --- a/src/i18n/fr-ca/index.ts +++ b/src/i18n/fr-ca/index.ts @@ -347,11 +347,11 @@ export default { tableHeader: 'Liste des employés', tableColumnLabelFullname: 'nom complet', tableColumnLabelRegularHours: 'heures régulières', - tableColumnLabelEveningHours: 'heures de soir', - tableColumnLabelEmergencyHours: 'heures d’urgence', - tableColumnLabelOvertime: 'heures supplémentaires', - tableColumnLabelExpenses: 'de dépenses', - tableColumnLabelMileage: 'de kilométrage', + tableColumnLabelEveningHours: 'soir', + tableColumnLabelEmergencyHours: 'urgence', + tableColumnLabelOvertime: 'supplémentaires', + tableColumnLabelExpenses: 'dépenses', + tableColumnLabelMileage: 'kilométrage', actionTitle: 'Veuillez enregistrer les changements effectués.', actionButton: 'Enregistrer', timeSheetStatusVerified: 'validé', diff --git a/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue b/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue index 5da5f32..9aae542 100644 --- a/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue +++ b/src/modules/employee-list/components/supervisor/supervisor-crew-table-item.vue @@ -25,7 +25,7 @@ import { useEmployeeListApi } from 'src/modules/employee-list/composables/use-em