Minor handy tweaks of shadow assignment points edit form and adding forgotten translations.

Author: Martin Krulis

src/components/Groups/ResultsTable/ResultsTable.js

@@ -192,6 +192,18 @@ class ResultsTable extends Component {
       : this.closeDialog();
   };
 
+  removeShadowPoints = () => {
+    if (this.state.dialogClosing) return;
+
+    const points = this.getDialogPoints();
+    if (points && this.state.dialogUserId) {
+      this.setState({ dialogClosing: true });
+      return this.props.removeShadowPoints(this.state.dialogShadowId, this.state.dialogUserId, points.id).then(() => {
+        this.setState({ dialogOpen: false, dialogClosing: false });
+      });
+    }
+  };
+
   prepareColumnDescriptors = defaultMemoize((assignments, shadowAssignments, loggedUser, locale) => {
     const {
       isAdmin,
@@ -443,6 +455,7 @@ class ResultsTable extends Component {
                       initialValues={getPointsFormInitialValues(this.getDialogPoints(), this.state.dialogUserId)}
                       onSubmit={this.submitPointsForm}
                       maxPoints={this.getDialogShadowAssignment().maxPoints}
+                      onRemovePoints={this.removeShadowPoints}
                     />
                   )}
                 </React.Fragment>

src/components/forms/EditLimitsForm/EditLimitsForm.js

@@ -47,7 +47,7 @@ class EditLimitsForm extends Component {
             <div className="text-center">
               {dirty && (
                 <span>
-                  <Button type="reset" onClick={reset} bsStyle={'danger'} className="btn-flat">
+                  <Button type="reset" onClick={reset} bsStyle={'danger'}>
                     <RefreshIcon gapRight />
                     <FormattedMessage id="generic.reset" defaultMessage="Reset" />
                   </Button>

src/components/forms/EditShadowAssignmentPointsForm/EditShadowAssignmentPointsForm.js

@@ -2,12 +2,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { reduxForm, Field } from 'redux-form';
-import { Form, Alert, Grid, Row, Col } from 'react-bootstrap';
+import { Form, FormGroup, Alert, Grid, Row, Col } from 'react-bootstrap';
 import { defaultMemoize } from 'reselect';
 import moment from 'moment';
 
 import SubmitButton from '../SubmitButton';
 import { TextField, DatetimeField, NumericTextField } from '../Fields';
+import Button from '../../widgets/FlatButton';
+import Icon, { RefreshIcon, DeleteIcon } from '../../icons';
 
 export const getPointsFormInitialValues = defaultMemoize((userPoints, awardeeId) => {
   return userPoints
@@ -34,6 +36,9 @@ export const transformPointsFormSubmitData = ({ pointsId = null, awardedAt, ...f
 });
 
 const EditShadowAssignmentPointsForm = ({
+  onRemovePoints = null,
+  change,
+  reset,
   submitting,
   handleSubmit,
   dirty,
@@ -54,7 +59,7 @@ const EditShadowAssignmentPointsForm = ({
 
     <Grid fluid>
       <Row>
-        <Col md={12} lg={6}>
+        <Col md={12} lg={5}>
           <NumericTextField
             name="points"
             maxLength={6}
@@ -63,12 +68,33 @@ const EditShadowAssignmentPointsForm = ({
             label={<FormattedMessage id="app.editShadowAssignmentPointsForm.points" defaultMessage="Points:" />}
           />
         </Col>
-        <Col md={12} lg={6}>
-          <Field
-            name="awardedAt"
-            component={DatetimeField}
-            label={<FormattedMessage id="app.editShadowAssignmentPointsForm.awardedAt" defaultMessage="Awarded at:" />}
-          />
+        <Col md={12} lg={7}>
+          <table className="full-width">
+            <tbody>
+              <tr>
+                <td>
+                  <Field
+                    name="awardedAt"
+                    component={DatetimeField}
+                    label={
+                      <FormattedMessage
+                        id="app.editShadowAssignmentPointsForm.awardedAt"
+                        defaultMessage="Awarded at:"
+                      />
+                    }
+                  />
+                </td>
+                <td className="valign-bottom shrink-col">
+                  <FormGroup>
+                    <Button onClick={() => change('awardedAt', moment().startOf('minute'))}>
+                      <Icon icon="history" gapRight />
+                      <FormattedMessage id="app.editShadowAssignmentPointsForm.setNow" defaultMessage="Now" />
+                    </Button>
+                  </FormGroup>
+                </td>
+              </tr>
+            </tbody>
+          </table>
         </Col>
       </Row>
       <Row>
@@ -88,6 +114,12 @@ const EditShadowAssignmentPointsForm = ({
     {warning && <Alert bsStyle="warning">{warning}</Alert>}
 
     <div className="text-center">
+      {dirty && (
+        <Button type="reset" onClick={reset} bsStyle={'danger'}>
+          <RefreshIcon gapRight />
+          <FormattedMessage id="generic.reset" defaultMessage="Reset" />
+        </Button>
+      )}
       <SubmitButton
         id="shadow-assignment-points"
         handleSubmit={handleSubmit}
@@ -102,12 +134,25 @@ const EditShadowAssignmentPointsForm = ({
           success: <FormattedMessage id="generic.saved" defaultMessage="Saved" />,
         }}
       />
+
+      {onRemovePoints && (
+        <Button onClick={onRemovePoints} bsStyle="danger" className="em-margin-left">
+          <DeleteIcon gapRight />
+          <FormattedMessage
+            id="app.editShadowAssignmentPointsForm.removePoints"
+            defaultMessage="Remove Points Record"
+          />
+        </Button>
+      )}
     </div>
   </Form>
 );
 
 EditShadowAssignmentPointsForm.propTypes = {
   maxPoints: PropTypes.number.isRequired,
+  onRemovePoints: PropTypes.func,
+  change: PropTypes.func.isRequired,
+  reset: PropTypes.func.isRequired,
   handleSubmit: PropTypes.func.isRequired,
   submitFailed: PropTypes.bool,
   dirty: PropTypes.bool,

src/components/forms/Fields/DatetimeField.js

@@ -54,9 +54,9 @@ class DatetimeField extends Component {
             [styles.dirty]: dirty && !ignoreDirty && !error && !warning,
             [styles.active]: active,
           })}
-        />{' '}
-        {error && <HelpBlock> {error} </HelpBlock>}
-        {!error && warning && <HelpBlock> {warning} </HelpBlock>}
+        />
+        {error && <HelpBlock>{error}</HelpBlock>}
+        {!error && warning && <HelpBlock>{warning}</HelpBlock>}
       </FormGroup>
     );
   }

src/locales/cs.json

@@ -438,6 +438,8 @@
   "app.editShadowAssignmentPointsForm.failed": "Nebylo možné uložit body stínové úlohy.",
   "app.editShadowAssignmentPointsForm.note": "Poznámka:",
   "app.editShadowAssignmentPointsForm.points": " Body:",
+  "app.editShadowAssignmentPointsForm.removePoints": "Odstranit celý záznam",
+  "app.editShadowAssignmentPointsForm.setNow": "Teď",
   "app.editShadowAssignmentPointsForm.validation.pointsOutOfRange": "Body jsou mimo běžný rozsah. Běžný rozsah je od 0 do {maxPoints}.",
   "app.editSisTerm.advertiseUntil": "Nabízet studentům tento semestr do:",
   "app.editSisTerm.beginning": "Začátek semestru:",
@@ -762,6 +764,7 @@
   "app.filterUsersListForm.searchName": "Vyhledat podle jména",
   "app.footer.copyright": "Copyright © 2016-{year} <a href='{website}' target='_blank'>ReCodEx</a>. Všechna práva vyhrazena.",
   "app.footer.version": "<strong>Verze</strong> {version} (<a href='{changelogUrl}' target='_blank'>log změn</a>)",
+  "app.forkExerciseForm.confirmSubmit": "Tento proces vytvoří další kopii zvolené úlohy. Duplikace dává smysl pouze v případech, kdy se pokoušíte vytvořit novou úlohu, ale nechcete začínat zcela od píky. Prosím, neduplikujte úlohy, pokud je vašim cílem pouze jejich připojení do jiné domovské skupiny. Opravdu chcete provést duplikaci?",
   "app.forkExerciseForm.selectGroupFirst": "... nejprve vyberte domovskou skupinu ...",
   "app.forkExerciseForm.showForkedExerciseButton": "Ukázat zduplikovanou úlohu",
   "app.forkExerciseForm.submit": "Zduplikovat úlohu",
@@ -1196,6 +1199,7 @@
   "app.solutionsTable.noSolutionsFound": "Zatím nebyla odevzdána žádná řešení.",
   "app.solutionsTable.note": "Poznámka",
   "app.solutionsTable.receivedPoints": "Body",
+  "app.solutionsTable.rowsCount": "Celkem záznamů: {count}",
   "app.solutionsTable.solutionValidity": "Správnost",
   "app.solutionsTable.submissionDate": "Datum odevzdání",
   "app.solutionsTable.submitNewSolution": "Odevzdat nové řešení",

src/locales/en.json

@@ -438,6 +438,8 @@
   "app.editShadowAssignmentPointsForm.failed": "Cannot save the shadow assignment points.",
   "app.editShadowAssignmentPointsForm.note": "Note:",
   "app.editShadowAssignmentPointsForm.points": "Points:",
+  "app.editShadowAssignmentPointsForm.removePoints": "Remove Points Record",
+  "app.editShadowAssignmentPointsForm.setNow": "Now",
   "app.editShadowAssignmentPointsForm.validation.pointsOutOfRange": "Points are out of regular range. Regular score for this assignment is between 0 and {maxPoints}.",
   "app.editSisTerm.advertiseUntil": "Advertise this term to students until:",
   "app.editSisTerm.beginning": "Beginning of the term:",
@@ -762,6 +764,7 @@
   "app.filterUsersListForm.searchName": "Search by name",
   "app.footer.copyright": "Copyright © 2016-{year} <a href='{website}' target='_blank'>ReCodEx</a>. All rights reserved.",
   "app.footer.version": "<strong>Version</strong> {version} (<a href='{changelogUrl}' target='_blank'>changelog</a>)",
+  "app.forkExerciseForm.confirmSubmit": "Fork process will create another copy of the exercise. This only make sense if you need to create a different exercise and you do not want to start from scratch. Please, do not fork exercises just to attach them to a different groups of residence. Are you sure you would like to proceed with forking?",
   "app.forkExerciseForm.selectGroupFirst": "... select group of residence first ...",
   "app.forkExerciseForm.showForkedExerciseButton": "Show the Forked Exercise",
   "app.forkExerciseForm.submit": "Fork Exercise",
@@ -1196,6 +1199,7 @@
   "app.solutionsTable.noSolutionsFound": "No solutions were submitted yet.",
   "app.solutionsTable.note": "Note",
   "app.solutionsTable.receivedPoints": "Points",
+  "app.solutionsTable.rowsCount": "Total records: {count}",
   "app.solutionsTable.solutionValidity": "Validity",
   "app.solutionsTable.submissionDate": "Date of submission",
   "app.solutionsTable.submitNewSolution": "Submit New Solution",

src/locales/whitelist_en.json

@@ -438,6 +438,8 @@
   "app.editShadowAssignmentPointsForm.failed",
   "app.editShadowAssignmentPointsForm.note",
   "app.editShadowAssignmentPointsForm.points",
+  "app.editShadowAssignmentPointsForm.removePoints",
+  "app.editShadowAssignmentPointsForm.setNow",
   "app.editShadowAssignmentPointsForm.validation.pointsOutOfRange",
   "app.editSisTerm.advertiseUntil",
   "app.editSisTerm.beginning",
@@ -762,6 +764,7 @@
   "app.filterUsersListForm.searchName",
   "app.footer.copyright",
   "app.footer.version",
+  "app.forkExerciseForm.confirmSubmit",
   "app.forkExerciseForm.selectGroupFirst",
   "app.forkExerciseForm.showForkedExerciseButton",
   "app.forkExerciseForm.submit",
@@ -1196,6 +1199,7 @@
   "app.solutionsTable.noSolutionsFound",
   "app.solutionsTable.note",
   "app.solutionsTable.receivedPoints",
+  "app.solutionsTable.rowsCount",
   "app.solutionsTable.solutionValidity",
   "app.solutionsTable.submissionDate",
   "app.solutionsTable.submitNewSolution",