louis/targo-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feat(shifts): added banking and withdrawal of banked hours' (#47) from dev/matthieu/getting-ready-for-staging into main

Browse Source 
Reviewed-on: Targo/targo_frontend#47
This commit is contained in:
Nicolas 2026-01-12 10:40:46 -05:00
commit 7432d7f15b
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i18n/en-ca/index.ts
View File

@ -292,6 +292,8 @@ export default {
VACATION: "Vacation", VACATION: "Vacation",
REMOTE: "Remote", REMOTE: "Remote",
OFFICE: "Office", OFFICE: "Office",
BANKING: "Banking Hours",
WITHDRAW_BANKED: "Withdrawing Hours",
}, },
fields: { fields: {
start: "Start (HH:mm)", start: "Start (HH:mm)",

2
src/i18n/fr-ca/index.ts
View File

@ -293,6 +293,8 @@ export default {
VACATION: "Vacance", VACATION: "Vacance",
REMOTE: "Télétravail", REMOTE: "Télétravail",
OFFICE: "Bureau", OFFICE: "Bureau",
BANKING: "Banquer des heures",
WITHDRAW_BANKED: "Prendre heures en banque",
}, },
fields: { fields: {
start: "Début (HH:mm)", start: "Début (HH:mm)",

6
src/modules/timesheets/models/shift.models.ts
View File

@ -4,10 +4,12 @@ export const SHIFT_TYPES: ShiftType[] = [
'EMERGENCY', 'EMERGENCY',
'HOLIDAY', 'HOLIDAY',
'VACATION', 'VACATION',
'SICK' 'SICK',
'BANKING',
'WITHDRAW_BANKED',
]; ];
export type ShiftType = 'REGULAR' | 'EVENING' | 'EMERGENCY' | 'HOLIDAY' | 'VACATION' | 'SICK'; export type ShiftType = 'REGULAR' | 'EVENING' | 'EMERGENCY' | 'HOLIDAY' | 'VACATION' | 'SICK' | 'BANKING' | 'WITHDRAW_BANKED';
export type ShiftErrorCode = 'SHIFT_OVERLAP' | 'MISSING_START_TIME' | 'MISSING_END_TIME' | 'COMMENT_LENGTH_EXCEEDED' | 'APPROVAL_LOCK' | 'INVALID_DATE' | 'INVALID TYPE' | 'INVALID_TIMESHEET'; export type ShiftErrorCode = 'SHIFT_OVERLAP' | 'MISSING_START_TIME' | 'MISSING_END_TIME' | 'COMMENT_LENGTH_EXCEEDED' | 'APPROVAL_LOCK' | 'INVALID_DATE' | 'INVALID TYPE' | 'INVALID_TIMESHEET';

2
src/modules/timesheets/utils/shift.util.ts
View File

@ -33,4 +33,6 @@ export const SHIFT_OPTIONS: ShiftOption[] = [
{ label: 'timesheet.shift.types.VACATION', value: 'VACATION', icon: 'beach_access', icon_color: 'deep-orange-5' }, { label: 'timesheet.shift.types.VACATION', value: 'VACATION', icon: 'beach_access', icon_color: 'deep-orange-5' },
{ label: 'timesheet.shift.types.HOLIDAY', value: 'HOLIDAY', icon: 'event', icon_color: 'purple-5' }, { label: 'timesheet.shift.types.HOLIDAY', value: 'HOLIDAY', icon: 'event', icon_color: 'purple-5' },
{ label: 'timesheet.shift.types.SICK', value: 'SICK', icon: 'medication_liquid', icon_color: 'light-blue-6' }, { label: 'timesheet.shift.types.SICK', value: 'SICK', icon: 'medication_liquid', icon_color: 'light-blue-6' },
{ label: 'timesheet.shift.types.BANKING', value: 'BANKING', icon: 'savings', icon_color: 'pink-3' },
{ label: 'timesheet.shift.types.WITHDRAW_BANKED', value: 'WITHDRAW_BANKED', icon: 'attach_money', icon_color: 'yellow-4' },
]; ];