Skip to content

Fix/email color invert #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 22, 2025
Merged

Fix/email color invert #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4133d19
feat: replaced disabled button with toast with error message for impr…
LauraWitulskiMorales Sep 19, 2025
3c97bc4
fix: added inline styling to email text
LauraWitulskiMorales Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/email/assets/index.mjml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@

<mj-spacer height="32px" />

<mj-text mj-class="paddingText">{{ GREETING }},</mj-text>
<mj-text mj-class="paddingText">{{ MAINTEXT }}</mj-text>
<mj-text mj-class="paddingText" style="color:#000000 !important">{{ GREETING }},</mj-text>
<mj-text mj-class="paddingText" style="color:#000000 !important">{{ MAINTEXT }}</mj-text>

<mj-spacer height="32px" />

Expand Down
6 changes: 5 additions & 1 deletion packages/frontend/src/locales/de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
4 changes: 4 additions & 0 deletions packages/frontend/src/locales/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
4 changes: 4 additions & 0 deletions packages/frontend/src/locales/translation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ export default interface Translation {
departmentMissingTitle: string
departmentMissingText: string
}
incomplete: {
title: string
description: string
}
reportSaveSuccess: string
total: string
headingContainer: {
Expand Down
15 changes: 14 additions & 1 deletion packages/frontend/src/pages/report-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,20 @@ const ReportPage: React.FunctionComponent = () => {
<Spacer y="l">
<Flex justifyContent={'flex-end'} alignItems={'center'}>
{(reportTodo || reportReopened) && (
<PrimaryButton disabled={finishedDays !== 5 || !report.department} onClick={toggleHandoverModal}>
<PrimaryButton
onClick={() => {
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}
</PrimaryButton>
)}
Expand Down