delete 'all' from relative course graph

UniversityOfHelsinkiCS · Jun 26, 2019 · 96b163d · 96b163d
1 parent b086707
commit 96b163d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/services/oodikone2-frontend/src/components/CourseStatistics/ResultTabs/Panes/passRate.jsx b/services/oodikone2-frontend/src/components/CourseStatistics/ResultTabs/Panes/passRate.jsx
@@ -33,7 +33,6 @@ const getPassRateCumSeriesFromStats = (stats) => {
     ],
     relative: [
       // eslint-disable-next-line no-unused-vars
-      getDataObject(`all`, all.map(_ => 1), 'a'),
       getDataObject(`passed`, passed.map(absoluteToRelative(all)), 'b'),
       getDataObject(`failed`, failed.map(absoluteToRelative(all)), 'c')
     ]
@@ -73,7 +72,6 @@ const getPassRateStudSeriesFromStats = (stats) => {
     ],
     relative: [
       // eslint-disable-next-line no-unused-vars
-      getDataObject(`all`, all.map(_ => 1), 'a'),
       getDataObject(` passed on first try`, passedFirst.map(absoluteToRelative(all)), 'b'),
       getDataObject(`passed after retry`, passedRetry.map(absoluteToRelative(all)), 'b'),
       getDataObject(`failed on first try`, failedFirst.map(absoluteToRelative(all)), 'c'),
@@ -95,8 +93,8 @@ const PassRate = ({ primary, comparison, viewMode, isRelative = false }) => {
 
   const maxPassRateVal = isRelative ? 1 : getMaxValueOfSeries(passGraphSerie.absolute)
   const graphOptionsFn = isCumulativeMode ? passRateCumGraphOptions : passRateStudGraphOptions
-  const primaryGraphOptions = comparison ? graphOptionsFn(statYears, maxPassRateVal, 'Primary pass rate chart') : graphOptionsFn(statYears, maxPassRateVal, 'Pass rate chart')
-  const comparisonGraphOptions = graphOptionsFn(statYears, maxPassRateVal, 'Comparison pass rate chart')
+  const primaryGraphOptions = comparison ? graphOptionsFn(statYears, maxPassRateVal, 'Primary pass rate chart', isRelative) : graphOptionsFn(statYears, maxPassRateVal, 'Pass rate chart', isRelative)
+  const comparisonGraphOptions = graphOptionsFn(statYears, maxPassRateVal, 'Comparison pass rate chart', isRelative)
 
   return (
     <>

diff --git a/services/oodikone2-frontend/src/components/SortableTable/index.jsx b/services/oodikone2-frontend/src/components/SortableTable/index.jsx
@@ -76,7 +76,12 @@ class SortableTable extends Component {
     }
     const { tableProps, getRowProps, columns, getRowKey, collapsingHeaders } = this.props
     const { selected, direction, collapsed } = this.state
-    const columnsWithCollapsedHeaders = collapsingHeaders ? [...columns.filter(c => (c.headerProps && (!collapsed.map(cell => cell.headerProps.title).includes(c.headerProps.title) && !c.collapsed))), ...this.state.collapsed].sort((a, b) => a.headerProps.ordernumber - b.headerProps.ordernumber) : columns
+    const columnsWithCollapsedHeaders = collapsingHeaders ? [...columns.filter(c => (
+      c.headerProps && (!collapsed.map(cell => cell.headerProps.title).includes(c.headerProps.title) && !c.collapsed))),
+    ...this.state.collapsed].sort((a, b) => a.headerProps.ordernumber - b.headerProps.ordernumber)
+      :
+      columns
+
     const sortDirection = name => (selected === name ? direction : null)
 
     return (

diff --git a/services/oodikone2-frontend/src/constants/index.js b/services/oodikone2-frontend/src/constants/index.js
@@ -88,11 +88,11 @@ export const API_DATE_FORMAT = 'YYYY.MM.DD'
 
 export const TOKEN_NAME = window.location.pathname.includes('staging') ? 'staging_token' : window.location.pathname.includes('/testing') ? 'testing_token' : 'token' //eslint-disable-line
 
-export const passRateCumGraphOptions = (categories, max, title) => ({
+export const passRateCumGraphOptions = (categories, max, title, skipFirstColor) => ({
   chart: {
     type: 'column'
   },
-  colors: [chartblue, green, red],
+  colors: skipFirstColor ? [green, red] : [chartblue, green, red],
 
   title: {
     text: title
@@ -119,11 +119,11 @@ export const passRateCumGraphOptions = (categories, max, title) => ({
   }
 })
 
-export const passRateStudGraphOptions = (categories, max, title) => ({
+export const passRateStudGraphOptions = (categories, max, title, skipFirstColor) => ({
   chart: {
     type: 'column'
   },
-  colors: [chartblue, chartlgreen, chartdarkg, chartlred, chartdarkred],
+  colors: skipFirstColor ? [chartlgreen, chartdarkg, chartlred, chartdarkred] : [chartblue, chartlgreen, chartdarkg, chartlred, chartdarkred],
 
   title: {
     text: title