diff --git a/src/i18n/en-ca/index.ts b/src/i18n/en-ca/index.ts index 79802dd..d53effc 100644 --- a/src/i18n/en-ca/index.ts +++ b/src/i18n/en-ca/index.ts @@ -267,6 +267,7 @@ export default { EMERGENCY: 'Emergency', EVENING: 'Evening', HOLIDAY: 'Holiday', + OVERTIME: 'Overtime', REGULAR: 'Regular', SICK: 'Sick Leave', VACATION: 'Vacation', diff --git a/src/i18n/fr-ca/index.ts b/src/i18n/fr-ca/index.ts index f7cd6e9..490c724 100644 --- a/src/i18n/fr-ca/index.ts +++ b/src/i18n/fr-ca/index.ts @@ -318,6 +318,7 @@ export default { EMERGENCY: 'Urgence', EVENING: 'Soir', HOLIDAY: 'Férier', + OVERTIME: 'Supplémentaire', SICK: 'Absence', REGULAR: 'Régulier', VACATION: 'Vacance', diff --git a/src/modules/timesheets/components/shift/timesheet-shift-comment.vue b/src/modules/timesheets/components/shift/shift-comment.vue similarity index 100% rename from src/modules/timesheets/components/shift/timesheet-shift-comment.vue rename to src/modules/timesheets/components/shift/shift-comment.vue diff --git a/src/modules/timesheets/components/shift/shifts-legend.vue b/src/modules/timesheets/components/shift/shifts-legend.vue new file mode 100644 index 0000000..039abfc --- /dev/null +++ b/src/modules/timesheets/components/shift/shifts-legend.vue @@ -0,0 +1,48 @@ + + + \ No newline at end of file diff --git a/src/modules/timesheets/components/timesheet-details-shifts-row-header.vue b/src/modules/timesheets/components/timesheet-details-shifts-row-header.vue new file mode 100644 index 0000000..37d2af7 --- /dev/null +++ b/src/modules/timesheets/components/timesheet-details-shifts-row-header.vue @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/src/modules/timesheets/components/timesheet-details-shifts-row.vue b/src/modules/timesheets/components/timesheet-details-shifts-row.vue new file mode 100644 index 0000000..2fb0ab5 --- /dev/null +++ b/src/modules/timesheets/components/timesheet-details-shifts-row.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/src/modules/timesheets/components/timesheet-details-shifts.vue b/src/modules/timesheets/components/timesheet-details-shifts.vue new file mode 100644 index 0000000..2129cc0 --- /dev/null +++ b/src/modules/timesheets/components/timesheet-details-shifts.vue @@ -0,0 +1,72 @@ + + + \ No newline at end of file diff --git a/src/modules/timesheets/components/timesheet/timesheet-shift-form.vue b/src/modules/timesheets/components/timesheet/deprecated-timesheet-shift-form.vue similarity index 99% rename from src/modules/timesheets/components/timesheet/timesheet-shift-form.vue rename to src/modules/timesheets/components/timesheet/deprecated-timesheet-shift-form.vue index 17a9dbf..9d3e299 100644 --- a/src/modules/timesheets/components/timesheet/timesheet-shift-form.vue +++ b/src/modules/timesheets/components/timesheet/deprecated-timesheet-shift-form.vue @@ -6,7 +6,7 @@ import { useTimesheetStore } from 'src/stores/timesheet-store'; import TimesheetShiftComment from '../shift/timesheet-shift-comment.vue'; import TimesheetSavePayload from './timesheet-save-payload.vue'; import type { Shift } from '../../types/timesheet-shift-interface'; -import type { CreateShiftPayload } from '../../types/timesheet-shifts-payload-interface'; +import type{ CreateShiftPayload } from '../../types/timesheet-shifts-payload-interface'; const timesheet_store = useTimesheetStore(); diff --git a/src/modules/timesheets/components/timesheet/timesheet-navigation.vue b/src/modules/timesheets/components/timesheet/timesheet-navigation.vue index 1a1136b..1713d8d 100644 --- a/src/modules/timesheets/components/timesheet/timesheet-navigation.vue +++ b/src/modules/timesheets/components/timesheet/timesheet-navigation.vue @@ -1,45 +1,94 @@