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

Merge pull request 'fix(timesheet): add translation for sick hours error, make shift comment popup bigger' (#62) from dev/nicolas/staging-prep into main

Browse Source 
Reviewed-on: Targo/targo_frontend#62
This commit is contained in:
Nicolas 2026-01-23 11:28:39 -05:00
commit c7e5829ca4
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,19 +344,20 @@ export default {
}, },
}, },
errors: { errors: {
EMPLOYEE_NOT_FOUND: "No employee matching current login details",
EMPTY_SICK_HOURS_BANK: "You don't have enough sick leave available to create this shift",
EXPENSE_NOT_FOUND: "No expense found with provided data",
INVALID_EXPENSE: "An expense contains missing or corrupted data",
INVALID_SHIFT: "A shift contains missing or corrupted data",
INVALID_SHIFT_TIME: "In and Out shift times are reversed", INVALID_SHIFT_TIME: "In and Out shift times are reversed",
INVALID_TIMESHEET: "Timesheet data is missing or corrupted",
PAY_PERIOD_NOT_FOUND: "No pay period matching given dates",
SHIFT_NOT_FOUND: "Shift missing or deleted",
SHIFT_OVERLAP: "An overlaps occured between 2 or more shifts", SHIFT_OVERLAP: "An overlaps occured between 2 or more shifts",
SHIFT_OVERLAP_SHORT: "Overlap", SHIFT_OVERLAP_SHORT: "Overlap",
INVALID_SHIFT: "A shift contains missing or corrupted data",
SHIFT_TIME_REQUIRED: "Time missing", SHIFT_TIME_REQUIRED: "Time missing",
SHIFT_TYPE_REQUIRED: "Shift type required", SHIFT_TYPE_REQUIRED: "Shift type required",
SHIFT_NOT_FOUND: "Shift missing or deleted",
PAY_PERIOD_NOT_FOUND: "No pay period matching given dates",
EMPLOYEE_NOT_FOUND: "No employee matching current login details",
INVALID_TIMESHEET: "Timesheet data is missing or corrupted",
TIMESHEET_NOT_FOUND: "No timesheet found with provided data", TIMESHEET_NOT_FOUND: "No timesheet found with provided data",
INVALID_EXPENSE: "An expense contains missing or corrupted data",
EXPENSE_NOT_FOUND: "No expense found with provided data",
UPDATE_ERROR: "Error while updating data", UPDATE_ERROR: "Error while updating data",
}, },
}, },

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

@ -344,19 +344,20 @@ export default {
}, },
}, },
errors: { errors: {
EMPLOYEE_NOT_FOUND: "Aucun employé ne correspond aux détails de votre connexion",
EMPTY_SICK_HOURS_BANK: "Vous ne posséder pas les heures de maladies nécessaires pour créé ce quart de travail",
EXPENSE_NOT_FOUND: "Aucune dépense ne correspond aux détails fournis",
INVALID_EXPENSE: "Une dépense contient des données manquantes ou corrompues",
INVALID_SHIFT: "Un quart de travail contient des données manquantes ou corrompues",
INVALID_SHIFT_TIME: "Les heures d'entrée et de sortie sont inversées", INVALID_SHIFT_TIME: "Les heures d'entrée et de sortie sont inversées",
INVALID_TIMESHEET: "Une feuille de temps contient des données manquantes ou corrompues",
PAY_PERIOD_NOT_FOUND: "Aucune période de paie ne correspond aux dates fournies",
SHIFT_NOT_FOUND: "Quart de travail manquant ou supprimé",
SHIFT_OVERLAP: "Il y a un chevauchement entre deux ou plusieurs quarts", SHIFT_OVERLAP: "Il y a un chevauchement entre deux ou plusieurs quarts",
SHIFT_OVERLAP_SHORT: "Chevauchement", SHIFT_OVERLAP_SHORT: "Chevauchement",
INVALID_SHIFT: "Un quart de travail contient des données manquantes ou corrompues",
SHIFT_TIME_REQUIRED: "Heures manquantes", SHIFT_TIME_REQUIRED: "Heures manquantes",
SHIFT_TYPE_REQUIRED: "Type requis", SHIFT_TYPE_REQUIRED: "Type requis",
SHIFT_NOT_FOUND: "Quart de travail manquant ou supprimé",
PAY_PERIOD_NOT_FOUND: "Aucune période de paie ne correspond aux dates fournies",
EMPLOYEE_NOT_FOUND: "Aucun employé ne correspond aux détails de votre connexion",
INVALID_TIMESHEET: "Une feuille de temps contient des données manquantes ou corrompues",
TIMESHEET_NOT_FOUND: "Aucune feuille de temps ne correspond au détails fournis", TIMESHEET_NOT_FOUND: "Aucune feuille de temps ne correspond au détails fournis",
INVALID_EXPENSE: "Une dépense contient des données manquantes ou corrompues",
EXPENSE_NOT_FOUND: "Aucune dépense ne correspond aux détails fournis",
UPDATE_ERROR: "Une erreur est survenu lors de la mise à jour", UPDATE_ERROR: "Une erreur est survenu lors de la mise à jour",
}, },
}, },

12
src/modules/timesheets/components/shift-list-day-row.vue
View File

@ -76,7 +76,7 @@
} }
const getCommentCounterColor = (comment_length: number) => { const getCommentCounterColor = (comment_length: number) => {
if (comment_length < 200) return 'primary'; if (comment_length < 200) return '';
if (comment_length < 250) return 'warning'; if (comment_length < 250) return 'warning';
return 'negative'; return 'negative';
}; };
@ -293,10 +293,12 @@
<q-popup-edit <q-popup-edit
v-model="shift.comment" v-model="shift.comment"
:title="$t('timesheet.shift.fields.header_comment')"
auto-save
v-slot="scope" v-slot="scope"
class="bg-dark" auto-save
:max-width="$q.platform.is.mobile ? '' : '50vw'"
:title="$t('timesheet.shift.fields.header_comment')"
class="bg-dark full-width rounded-10"
style="border: 3px solid var(--q-accent);"
> >
<q-input <q-input
color="white" color="white"
@ -307,7 +309,7 @@
counter counter
bottom-slots bottom-slots
:maxlength="COMMENT_LENGTH_MAX" :maxlength="COMMENT_LENGTH_MAX"
class="q-pb-lg" class="q-pb-lg full-width"
:class="shift.is_approved ? 'cursor-not-allowed' : ''" :class="shift.is_approved ? 'cursor-not-allowed' : ''"
@keyup.enter="scope.set" @keyup.enter="scope.set"
> >