Merge pull request #1132 from UniversityOfHelsinkiCS/trunk

Minor bug fixes 🦟👏 and a migration 🧨
UniversityOfHelsinkiCS · Jul 16, 2019 · 04bb80a · 04bb80a
2 parents 46560ab + 7f3e84a
commit 04bb80a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/services/backend/shared/migrations/20190816_00_drop_mandatory_course_labels.js b/services/backend/shared/migrations/20190816_00_drop_mandatory_course_labels.js
@@ -0,0 +1,9 @@
+module.exports = {
+  up: async (queryInterface) => {
+    return queryInterface.sequelize.transaction(async transaction => {
+      await queryInterface.dropTable('mandatory_course_labels', { transaction })
+    })
+  },
+  down: async () => {
+  }
+}
diff --git a/services/oodikone2-frontend/src/components/CourseStatistics/SearchForm/index.jsx b/services/oodikone2-frontend/src/components/CourseStatistics/SearchForm/index.jsx
@@ -39,6 +39,7 @@ class SearchForm extends Component {
       this.fetchStatisticsFromUrlParams()
     } else {
       this.props.clearCourses()
+      this.props.clearCourseStats()
     }
   }
 
@@ -237,6 +238,7 @@ SearchForm.propTypes = {
   getSemesters: func.isRequired,
   getCourseStats: func.isRequired,
   clearCourses: func.isRequired,
+  clearCourseStats: func.isRequired,
   matchingCourses: arrayOf(shape({})).isRequired,
   years: arrayOf(shape({})).isRequired,
   isLoading: bool.isRequired,

diff --git a/services/oodikone2-frontend/src/components/StudentDetails/index.jsx b/services/oodikone2-frontend/src/components/StudentDetails/index.jsx
@@ -51,7 +51,7 @@ class StudentDetails extends Component {
     const sample = [student]
     const dates = flattenDeep(student.courses.map(c => c.date)).map(d => new Date(d).getTime())
     sample.maxCredits = student.credits
-    sample.maxDate = Math.max(...dates)
+    sample.maxDate = dates.length > 0 ? Math.max(...dates) : new Date().getTime()
     sample.minDate = new Date(student.started).getTime()
     return (
       <CreditAccumulationGraphHighCharts