Misc minor appearance adjustments, labels, callouts, translations, ...

Author: krulis-martin

src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js

@@ -61,7 +61,7 @@ class AssignmentsTable extends Component {
 
     return (
       <>
-        <Table hover className="mb-1">
+        <Table hover className="mb-0">
           {assignmentsPreprocessed.length > 0 && (
             <thead>
               <tr>

src/components/Assignments/ShadowAssignment/ShadowAssignmentsTable/ShadowAssignmentsTable.js

@@ -17,7 +17,7 @@ const ShadowAssignmentsTable = ({
   isAdmin = false,
   intl: { locale },
 }) => (
-  <Table hover={shadowAssignments.size > 0}>
+  <Table hover={shadowAssignments.size > 0} className="mb-0">
     {shadowAssignments.size > 0 && (
       <thead>
         <tr>

src/components/Groups/ResultsTable/ResultsTable.js

@@ -479,7 +479,7 @@ class ResultsTable extends Component {
           <div className="text-center">
             <Button
               variant="primary"
-              className={styles.downloadButton}
+              className="my-3"
               onClick={() =>
                 downloadString(
                   `${groupName}.csv`,

src/components/Groups/ResultsTable/ResultsTable.less

@@ -44,12 +44,6 @@
   text-align: left;
 }
 
-.downloadButton {
-  margin-top: 20px;
-  margin-left: 10px;
-  margin-bottom: 10px;
-}
-
 td.pointsCell {
   position: relative;
 }

src/components/helpers/LocalizedTexts/LocalizedTexts.js

@@ -103,8 +103,8 @@ const LocalizedTexts = ({ locales = [], noLocalesMessage = null }) => {
 LocalizedTexts.propTypes = {
   locales: PropTypes.arrayOf(
     PropTypes.shape({
-      locale: PropTypes.string.isRequried,
-      text: PropTypes.string.isRequried,
+      locale: PropTypes.string.isRequired,
+      text: PropTypes.string.isRequired,
     })
   ),
   noLocalesMessage: PropTypes.any,

src/locales/cs.json

@@ -653,6 +653,7 @@
   "app.exercise.detach": "Odpojit",
   "app.exercise.detailTitle": "Popis úlohy",
   "app.exercise.difficulty": "Obtížnost",
+  "app.exercise.exerciseReadyToAssign": "Úloha je připravená k zadání do skupiny. Můžete tak učinit přímo na stránce úloh vybrané skupiny, nebo můžete použiít formulář pro hromadné zadání do více skupin na stránce Zadané úlohy.",
   "app.exercise.forked": "Duplikováno z",
   "app.exercise.groups": "Domovské skupiny",
   "app.exercise.isBroken": "Konfigurace úlohy není kompletní a je třeba ji doplnit.",
@@ -1365,6 +1366,8 @@
   "app.resubmitSolution.resubmitNondebug": "Resubmit (normální mód)",
   "app.resultsArchiveInfoBox.description": "Detailní logy a výpisy",
   "app.resultsArchiveInfoBox.title": "Archiv s výsledky",
+  "app.resultsTable.cancelOnlyShowMe": "Zobrazit všechny studenty ve skupině",
+  "app.resultsTable.onlyShowMe": "Skrýt všechny kromě mě",
   "app.resultsTable.total": "Celkem",
   "app.reviewedSolution.revoke": "Zrušit revizi",
   "app.reviewedSolution.set": "Revidovat",
@@ -1533,7 +1536,6 @@
   "app.solution.allSolutions": "všechna řešení",
   "app.solution.anotherAcceptedWarning": "Jiné řešení již bylo označeno jako akceptované. Body tohoto řešení nejsou bráný v potaz.",
   "app.solution.anotherBestWarning": "Jiné řešení je považováno za nejlepší (tzn. má více bodů nebo má stejně bodů a bylo odevzdáno později).",
-  "app.solution.dotnetResubmitTemporaryDisabled": "Ladicí resubmit je dočasně zablokován",
   "app.solution.editNoteModalTitle": "Upravit poznámku řešení",
   "app.solution.emptyNote": "prázdná",
   "app.solution.environment": "Použitý jazyk:",

src/locales/en.json

@@ -653,6 +653,7 @@
   "app.exercise.detach": "Detach",
   "app.exercise.detailTitle": "Exercise description",
   "app.exercise.difficulty": "Difficulty",
+  "app.exercise.exerciseReadyToAssign": "The exercise is ready to be assigned. You may do this directly on the assignments page of selected group, or assign it simultaneously to multiple groups using form on Assignments page.",
   "app.exercise.forked": "Forked from",
   "app.exercise.groups": "Groups of Residence",
   "app.exercise.isBroken": "Exercise configuration is incomplete and needs fixing.",
@@ -1365,6 +1366,8 @@
   "app.resubmitSolution.resubmitNondebug": "Resubmit (normal mode)",
   "app.resultsArchiveInfoBox.description": "Detailed logs and dumps",
   "app.resultsArchiveInfoBox.title": "Results archive",
+  "app.resultsTable.cancelOnlyShowMe": "Show all students in the group",
+  "app.resultsTable.onlyShowMe": "Hide everyone except for myself",
   "app.resultsTable.total": "Total",
   "app.reviewedSolution.revoke": "Revoke Review",
   "app.reviewedSolution.set": "Review",
@@ -1533,7 +1536,6 @@
   "app.solution.allSolutions": "all solutions",
   "app.solution.anotherAcceptedWarning": "Another solution has been marked as accepted. Points of this solution are not taken into account.",
   "app.solution.anotherBestWarning": "Another solution is considered as the best (i.e., it has gained more points or it has the same points but it was submitted later).",
-  "app.solution.dotnetResubmitTemporaryDisabled": "Debug Resubmit Temporary Disabled",
   "app.solution.editNoteModalTitle": "Edit Solution Note",
   "app.solution.emptyNote": "empty",
   "app.solution.environment": "Used language:",

src/pages/Exercise/Exercise.js

@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 import { Row, Col } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
 
 import Button, { TheButtonGroup } from '../../components/widgets/TheButton';
 import Page from '../../components/layout/Page';
@@ -16,10 +17,11 @@ import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 import ReferenceSolutionsTable from '../../components/Exercises/ReferenceSolutionsTable';
 import SubmitSolutionContainer from '../../containers/SubmitSolutionContainer';
 import Box from '../../components/widgets/Box';
-import { ExerciseIcon, DetailIcon, DeleteIcon } from '../../components/icons';
+import { ExerciseIcon, DetailIcon, DeleteIcon, SendIcon, LinkIcon } from '../../components/icons';
 import Confirm from '../../components/forms/Confirm';
-import ExerciseCallouts, { exerciseCalloutsAreVisible } from '../../components/Exercises/ExerciseCallouts';
+import ExerciseCallouts from '../../components/Exercises/ExerciseCallouts';
 import ForkExerciseForm from '../../components/forms/ForkExerciseForm';
+import Callout from '../../components/widgets/Callout';
 
 import { isSubmitting } from '../../redux/selectors/submission';
 import {
@@ -95,6 +97,17 @@ class Exercise extends Component {
     this.setState({ forkId: Math.random().toString() });
   };
 
+  createReferenceSolution = () => {
+    const { userId, initCreateReferenceSolution, history, location } = this.props;
+
+    const scrollPosition = window.scrollY;
+    window.location.hash = '';
+    history.replace(location.pathname + location.search);
+    window.setTimeout(() => window.scrollTo(0, scrollPosition), 0);
+
+    initCreateReferenceSolution(userId);
+  };
+
   render() {
     const {
       userId,
@@ -104,7 +117,6 @@ class Exercise extends Component {
       submitting,
       referenceSolutions,
       intl: { formatMessage, locale },
-      initCreateReferenceSolution,
       deleteReferenceSolution,
       groups,
       groupsAccessor,
@@ -114,7 +126,7 @@ class Exercise extends Component {
       detachingGroupId,
       attachExerciseToGroup,
       detachExerciseFromGroup,
-      links: { EXERCISE_REFERENCE_SOLUTION_URI_FACTORY },
+      links: { EXERCISE_REFERENCE_SOLUTION_URI_FACTORY, EXERCISE_ASSIGNMENTS_URI_FACTORY },
     } = this.props;
 
     const { forkId } = this.state;
@@ -134,29 +146,25 @@ class Exercise extends Component {
               canViewAssignments={hasPermissions(exercise, 'viewAssignments')}
             />
 
-            {exerciseCalloutsAreVisible(exercise) && (
-              <Row>
-                <Col sm={12}>
-                  <ExerciseCallouts {...exercise} />
-                </Col>
-              </Row>
-            )}
+            <Row>
+              <Col sm={12}>
+                <ExerciseCallouts {...exercise} />
 
-            {hasPermissions(exercise, 'fork') && (
-              <Row>
-                <Col sm={12} className="em-margin-bottom">
-                  <ForkExerciseForm
-                    exerciseId={exercise.id}
-                    groups={groups}
-                    forkId={forkId}
-                    onSubmit={formData => forkExercise(forkId, formData)}
-                    resetId={this.reset}
-                    groupsAccessor={groupsAccessor}
-                    initialValues={FORK_EXERCISE_FORM_INITIAL_VALUES}
-                  />
-                </Col>
-              </Row>
-            )}
+                {!exercise.isLocked && !exercise.isBroken && exercise.hasReferenceSolutions && (
+                  <Callout variant="success" icon={<SendIcon />} className="text-muted">
+                    <p>
+                      <FormattedMessage
+                        id="app.exercise.exerciseReadyToAssign"
+                        defaultMessage="The exercise is ready to be assigned. You may do this directly on the assignments page of selected group, or assign it simultaneously to multiple groups using form on Assignments page."
+                      />
+                      <Link to={EXERCISE_ASSIGNMENTS_URI_FACTORY(exercise.id)}>
+                        <LinkIcon gapLeft className="text-muted" />
+                      </Link>
+                    </p>
+                  </Callout>
+                )}
+              </Col>
+            </Row>
 
             <Row>
               <Col xl={6}>
@@ -186,7 +194,7 @@ class Exercise extends Component {
                           <div className="text-center">
                             <Button
                               variant={exercise.isBroken ? 'secondary' : 'success'}
-                              onClick={() => initCreateReferenceSolution(userId)}
+                              onClick={this.createReferenceSolution}
                               disabled={exercise.isBroken}>
                               {exercise.isBroken ? (
                                 <FormattedMessage
@@ -267,6 +275,25 @@ class Exercise extends Component {
                 </ResourceRenderer>
               </Col>
             </Row>
+
+            {hasPermissions(exercise, 'fork') && (
+              <>
+                <hr />
+                <Row>
+                  <Col sm={12}>
+                    <ForkExerciseForm
+                      exerciseId={exercise.id}
+                      groups={groups}
+                      forkId={forkId}
+                      onSubmit={formData => forkExercise(forkId, formData)}
+                      resetId={this.reset}
+                      groupsAccessor={groupsAccessor}
+                      initialValues={FORK_EXERCISE_FORM_INITIAL_VALUES}
+                    />
+                  </Col>
+                </Row>
+              </>
+            )}
           </div>
         )}
       </Page>
@@ -299,6 +326,15 @@ Exercise.propTypes = {
   forkExercise: PropTypes.func.isRequired,
   attachExerciseToGroup: PropTypes.func.isRequired,
   detachExerciseFromGroup: PropTypes.func.isRequired,
+  history: PropTypes.shape({
+    push: PropTypes.func.isRequired,
+    replace: PropTypes.func.isRequired,
+  }),
+  location: PropTypes.shape({
+    pathname: PropTypes.string.isRequired,
+    search: PropTypes.string.isRequired,
+    hash: PropTypes.string.isRequired,
+  }).isRequired,
 };
 
 export default withLinks(
@@ -342,5 +378,5 @@ export default withLinks(
       attachExerciseToGroup: groupId => dispatch(attachExerciseToGroup(exerciseId, groupId)),
       detachExerciseFromGroup: groupId => dispatch(detachExerciseFromGroup(exerciseId, groupId)),
     })
-  )(injectIntl(Exercise))
+  )(injectIntl(withRouter(Exercise)))
 );