diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index e728402..6011d76 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -24,7 +24,7 @@ $dark: #000; $dark-page: #323232; $positive: #21ba45; -$negative: #c10015; +$negative: #ff586c71; $info: #31ccec; -$warning: #eeb10a; +$warning: #ffde82c2; $white: white; diff --git a/src/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts index 351a4f4..6e74dec 100644 --- a/src/i18n/en-ca/index.ts +++ b/src/i18n/en-ca/index.ts @@ -293,12 +293,12 @@ export default { timeSheetValidations: { tableHeader: 'List of employees', tableColumnLabelFullname: 'Full name', - tableColumnLabelRegularHours: 'Regular hours', - tableColumnLabelEveningHours: 'Evening hours', - tableColumnLabelEmergencyHours: 'Emergency hours', - tableColumnLabelOvertime: 'Overtime hours', - tableColumnLabelExpenses: 'Expenses', - tableColumnLabelMileage: 'Mileage', + tableColumnLabelRegularHours: 'regular hours', + tableColumnLabelEveningHours: 'evening hours', + tableColumnLabelEmergencyHours: 'emergency hours', + tableColumnLabelOvertime: 'overtime hours', + tableColumnLabelExpenses: 'of expenses', + tableColumnLabelMileage: 'of mileage', actionTitle: 'Please save the changes made.', actionButton: 'Save', timeSheetStatusVerified: 'Verified', diff --git a/src/i18n/fr-ca/index.ts b/src/i18n/fr-ca/index.ts index 7fd85b4..9c61ea5 100644 --- a/src/i18n/fr-ca/index.ts +++ b/src/i18n/fr-ca/index.ts @@ -339,12 +339,12 @@ export default { timeSheetValidations: { 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: 'Dépenses', - tableColumnLabelMileage: 'Kilométrage', + 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', actionTitle: 'Veuillez enregistrer les changements effectués.', actionButton: 'Enregistrer', timeSheetStatusVerified: 'Vérifié', 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 8a74061..929a0b2 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 @@ -1,76 +1,81 @@ - - - - - - - - - - - - + - - - - - - - - - {{ col.label }} - - - {{ col.value }} - - - - - - + + + + + + + - - - + + + + + {{ props.row.employee_name }} + + + {{ col.value }} + {{ col.label }} + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/modules/timesheet-approval/pages/timesheet-approval.vue b/src/modules/timesheet-approval/pages/timesheet-approval.vue index 3f1c46a..ed00b1d 100644 --- a/src/modules/timesheet-approval/pages/timesheet-approval.vue +++ b/src/modules/timesheet-approval/pages/timesheet-approval.vue @@ -1,11 +1,12 @@ + \ No newline at end of file diff --git a/src/modules/timesheet-approval/timesheet-approval-test-constants.ts b/src/modules/timesheet-approval/timesheet-approval-test-constants.ts index bf35e06..556bf7c 100644 --- a/src/modules/timesheet-approval/timesheet-approval-test-constants.ts +++ b/src/modules/timesheet-approval/timesheet-approval-test-constants.ts @@ -56,6 +56,160 @@ export const mock_pay_period_employee_overviews: PayPeriodEmployeeOverview[] = [ "expenses": 95.25, "mileage": 60, "is_approved": false + }, + { + "employee_id": 'EMP-006', + "employee_name": 'Maxime Murray Gendron', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-007', + "employee_name": 'Marc-André Henrico', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-008', + "employee_name": 'Jessy Sharock', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-009', + "employee_name": 'David Richer', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-010', + "employee_name": 'Nicolas Drolet', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-011', + "employee_name": 'Frederick Pruneau', + "regular_hours": 16, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-012', + "employee_name": 'Matthieu Haineault Gervais', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-013', + "employee_name": 'Robinson Viaud', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-014', + "employee_name": 'Geneviève Bourdon', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-015', + "employee_name": 'Frédérique Soulard', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-016', + "employee_name": 'Patrick Doucet', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-017', + "employee_name": 'Dahlia Tremblay', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-018', + "employee_name": 'Louis Morneau', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-019', + "employee_name": 'Michel Blais', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false } ]; diff --git a/src/stores/timesheet-store.ts b/src/stores/timesheet-store.ts index 311e992..a6b79d3 100644 --- a/src/stores/timesheet-store.ts +++ b/src/stores/timesheet-store.ts @@ -62,6 +62,160 @@ const mock_pay_period_employee_overviews: PayPeriodEmployeeOverview[] = [ "expenses": 95.25, "mileage": 60, "is_approved": false + }, + { + "employee_id": 'EMP-006', + "employee_name": 'Maxime Murray Gendron', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 20000, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-007', + "employee_name": 'Marc-André Henrico', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-008', + "employee_name": 'Jessy Sharock', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-009', + "employee_name": 'David Richer', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-010', + "employee_name": 'Nicolas Drolet', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-011', + "employee_name": 'Frederick Pruneau', + "regular_hours": 16, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-012', + "employee_name": 'Matthieu Haineault Gervais', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-013', + "employee_name": 'Robinson Viaud', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-014', + "employee_name": 'Geneviève Bourdon', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-015', + "employee_name": 'Frédérique Soulard', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-016', + "employee_name": 'Patrick Doucet', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-017', + "employee_name": 'Dahlia Tremblay', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-018', + "employee_name": 'Louis Morneau', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false + }, + { + "employee_id": 'EMP-019', + "employee_name": 'Michel Blais', + "regular_hours": 80, + "evening_hours": 0, + "emergency_hours": 0, + "overtime_hours": 0, + "expenses": 0, + "mileage": 0, + "is_approved": false } ];