Merge pull request #28292 from code-dot-org/dtl_candidate_6952e41f

apps/src/code-studio/pd/workshop_dashboard/components/workshop_enrollment_school_info.jsx

@@ -103,6 +103,10 @@ export class WorkshopEnrollmentSchoolInfo extends React.Component {
   }
 
   scholarshipInfo(enrollment) {
+    if (enrollment.scholarship_ineligible_reason) {
+      return <td>{enrollment.scholarship_ineligible_reason}</td>;
+    }
+
     if (
       this.props.permissionList.has(ProgramManager) ||
       this.props.permissionList.has(WorkshopAdmin)

apps/src/templates/courseOverview/AssignToSection.js

@@ -69,7 +69,9 @@ class AssignToSection extends Component {
       })
     })
       .done(result => {
-        updateHiddenScript(section.id, scriptId, false);
+        if (scriptId) {
+          updateHiddenScript(section.id, scriptId, false);
+        }
         this.setState({
           sectionIndexToAssign: null
         });

apps/src/templates/projects/ProjectCard.jsx

@@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import color from '../../util/color';
 import i18n from '@cdo/locale';
+import {studio} from '@cdo/apps/lib/util/urlHelpers';
 import $ from 'jquery';
 
 const PROJECT_DEFAULT_IMAGE = '/blockly/media/projects/project_default.png';
@@ -120,7 +121,7 @@ export default class ProjectCard extends React.Component {
         <div style={styles.card}>
           <div style={thumbnailStyle}>
             <a
-              href={url}
+              href={studio(url)}
               style={{width: '100%'}}
               target={isPublicGallery ? '_blank' : undefined}
             >

apps/src/templates/sectionAssessments/SubmissionStatusAssessmentsTable.jsx

@@ -54,8 +54,10 @@ export const studentOverviewDataPropType = PropTypes.shape({
   name: PropTypes.string.isRequired,
   numMultipleChoiceCorrect: PropTypes.number,
   numMultipleChoice: PropTypes.number,
-  submissionTimeStamp: PropTypes.string.isRequired,
+  /* timestamp is passed in as a Date so the column can be sorted accurately. See note in sectionAssessmentsRedux for details*/
+  submissionTimeStamp: PropTypes.instanceOf(Date).isRequired,
   isSubmitted: PropTypes.bool.isRequired,
+  inProgress: PropTypes.bool.isRequired,
   url: PropTypes.string
 });
 
@@ -114,10 +116,22 @@ class SubmissionStatusAssessmentsTable extends Component {
 
   submissionTimestampColumnFormatter = (submissionTimeStamp, {rowData}) => {
     const isSubmitted = rowData.isSubmitted;
+    const inProgress = rowData.inProgress;
+    var submissionTimeStampText;
+    switch (true) {
+      case isSubmitted:
+        submissionTimeStampText = rowData.submissionTimeStamp.toLocaleString();
+        break;
+      case inProgress:
+        submissionTimeStampText = i18n.inProgress();
+        break;
+      default:
+        submissionTimeStampText = i18n.notStarted();
+    }
 
     return (
-      <div style={styles.main}>
-        <div style={styles.text}>{submissionTimeStamp}</div>
+      <div style={styles.main} id="timestampCell">
+        <div style={styles.text}>{submissionTimeStampText}</div>
         {isSubmitted && (
           <div style={styles.icon}>
             <FontAwesome id="checkmark" icon="check-circle" />
@@ -189,7 +203,8 @@ class SubmissionStatusAssessmentsTable extends Component {
             style: {
               ...tableLayoutStyles.headerCell,
               ...{width: TABLE_COLUMN_WIDTHS.timeStamp}
-            }
+            },
+            id: 'timestampHeaderCell'
           },
           transforms: [sortable]
         },

apps/src/templates/sectionAssessments/assessmentsTestHelpers.js

@@ -1,4 +1,19 @@
 import i18n from '@cdo/locale';
+import {
+  inProgressFakeTimestamp,
+  notStartedFakeTimestamp
+} from '@cdo/apps/templates/sectionAssessments/sectionAssessmentsRedux';
+
+export const testDataTimestamps = {
+  newest: new Date('2019-04-09T20:52:05.000+00:00'),
+  newer: new Date('2019-04-09T20:40:05.000+00:00'),
+  new: new Date('2019-02-09T20:52:05.000+00:00'),
+  old: new Date('2018-12-09T20:52:05.000+00:00'),
+  older: new Date('2018-10-09T20:52:05.000+00:00'),
+  oldest: new Date('2018-10-07T20:52:05.000+00:00'),
+  notStarted: notStartedFakeTimestamp,
+  inProgress: inProgressFakeTimestamp
+};
 
 // Data for students' assessments multiple choice table
 export const studentOverviewData = [
@@ -7,48 +22,90 @@ export const studentOverviewData = [
     name: 'Caley',
     numMultipleChoiceCorrect: 7,
     numMultipleChoice: 10,
-    isSubmitted: true,
-    submissionTimeStamp: '2/16/18 - 7:41 AM'
+    isSubmitted: false,
+    inProgress: false,
+    submissionTimeStamp: testDataTimestamps.notStarted
   },
   {
     id: 2,
     name: 'Maddie',
     numMultipleChoiceCorrect: 3,
     numMultipleChoice: 10,
     isSubmitted: false,
-    submissionTimeStamp: ''
+    inProgress: true,
+    submissionTimeStamp: testDataTimestamps.inProgress
   },
   {
     id: 3,
     name: 'Erin',
     numMultipleChoiceCorrect: 8,
     numMultipleChoice: 10,
     isSubmitted: true,
-    submissionTimeStamp: '5/29/18 - 7:41 AM'
+    inProgress: false,
+    submissionTimeStamp: testDataTimestamps.newest
   },
   {
     id: 4,
     name: 'Dave',
     numMultipleChoiceCorrect: 10,
     numMultipleChoice: 10,
     isSubmitted: true,
-    submissionTimeStamp: '5/29/18 - 8:00 AM'
+    inProgress: false,
+    submissionTimeStamp: testDataTimestamps.newer
   },
   {
     id: 5,
     name: 'Brad',
     numMultipleChoiceCorrect: 0,
     numMultipleChoice: 10,
-    isSubmitted: false,
-    submissionTimeStamp: ''
+    isSubmitted: true,
+    inProgress: false,
+    submissionTimeStamp: testDataTimestamps.new
   },
   {
     id: 6,
     name: 'Mike',
     numMultipleChoiceCorrect: 0,
     numMultipleChoice: 10,
     isSubmitted: true,
-    submissionTimeStamp: '5/29/18 - 8:05 AM'
+    inProgress: false,
+    submissionTimeStamp: testDataTimestamps.old
+  },
+  {
+    id: 7,
+    name: 'Dani',
+    numMultipleChoiceCorrect: 0,
+    numMultipleChoice: 10,
+    isSubmitted: true,
+    inProgress: false,
+    submissionTimeStamp: testDataTimestamps.older
+  },
+  {
+    id: 8,
+    name: 'Amanda',
+    numMultipleChoiceCorrect: 0,
+    numMultipleChoice: 10,
+    isSubmitted: true,
+    inProgress: false,
+    submissionTimeStamp: testDataTimestamps.oldest
+  },
+  {
+    id: 9,
+    name: 'Nkiru',
+    numMultipleChoiceCorrect: 7,
+    numMultipleChoice: 10,
+    isSubmitted: false,
+    inProgress: true,
+    submissionTimeStamp: testDataTimestamps.inProgress
+  },
+  {
+    id: 10,
+    name: 'Karis',
+    numMultipleChoiceCorrect: 7,
+    numMultipleChoice: 10,
+    isSubmitted: false,
+    inProgress: false,
+    submissionTimeStamp: testDataTimestamps.notStarted
   }
 ];
 

apps/src/templates/sectionAssessments/sectionAssessmentsRedux.js

@@ -3,7 +3,6 @@ import {
   SET_SCRIPT,
   getSelectedScriptName
 } from '@cdo/apps/redux/scriptSelectionRedux';
-import i18n from '@cdo/locale';
 import experiments from '@cdo/apps/util/experiments';
 
 export const ALL_STUDENT_FILTER = 0;
@@ -57,6 +56,14 @@ const ANSWER_LETTERS = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'];
 
 export const ASSESSMENT_FEEDBACK_OPTION_ID = 0;
 
+/* In order for the sorting of the submission timestamp column to work correctly in the SubmissionStatusAssessmentsTable, the submissionTimeStamp field must be a Date. So, we pass in arbitrary Dates in the past to handle when the assessment is in progress or not yet started. */
+export const inProgressFakeTimestamp = new Date(
+  '1990-01-01T20:52:05.000+00:00'
+);
+export const notStartedFakeTimestamp = new Date(
+  '1980-01-01T20:52:05.000+00:00'
+);
+
 // Action type constants
 const SET_ASSESSMENT_RESPONSES = 'sectionAssessments/SET_ASSESSMENT_RESPONSES';
 const SET_ASSESSMENTS_QUESTIONS =
@@ -651,25 +658,32 @@ export const getStudentsMCSummaryForCurrentAssessment = state => {
     const studentsAssessment =
       studentsObject.responses_by_assessment[currentAssessmentId];
 
-    // If the student has not submitted this assessment, display empty results.
+    // If the student has not submitted this assessment
     if (!studentsAssessment) {
       return {
         id: studentId,
         name: studentsObject.student_name,
         isSubmitted: false,
-        submissionTimeStamp: i18n.notStarted()
+        inProgress: false,
+        submissionTimeStamp: notStartedFakeTimestamp
       };
     }
     // Transform that data into what we need for this particular table, in this case
     // it is the structure studentOverviewDataPropType
-    const submissionTimeStamp = studentsAssessment.submitted
-      ? new Date(studentsAssessment.timestamp).toLocaleString()
-      : i18n.inProgress();
+
+    /* In progress assessments have a timestamp from the server indicating when the student last worked on the assessment. We don't display that timestamp in the SubmissionStatusAssessmentsTable, but we use it here to check if the assessment has been started. */
+    const inProgress =
+      studentsAssessment.timestamp && !studentsAssessment.submitted;
+    const submissionTimeStamp = inProgress
+      ? inProgressFakeTimestamp
+      : new Date(studentsAssessment.timestamp);
+
     return {
       id: studentId,
       name: studentsObject.student_name,
       numMultipleChoiceCorrect: studentsAssessment.multi_correct,
       numMultipleChoice: studentsAssessment.multi_count,
+      inProgress: inProgress,
       isSubmitted: studentsAssessment.submitted,
       submissionTimeStamp: submissionTimeStamp,
       url: studentsAssessment.url