Skip to content

Commit 89a51cb

Browse files
committed
Adding new email-notification check boxes to user edit settings form.
1 parent c748409 commit 89a51cb

File tree

3 files changed

+52
-24
lines changed

3 files changed

+52
-24
lines changed

src/components/forms/EditUserSettingsForm/EditUserSettingsForm.js

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,18 @@ const EditUserSettingsForm = ({
103103
}
104104
/>
105105

106+
<Field
107+
name="solutionAcceptedEmails"
108+
component={CheckboxField}
109+
onOff
110+
label={
111+
<FormattedMessage
112+
id="app.editUserSettings.solutionAcceptedEmails"
113+
defaultMessage="Solution accepted status changed"
114+
/>
115+
}
116+
/>
117+
106118
<Field
107119
name="pointsChangedEmails"
108120
component={CheckboxField}
@@ -139,31 +151,43 @@ const EditUserSettingsForm = ({
139151
/>
140152

141153
{isSupervisorRole(user.privateData.role) && (
142-
<Field
143-
name="assignmentSubmitAfterAcceptedEmails"
144-
component={CheckboxField}
145-
onOff
146-
label={
147-
<FormattedMessage
148-
id="app.editUserSettings.assignmentSubmitAfterAcceptedEmails"
149-
defaultMessage="New solution evaluated for an assignment where another solution has already been accepted"
150-
/>
151-
}
152-
/>
153-
)}
154+
<>
155+
<Field
156+
name="assignmentSubmitAfterAcceptedEmails"
157+
component={CheckboxField}
158+
onOff
159+
label={
160+
<FormattedMessage
161+
id="app.editUserSettings.assignmentSubmitAfterAcceptedEmails"
162+
defaultMessage="New solution evaluated for an assignment where another solution has already been accepted"
163+
/>
164+
}
165+
/>
154166

155-
{isSupervisorRole(user.privateData.role) && (
156-
<Field
157-
name="assignmentSubmitAfterReviewedEmails"
158-
component={CheckboxField}
159-
onOff
160-
label={
161-
<FormattedMessage
162-
id="app.editUserSettings.assignmentSubmitAfterReviewedEmails"
163-
defaultMessage="New solution evaluated for an assignment where another solution has already been reviewed"
164-
/>
165-
}
166-
/>
167+
<Field
168+
name="assignmentSubmitAfterReviewedEmails"
169+
component={CheckboxField}
170+
onOff
171+
label={
172+
<FormattedMessage
173+
id="app.editUserSettings.assignmentSubmitAfterReviewedEmails"
174+
defaultMessage="New solution evaluated for an assignment where another solution has already been reviewed"
175+
/>
176+
}
177+
/>
178+
179+
<Field
180+
name="solutionReviewRequestedEmails"
181+
component={CheckboxField}
182+
onOff
183+
label={
184+
<FormattedMessage
185+
id="app.editUserSettings.solutionReviewRequestedEmails"
186+
defaultMessage="Student requested code review for a solution"
187+
/>
188+
}
189+
/>
190+
</>
167191
)}
168192
</FormBox>
169193
);

src/locales/cs.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,9 @@
688688
"app.editUserSettings.failed": "Uložení uživatelského profilu se nezdařilo.",
689689
"app.editUserSettings.newAssignmentEmails": "Nově zadaná úloha",
690690
"app.editUserSettings.pointsChangedEmails": "Učitel upravil přidělené body",
691+
"app.editUserSettings.solutionAcceptedEmails": "Došlo ke změně stavu akceptace řešení",
691692
"app.editUserSettings.solutionCommentsEmails": "Nový komentář k řešení",
693+
"app.editUserSettings.solutionReviewRequestedEmails": "Student požádal o revizi zdrojového kódu řešení",
692694
"app.editUserSettings.submissionEvaluatedEmails": "Řešení vyhodnoceno (pokud trvalo delší dobu)",
693695
"app.editUserSettings.title": "Uživatelské nastavení",
694696
"app.editUserUIData.darkTheme": "Použít tmavý motiv pro editor zdrojového kódu",

src/locales/en.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,9 @@
688688
"app.editUserSettings.failed": "Cannot save profile settings.",
689689
"app.editUserSettings.newAssignmentEmails": "New exercise assigned",
690690
"app.editUserSettings.pointsChangedEmails": "Awarded points modified by teacher",
691+
"app.editUserSettings.solutionAcceptedEmails": "Solution accepted status changed",
691692
"app.editUserSettings.solutionCommentsEmails": "New solution comment",
693+
"app.editUserSettings.solutionReviewRequestedEmails": "Student requested code review for a solution",
692694
"app.editUserSettings.submissionEvaluatedEmails": "Submission evaluation (when taking a long time)",
693695
"app.editUserSettings.title": "User Settings",
694696
"app.editUserUIData.darkTheme": "Use a dark theme for the source code viewers and editors",

0 commit comments

Comments
 (0)