refactor(assessment): move timed assessment

- move the component to just below the Start At - change the translations to better reflect the effect of force submission
Coursemology · Sep 17, 2024 · 5c809e4 · 5c809e4
1 parent f041a90
commit 5c809e4
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 42 deletions.
diff --git a/client/app/bundles/course/assessment/components/AssessmentForm/index.tsx b/client/app/bundles/course/assessment/components/AssessmentForm/index.tsx
@@ -289,6 +289,46 @@ const AssessmentForm = (props: AssessmentFormProps): JSX.Element => {
             )}
           </Grid>
 
+          <Controller
+            control={control}
+            name="has_time_limit"
+            render={({ field, fieldState }): JSX.Element => (
+              <FormCheckboxField
+                description={t(translations.hasTimeLimitHint)}
+                disabled={disabled}
+                field={field}
+                fieldState={fieldState}
+                label={t(translations.hasTimeLimit)}
+              />
+            )}
+          />
+
+          {hasTimeLimit && (
+            <Controller
+              control={control}
+              name="time_limit"
+              render={({ field, fieldState }): JSX.Element => (
+                <FormTextField
+                  disabled={disabled}
+                  disableMargins
+                  field={field}
+                  fieldState={fieldState}
+                  fullWidth
+                  InputProps={{
+                    endAdornment: (
+                      <InputAdornment position="end">
+                        {t(translations.minutes)}
+                      </InputAdornment>
+                    ),
+                  }}
+                  label={t(translations.timeLimit)}
+                  type="number"
+                  variant="filled"
+                />
+              )}
+            />
+          )}
+
           <Typography>{t(translations.description)}</Typography>
 
           <Controller
@@ -355,46 +395,6 @@ const AssessmentForm = (props: AssessmentFormProps): JSX.Element => {
             )}
           />
 
-          <Controller
-            control={control}
-            name="has_time_limit"
-            render={({ field, fieldState }): JSX.Element => (
-              <FormCheckboxField
-                description={t(translations.hasTimeLimitHint)}
-                disabled={disabled}
-                field={field}
-                fieldState={fieldState}
-                label={t(translations.hasTimeLimit)}
-              />
-            )}
-          />
-
-          {hasTimeLimit && (
-            <Controller
-              control={control}
-              name="time_limit"
-              render={({ field, fieldState }): JSX.Element => (
-                <FormTextField
-                  disabled={disabled}
-                  disableMargins
-                  field={field}
-                  fieldState={fieldState}
-                  fullWidth
-                  InputProps={{
-                    endAdornment: (
-                      <InputAdornment position="end">
-                        {t(translations.minutes)}
-                      </InputAdornment>
-                    ),
-                  }}
-                  label={t(translations.timeLimit)}
-                  type="number"
-                  variant="filled"
-                />
-              )}
-            />
-          )}
-
           {editing && folderAttributes && (
             <>
               <Typography>{t(translations.files)}</Typography>

diff --git a/client/app/bundles/course/assessment/components/AssessmentForm/translations.ts b/client/app/bundles/course/assessment/components/AssessmentForm/translations.ts
@@ -138,7 +138,7 @@ const translations = defineMessages({
   },
   hasTimeLimit: {
     id: 'course.assessment.AssessmentForm.hasTimeLimit',
-    defaultMessage: 'Enable Timed Assessment',
+    defaultMessage: 'Automatically submit when timer ends',
   },
   hasTodoHint: {
     id: 'course.assessment.AssessmentForm.hasTodoHint',
@@ -148,7 +148,7 @@ const translations = defineMessages({
   hasTimeLimitHint: {
     id: 'course.assessment.AssessmentForm.hasTimeLimitHint',
     defaultMessage:
-      'When enabled, submissions will automatically be finalised when the time limit is reached.',
+      'When enabled, each submission will have its own timer and will automatically be finalised when its timer ends.',
   },
   gradingMode: {
     id: 'course.assessment.AssessmentForm.gradingMode',