diff --git a/backend/app/schemas.py b/backend/app/schemas.py index fdb16f69464173d8d3dab51d11e22cc2bd52e992..634a2f7861ba86c358b7a4b2e448cc315959ef0b 100644 --- a/backend/app/schemas.py +++ b/backend/app/schemas.py @@ -68,10 +68,10 @@ class ContactCreate(BaseModel): class UserSurveyWeeklyCreate(BaseModel): - q1: float - q2: float - q3: float - q4: float + q1: float | None = None + q2: float | None = None + q3: float | None = None + q4: float | None = None class Session(BaseModel): diff --git a/frontend/src/lang/fr.json b/frontend/src/lang/fr.json index b6cf78875b78d94045d84592db38fc8b1b88d6f4..b1569c9ddd63824e2fc1fe6042baf624ee72d2aa 100644 --- a/frontend/src/lang/fr.json +++ b/frontend/src/lang/fr.json @@ -289,7 +289,9 @@ }, "language": { "fr": "Français", - "en": "Anglais" + "en": "Anglais", + "fra": "Français", + "eng": "Anglais" }, "bool": { "true": "Oui", diff --git a/frontend/src/lib/components/users/weeklySurvey.svelte b/frontend/src/lib/components/users/weeklySurvey.svelte index 9cb9d26729c0a02c2f36bd52c46572725087192f..76790f854fb6e5355d45e659e0992fea374280cb 100644 --- a/frontend/src/lib/components/users/weeklySurvey.svelte +++ b/frontend/src/lib/components/users/weeklySurvey.svelte @@ -4,10 +4,13 @@ import { t } from '$lib/services/i18n'; import { user } from '$lib/types/user'; import { formatToUTCDate } from '$lib/utils/date'; - import { toastAlert, toastSuccess, toastWarning } from '$lib/utils/toasts'; + import { toastAlert, toastSuccess } from '$lib/utils/toasts'; let open = - !$user?.last_survey || $user.last_survey.getTime() + config.WEEKLY_SURVEY_INTERVAL < Date.now(); + !$user?.is_tutor && + !$user?.is_admin && + (!$user?.last_survey || + $user.last_survey.getTime() + config.WEEKLY_SURVEY_INTERVAL < Date.now()); async function send() { if (!$user) return; @@ -17,11 +20,6 @@ return value === '-1' ? null : parseFloat(value); }); - if (data.includes(null)) { - toastWarning($t('session.modal.weekly.errors.null')); - return; - } - const res = await createWeeklySurveyAPI($user.id, data[0]!, data[1]!, data[2]!, data[3]!); if (!res) { @@ -44,7 +42,7 @@ tabindex="0" aria-modal="true" > - <div class="modal-box max-w-none"> + <div class="modal-box max-w-[800px]"> <h2 class="text-xl font-bold mb-4">{$t('session.modal.weekly.title')}</h2> <p>{@html $t('session.modal.weekly.description')}</p> {#each new Array(4) as _, i}