Adding canViewMeasuredValues flag in assignment edit form so the teacher can choose whether students see absolute memory and time values in the test results.

Author: krulis-martin

src/components/forms/EditAssignmentForm/EditAssignmentForm.js

@@ -58,6 +58,7 @@ export const prepareInitialValues = lruMemoize(
       solutionFilesLimit = null,
       solutionSizeLimit = null,
       canViewLimitRatios = true,
+      canViewMeasuredValues = false,
       canViewJudgeStdout = false,
       canViewJudgeStderr = false,
       isBonus = false,
@@ -84,6 +85,7 @@ export const prepareInitialValues = lruMemoize(
     solutionFilesLimit,
     solutionSizeLimit: solutionSizeLimit && Math.ceil(solutionSizeLimit / 1024), // B -> KiB
     canViewLimitRatios,
+    canViewMeasuredValues,
     canViewJudgeStdout,
     canViewJudgeStderr,
     isBonus,
@@ -118,6 +120,7 @@ export const transformSubmittedData = ({
   solutionFilesLimit,
   solutionSizeLimit,
   canViewLimitRatios,
+  canViewMeasuredValues,
   canViewJudgeStdout,
   canViewJudgeStderr,
   isBonus,
@@ -143,6 +146,7 @@ export const transformSubmittedData = ({
     solutionFilesLimit,
     solutionSizeLimit: solutionSizeLimit ? solutionSizeLimit * 1024 : null, // if not null, convert KiB -> B
     canViewLimitRatios,
+    canViewMeasuredValues: canViewLimitRatios && canViewMeasuredValues,
     canViewJudgeStdout,
     canViewJudgeStderr,
     isBonus,
@@ -325,6 +329,7 @@ class EditAssignmentForm extends Component {
       deadlines,
       runtimeEnvironments,
       visibility,
+      canViewLimitRatios,
       showSendNotification,
       submitButtonMessages = SUBMIT_BUTTON_MESSAGES_DEFAULT,
       mergeJudgeLogs,
@@ -626,7 +631,7 @@ class EditAssignmentForm extends Component {
 
         <Container fluid>
           <Row>
-            <Col md={mergeJudgeLogs ? 6 : 12} lg={mergeJudgeLogs ? 6 : 4}>
+            <Col md={6} xl={mergeJudgeLogs ? 4 : 6}>
               <Field
                 name="canViewLimitRatios"
                 component={CheckboxField}
@@ -647,7 +652,29 @@ class EditAssignmentForm extends Component {
                 }
               />
             </Col>
-            <Col md={6} lg={mergeJudgeLogs ? 6 : 4}>
+            <Col md={6} xl={mergeJudgeLogs ? 4 : 6}>
+              <Field
+                name="canViewMeasuredValues"
+                component={CheckboxField}
+                onOff
+                disabled={!canViewLimitRatios}
+                label={
+                  <span>
+                    <FormattedMessage
+                      id="app.editAssignmentForm.canViewMeasuredValues"
+                      defaultMessage="Show absolute measurements"
+                    />
+                    <Explanation id="canViewMeasuredValuesExplanation">
+                      <FormattedMessage
+                        id="app.editAssignmentForm.canViewMeasuredValuesExplanation"
+                        defaultMessage="Whether the students can see the measured execution time and consumed memory in absolute units (not just as a relative ratio of the test limits)."
+                      />
+                    </Explanation>
+                  </span>
+                }
+              />
+            </Col>
+            <Col md={6} xl={mergeJudgeLogs ? 4 : 6}>
               <Field
                 name="canViewJudgeStdout"
                 component={CheckboxField}
@@ -685,7 +712,7 @@ class EditAssignmentForm extends Component {
             </Col>
 
             {!mergeJudgeLogs && (
-              <Col md={6} lg={4}>
+              <Col md={6}>
                 <Field
                   name="canViewJudgeStderr"
                   component={CheckboxField}
@@ -891,6 +918,7 @@ EditAssignmentForm.propTypes = {
   deadlines: PropTypes.string,
   runtimeEnvironments: PropTypes.array,
   visibility: PropTypes.string,
+  canViewLimitRatios: PropTypes.bool,
   showSendNotification: PropTypes.bool,
   submitButtonMessages: PropTypes.object,
   mergeJudgeLogs: PropTypes.bool.isRequired,

src/locales/cs.json

@@ -311,6 +311,8 @@
   "app.editAssignmentForm.canViewJudgeStdoutExplanation": "Pokud je přepínač nastaven, zpřístupní primární logy sudího (stdout) studentům. Vezměte na vědomí, že zveřejnění logů dá studentům potřebné prostředky, aby mohli získat testovací vstupy, což nemusí být u některých úloh žádoucí.",
   "app.editAssignmentForm.canViewLimitRatios": "Viditelnost paměti a času",
   "app.editAssignmentForm.canViewLimitRatiosExplanation": "Zda studenti vidí dobu běhu a spotřebovanou paměť svých řešení. Naměřené hodnoty jsou uvedeny relativně vůči nastaveným limitům, tedy studenti nevidí absolutní čísla ale pouze poměr v procentech.",
+  "app.editAssignmentForm.canViewMeasuredValues": "Zobrazit absolutní hodnoty",
+  "app.editAssignmentForm.canViewMeasuredValuesExplanation": "Zda studenti vidí absolutní hodnoty doby běhu a spotřebované paměťi (ne pouze relativní poměr vůči nastaveným limitům testů).",
   "app.editAssignmentForm.deadlines.dual": "Dva termíny",
   "app.editAssignmentForm.deadlines.dual.explanation": "Zadaná úloha má dva termíny odevzdání a dva bodové limity. Řešení odevzdaná před prvním termínem jsou hodnocena body v rozsahu prvního limitu, řešení odevzdaná mezi danými termíny jsou hodnocena body v rozsahu druhého limitu. Řešení odevzdaná po druhém termínu nedostanou žádné body.",
   "app.editAssignmentForm.deadlines.interpolated": "Dva termíny s interpolací",

src/locales/en.json

@@ -311,6 +311,8 @@
   "app.editAssignmentForm.canViewJudgeStdoutExplanation": "If set, judge primary logs (stdout) are visible to students. Please note that publishing the logs also provides means for the students to access the inputs which may not be desriable for some categories of exercises.",
   "app.editAssignmentForm.canViewLimitRatios": "Visibility of memory and time",
   "app.editAssignmentForm.canViewLimitRatiosExplanation": "Whether the students can see the measured execution time and consumed memory of their solutions. The measurements are displayed relatively to the established limits, so the students do not see the absolute values but only a percentage.",
+  "app.editAssignmentForm.canViewMeasuredValues": "Show absolute measurements",
+  "app.editAssignmentForm.canViewMeasuredValuesExplanation": "Whether the students can see the measured execution time and consumed memory in absolute units (not just as a relative ratio of the test limits).",
   "app.editAssignmentForm.deadlines.dual": "Dual deadlines",
   "app.editAssignmentForm.deadlines.dual.explanation": "The assignment has two deadlines and two max. points limits. Solutions submitted before the first deadline are awarded points up to the first limit, solutions between the two deadlines are awarded points up to the second limit. No points are granted for solutions after the second deadline.",
   "app.editAssignmentForm.deadlines.interpolated": "Dual deadlines interpolated",

src/pages/EditAssignment/EditAssignment.js

@@ -107,6 +107,7 @@ class EditAssignment extends Component {
       runtimeEnvironments,
       visibility,
       visibleFrom,
+      canViewLimitRatios,
     } = this.props;
 
     return (
@@ -185,6 +186,7 @@ class EditAssignment extends Component {
                       visibility={visibility}
                       showSendNotification={showSendNotification(assignment, visibility, visibleFrom)}
                       mergeJudgeLogs={assignment.mergeJudgeLogs}
+                      canViewLimitRatios={canViewLimitRatios}
                     />
                   )}
                 </ResourceRenderer>
@@ -238,6 +240,7 @@ EditAssignment.propTypes = {
   deadlines: PropTypes.string,
   visibility: PropTypes.string,
   visibleFrom: PropTypes.object,
+  canViewLimitRatios: PropTypes.bool,
   allowVisibleFrom: PropTypes.bool,
   exerciseSync: PropTypes.func.isRequired,
   validateAssignment: PropTypes.func.isRequired,
@@ -261,6 +264,7 @@ export default withLinks(
         visibility: editAssignmentFormSelector(state, 'visibility'),
         allowVisibleFrom: editAssignmentFormSelector(state, 'allowVisibleFrom'),
         visibleFrom: editAssignmentFormSelector(state, 'visibleFrom'),
+        canViewLimitRatios: editAssignmentFormSelector(state, 'canViewLimitRatios'),
       };
     },
     (dispatch, { params: { assignmentId } }) => ({