fix(timesheet): add translation for sick hours error, make shift comment popup bigger
This commit is contained in:
parent
d65113dd38
commit
9a520d94bf
|
|
@ -344,19 +344,20 @@ export default {
|
|||
},
|
||||
},
|
||||
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_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_SHORT: "Overlap",
|
||||
INVALID_SHIFT: "A shift contains missing or corrupted data",
|
||||
SHIFT_TIME_REQUIRED: "Time missing",
|
||||
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",
|
||||
INVALID_EXPENSE: "An expense contains missing or corrupted data",
|
||||
EXPENSE_NOT_FOUND: "No expense found with provided data",
|
||||
UPDATE_ERROR: "Error while updating data",
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -344,19 +344,20 @@ export default {
|
|||
},
|
||||
},
|
||||
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_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_SHORT: "Chevauchement",
|
||||
INVALID_SHIFT: "Un quart de travail contient des données manquantes ou corrompues",
|
||||
SHIFT_TIME_REQUIRED: "Heures manquantes",
|
||||
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",
|
||||
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",
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
}
|
||||
|
||||
const getCommentCounterColor = (comment_length: number) => {
|
||||
if (comment_length < 200) return 'primary';
|
||||
if (comment_length < 200) return '';
|
||||
if (comment_length < 250) return 'warning';
|
||||
return 'negative';
|
||||
};
|
||||
|
|
@ -293,10 +293,12 @@
|
|||
|
||||
<q-popup-edit
|
||||
v-model="shift.comment"
|
||||
:title="$t('timesheet.shift.fields.header_comment')"
|
||||
auto-save
|
||||
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
|
||||
color="white"
|
||||
|
|
@ -307,7 +309,7 @@
|
|||
counter
|
||||
bottom-slots
|
||||
:maxlength="COMMENT_LENGTH_MAX"
|
||||
class="q-pb-lg"
|
||||
class="q-pb-lg full-width"
|
||||
:class="shift.is_approved ? 'cursor-not-allowed' : ''"
|
||||
@keyup.enter="scope.set"
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user