diff --git a/packages/email/assets/index.mjml b/packages/email/assets/index.mjml index 1fc51a53..cc9090e3 100644 --- a/packages/email/assets/index.mjml +++ b/packages/email/assets/index.mjml @@ -46,8 +46,8 @@ - {{ GREETING }}, - {{ MAINTEXT }} + {{ GREETING }}, + {{ MAINTEXT }} diff --git a/packages/frontend/src/locales/de.ts b/packages/frontend/src/locales/de.ts index a02d3c3f..3a8d2c80 100644 --- a/packages/frontend/src/locales/de.ts +++ b/packages/frontend/src/locales/de.ts @@ -88,9 +88,13 @@ const germanTranslation: Translation = { title: 'Abteilung', departmentAddedTitle: 'Abteilung hinzugefügt', departmentAddedText: 'Deine Abteilung wurde erfolgreich hinzugefügt und gespeichert.', - departmentMissingTitle: 'Abteilung hinzugefügen', + departmentMissingTitle: 'Abteilung hinzufügen', departmentMissingText: 'Du musst eine Abteilung eintragen, damit dein Bericht übergeben werden kann.', }, + incomplete: { + title: 'Bericht unvollständig', + description: 'Bitte stelle sicher, dass alle Tage, deine Abteilung und deine Arbeitsstunden eingetragen sind.', + }, unarchive: 'Aus dem Archiv holen', total: 'Wochenstunden', headingContainer: { diff --git a/packages/frontend/src/locales/en.ts b/packages/frontend/src/locales/en.ts index 84b07d03..a3cebd52 100644 --- a/packages/frontend/src/locales/en.ts +++ b/packages/frontend/src/locales/en.ts @@ -88,6 +88,10 @@ const englishTranslation: Translation = { departmentMissingTitle: 'Add department', departmentMissingText: 'You have to add a department to hand over your report.', }, + incomplete: { + title: 'Report incomplete', + description: 'Please make sure all days, your department, and your working hours are filled in.', + }, unarchive: 'Unarchive report', total: 'Hours per week', headingContainer: { diff --git a/packages/frontend/src/locales/translation.ts b/packages/frontend/src/locales/translation.ts index 989520d0..448395eb 100644 --- a/packages/frontend/src/locales/translation.ts +++ b/packages/frontend/src/locales/translation.ts @@ -85,6 +85,10 @@ export default interface Translation { departmentMissingTitle: string departmentMissingText: string } + incomplete: { + title: string + description: string + } reportSaveSuccess: string total: string headingContainer: { diff --git a/packages/frontend/src/pages/report-page.tsx b/packages/frontend/src/pages/report-page.tsx index 9a9cfc7a..9c975986 100644 --- a/packages/frontend/src/pages/report-page.tsx +++ b/packages/frontend/src/pages/report-page.tsx @@ -151,7 +151,20 @@ const ReportPage: React.FunctionComponent = () => { {(reportTodo || reportReopened) && ( - + { + if (finishedDays !== 5 && !report.department) { + addToast({ + icon: 'Error', + title: strings.report.incomplete.title, + text: strings.report.incomplete.description, + type: 'error', + }) + return + } + toggleHandoverModal() + }} + > {strings.report.handover} )}