fix ti TKT1 population if many years is selected

For some reason tests fail after removal of the "CANCELLED"-field,
even though the real data looks the same in local and production
environments.

.github/dependabot.yml

@@ -1,15 +1,47 @@
 version: 2
 updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: "03:00"
-  open-pull-requests-limit: 10
-  target-branch: "trunk"
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: "03:00"
-  target-branch: "trunk"
+  - package-ecosystem: npm
+    directory: '/'
+    schedule:
+      interval: weekly
+      time: '03:00'
+    labels:
+      - 'dependencies'
+      - 'infra'
+  - package-ecosystem: npm
+    directory: '/updater/sis-updater-scheduler'
+    schedule:
+      interval: weekly
+      time: '03:00'
+    labels:
+      - 'dependencies'
+      - 'updater'
+  - package-ecosystem: npm
+    directory: '/updater/sis-updater-worker'
+    schedule:
+      interval: weekly
+      time: '03:00'
+    labels:
+      - 'dependencies'
+      - 'updater'
+  - package-ecosystem: npm
+    directory: '/services/backend'
+    schedule:
+      interval: weekly
+      time: '03:00'
+    labels:
+      - 'dependencies'
+      - 'back'
+  - package-ecosystem: npm
+    directory: '/services/frontend'
+    schedule:
+      interval: weekly
+      time: '03:00'
+    labels:
+      - 'dependencies'
+      - 'front'
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: weekly
+      time: '03:00'

.github/workflows/test-and-release-updater.yaml

@@ -101,7 +101,8 @@ jobs:
     name: 'Release updater'
     runs-on: ubuntu-latest
     needs:
-      - test_updater
+      - build_worker
+      - build_scheduler
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-buildx-action@v1

README.md

@@ -8,7 +8,7 @@ To run Oodikone locally, you will need the following:
 
 1. Applications:
    - [Docker](https://docs.docker.com/install/) (version 20.10+),
-   - [Docker Compose](https://docs.docker.com/compose/install/)(version 0.29+) and
+   - [Docker Compose](https://docs.docker.com/compose/install/)(version 1.29+) and
    - [npm](https://docs.npmjs.com/cli/v7) (version 7+)
 2. Access to Toska Docker Hub,
 3. For real data setup, access to Toskas production servers.
@@ -48,6 +48,10 @@ What different CLI options do:
 
 ## ⌨️ Development
 
+### Architecture
+
+![Oodikone architecture](Oodikone.png)
+
 ### Basics
 
 The development environment is entirely configured in the `docker-compose.yml` file located in this repository. The file defines the services for oodikone's two main components: **oodikone** and **updater**.

cypress/integration/Course_statistics.js

@@ -96,7 +96,7 @@ describe('Course Statistics tests', () => {
       cy.get("input[placeholder='Search by entering a course name']").type('tietokantojen perusteet')
 
       cy.contains('Tietokantojen perusteet')
-      cy.contains('Avoin yo: Tietokantojen perusteet')
+      cy.contains('Tietokantojen perusteet')
       cy.contains('A581328')
       cy.contains('AYTKT10004')
       cy.contains('TKT10004, 581328')
@@ -105,46 +105,39 @@ describe('Course Statistics tests', () => {
       cy.contains('Fetch statistics').should('be.enabled').click()
       cy.contains('Search for courses').should('not.exist')
 
-      cy.contains('TKT10004, 581328 Tietokantojen perusteet')
+      cy.contains('TKT10004, 581328, AYTKT10004, A581328 Tietokantojen perusteet')
       cy.get('.right').click()
       cy.contains('No results')
+    })
 
+    it('Provider organization toggle works', () => {
+      cy.url().should('include', '/coursestatistics')
+      cy.contains('Search for courses')
       cy.get("input[placeholder='Search by entering a course name']").type('tietokantojen perusteet')
-      cy.contains('td', /^AYTKT10004/).click()
 
+      cy.contains('td', /^TKT10004/).click()
       cy.contains('Fetch statistics').should('be.enabled').click()
       cy.contains('Search for courses').should('not.exist')
-      cy.contains('AYTKT10004 Avoin yo: Tietokantojen perusteet')
+
+      cy.contains('TKT10004, 581328, AYTKT10004, A581328 Tietokantojen perusteet')
+      cy.get('[data-cy=unify_radio_reqular]').click()
+      cy.contains('TKT10004, 581328 Tietokantojen perusteet')
     })
 
     it('Searching course by name displays right courses, 10 credit courses', () => {
       cy.url().should('include', '/coursestatistics')
       cy.contains('Search for courses')
       cy.get("input[placeholder='Search by entering a course name']").type('tietorakenteet ja algoritmit')
-
       cy.contains('Tietorakenteet ja algoritmit')
-      cy.contains('Avoin yo: Tietorakenteet ja algoritmit')
       cy.contains('AYTKT20001')
       cy.contains('TKT20001, 58131')
       cy.contains('td', /^TKT20001/).click()
-
       cy.contains('Fetch statistics').should('be.enabled').click()
       cy.contains('Search for courses').should('not.exist')
 
-      cy.contains('TKT20001, 58131 Tietorakenteet ja algoritmit')
+      cy.contains('TKT20001, 58131, AYTKT20001 Tietorakenteet ja algoritmit')
       cy.get('.right').click()
       cy.contains('No results')
-
-      cy.get("input[placeholder='Search by entering a course name']").type('tietorakenteet ja algoritmit')
-      cy.contains('td', /^AYTKT20001/).click()
-
-      cy.contains('Fetch statistics').should('be.enabled').click()
-      cy.contains('Search for courses').should('not.exist')
-      cy.contains('AYTKT20001 Avoin yo: Tietorakenteet ja algoritmit')
-
-      cy.get('.right').click()
-      cy.contains('No results')
-      cy.get("input[name='unifyOpenUniCourses']").parent().click()
       cy.get("input[placeholder='Search by entering a course name']").type('tietorakenteet ja algoritmit')
       cy.contains('td', 'TKT20001, 58131, AYTKT20001').click()
 
@@ -159,12 +152,11 @@ describe('Course Statistics tests', () => {
       cy.get("input[placeholder='Search by a course code']").type('TKT20003')
       cy.contains('tr', 'TKT20003').click()
       cy.contains('Fetch statistics').should('be.enabled').click()
-
       cy.contains('Käyttöjärjestelmät')
       cy.contains('TKT20003')
 
-      cy.get(':nth-child(3) > :nth-child(1) > div > .item > .level').click()
-      cy.contains('Population of course Käyttöjärjestelmät 2019-2020')
+      cy.get(':nth-child(3) > :nth-child(2) .level').click()
+      cy.contains('Population of course Käyttöjärjestelmät 2019-2020 (open and normal')
       cy.contains('TKT20003')
 
       cy.contains('Students (127)').click()
@@ -174,12 +166,12 @@ describe('Course Statistics tests', () => {
 
     it('Population of course shows grades for each student', () => {
       cy.get("input[placeholder='Search by a course code']").type('TKT20001')
-      cy.contains(/^TKT20001$/).click()
+      cy.contains(/^TKT20001, AYTKT20001$/).click()
       cy.contains('Fetch statistics').should('be.enabled').click()
-      cy.contains('TKT20001, 58131 Tietorakenteet ja algoritmit')
-      cy.get(':nth-child(3) > :nth-child(1) > div > .item > .level').click()
-      cy.contains('Population of course Tietorakenteet ja algoritmit 2018-2019')
-      cy.contains('Students (197)').click()
+      cy.contains('TKT20001, 58131, AYTKT20001 Tietorakenteet ja algoritmit')
+      cy.get(':nth-child(3) > :nth-child(2) .level').click()
+      cy.contains('Population of course Tietorakenteet ja algoritmit 2018-2019 (open and normal)')
+      cy.contains('Students (204)').click()
       cy.contains('td', '010262566').siblings().contains('4')
       cy.contains('td', '010674989').siblings().contains('1')
     })
@@ -189,10 +181,11 @@ describe('Course Statistics tests', () => {
       cy.contains(/^TKT20003$/).click()
       cy.contains('Fetch statistics').should('be.enabled').click()
       cy.contains('TKT20003, 582219 Käyttöjärjestelmät')
-      cy.get(':nth-child(3) > :nth-child(1) > div > .item > .level').click()
+      cy.get('[data-cy=unify_radio_reqular]').click()
+      cy.get(':nth-child(3) > :nth-child(2) .level').click()
       cy.contains('Population of course Käyttöjärjestelmät 2019-2020')
       cy.contains('Language distribution').click()
-      cy.contains('td', 'finnish').siblings().contains('107')
+      cy.contains('td', 'finnish').siblings().contains('122')
       cy.contains('td', 'english').siblings().contains('5')
     })
 
@@ -200,7 +193,6 @@ describe('Course Statistics tests', () => {
       beforeEach(() => {
         cy.url().should('include', '/coursestatistics')
         cy.contains('Search for courses')
-        cy.get("input[name='unifyOpenUniCourses']").parent().click()
         cy.get("input[placeholder='Search by a course code']").type('TKT10002')
         cy.contains('td', 'TKT10002, AYTKT10002').click()
         cy.contains('Fetch statistics').should('be.enabled').click()
@@ -212,18 +204,28 @@ describe('Course Statistics tests', () => {
       const yearRange = { from: '2000-2001', to: '2020-2021' }
       const attemptsTableContents = [
         // [time, passed, failed, passrate]
-        ['Total', 511, 486, 25],
+        ['Total', null, 511, 486, 25],
+      ]
+
+      const attemptsTableContentsOpen = [
+        // [time, passed, failed, passrate]
+        ['Total', null, 175, 175, 0],
+      ]
+
+      const attemptsTableContentsReqular = [
+        // [time, passed, failed, passrate]
+        ['Total', null, 312, 298, 14],
       ]
 
       const gradesTableContents = [
         // [time, attempts, 0, 1, 2, 3, 4, 5, other passed]
-        ['Total', 511, 25, 11, 17, 21, 59, 365, 13],
-        ['2020-2021', 1, 0, 0, 0, 0, 0, 1, 0],
-        ['2019-2020', 54, 4, 3, 1, 3, 4, 39, 0],
-        ['2018-2019', 154, 7, 2, 6, 5, 15, 119, 0],
-        ['2017-2018', 186, 9, 3, 5, 6, 16, 139, 8],
-        ['2016-2017', 71, 2, 1, 2, 5, 13, 48, 0],
-        ['2015-2016', 21, 1, 1, 1, 0, 7, 8, 3],
+        ['Total', null, 511, 25, 11, 17, 21, 59, 365, 13],
+        ['2020-2021', null, 1, 0, 0, 0, 0, 0, 1, 0],
+        ['2019-2020', null, 54, 4, 3, 1, 3, 4, 39, 0],
+        ['2018-2019', null, 154, 7, 2, 6, 5, 15, 119, 0],
+        ['2017-2018', null, 186, 9, 3, 5, 6, 16, 139, 8],
+        ['2016-2017', null, 71, 2, 1, 2, 5, 13, 48, 0],
+        ['2015-2016', null, 21, 1, 1, 1, 0, 7, 8, 3],
       ]
 
       it('shows stats', () => {
@@ -250,6 +252,7 @@ describe('Course Statistics tests', () => {
               .eq(trIndex)
               .within(() => {
                 values.forEach((value, tdIndex) => {
+                  if (value === null) return
                   cy.get('td').eq(tdIndex).contains(value)
                 })
               })
@@ -263,6 +266,7 @@ describe('Course Statistics tests', () => {
               .eq(trIndex)
               .within(() => {
                 values.forEach((value, tdIndex) => {
+                  if (value === null) return
                   cy.get('td').eq(tdIndex).contains(value)
                 })
               })
@@ -271,6 +275,44 @@ describe('Course Statistics tests', () => {
         })
       })
 
+      it('Toggling course provider changes stats correctly', () => {
+        cy.get('[data-cy=unify_radio_reqular]').click()
+        cy.get("div[name='toYear']").within(() => {
+          cy.get("div[role='option']").first().should('have.text', '2020-2021')
+          cy.contains("div[role='option']", yearRange.to).should('have.class', 'selected')
+          cy.get("div[role='option']").last().should('have.text', yearRange.from)
+          cy.get("div[role='option']").should('have.length', 21)
+        })
+        cy.contains('#CourseStatPanes a.item', 'Table').click()
+        cy.contains('#CourseStatPanes a.item', 'Attempts').click()
+        cy.get('#CourseStatPanes table>tbody').within(() => {
+          attemptsTableContentsReqular.forEach((values, trIndex) => {
+            cy.get('tr')
+              .eq(trIndex)
+              .within(() => {
+                values.forEach((value, tdIndex) => {
+                  if (value === null) return
+                  cy.get('td').eq(tdIndex).contains(value)
+                })
+              })
+          })
+        })
+        cy.get('[data-cy=unify_radio_open]').click()
+        cy.get('#CourseStatPanes table>tbody').within(() => {
+          attemptsTableContentsOpen.forEach((values, trIndex) => {
+            cy.get('tr')
+              .eq(trIndex)
+              .within(() => {
+                values.forEach((value, tdIndex) => {
+                  if (value === null) return
+                  cy.get('td').eq(tdIndex).contains(value)
+                })
+              })
+          })
+        })
+        cy.get('[data-cy=unify_radio_unify]').click()
+      })
+
       it('after changing time range shows same stats', () => {
         const newYearRange = { from: '2016-2017', to: '2019-2020' }
         cy.get("div[name='fromYear']")
@@ -300,9 +342,18 @@ describe('Course Statistics tests', () => {
         cy.contains('Show population').should('be.enabled')
       })
     })
+
+    it('If no data available, unify toggle is disabled', () => {
+      cy.get("input[placeholder='Search by a course code']").type('AYCSM14111')
+      cy.contains('AYCSM14111').click()
+      cy.contains('Fetch statistics').should('be.enabled').click()
+      cy.contains('AYCSM14111 Avoin yo: Full Stack -websovelluskehitys: React Native')
+      cy.get('[data-cy=unify_radio_reqular]').find('input').should('be.disabled')
+      cy.get('[data-cy=unify_radio_unify]').find('input').should('not.be.disabled')
+    })
   })
 
-  it.only('Some features of Course Statistics are hidden for courseStatistics-users without other rights', () => {
+  it('Some features of Course Statistics are hidden for courseStatistics-users without other rights', () => {
     cy.init('/coursestatistics', 'onlycoursestatistics')
     cy.get('[data-cy=navbar-courseStatistics]').click()
     cy.get('[data-cy=course-code-input]').type('TKT20003')
@@ -316,13 +367,13 @@ describe('Course Statistics tests', () => {
 
     const attemptsTableContents = [
       // [time, passed, failed, passrate]
-      ['Total*', 288, 213, 75, '73.96 %'],
-      // ['Total', 295, 216, 79, '73.22 %'],
-      ['2020-2021', '5 or less students', 'NA', 'NA', 'NA'],
-      //['2020-2021', 5, 2, 3, '40.00 %'],
-      ['2019-2020', 164, 121, 43, '73.78 %'],
-      ['2018-2019', 85, 60, 25, '70.59 %'],
-      ['2017-2018', 39, 32, 7, '82.05 %'],
+      // ['Total', 288, 213, 75, '73.96 %'],
+      // ['2020-2021', '5 or less students', 'NA', 'NA', 'NA'],
+      ['Total', null, 295, 216, 79, '73.22 %'],
+      ['2020-2021', null, 5, 2, 3, '40.00 %'],
+      ['2019-2020', null, 164, 121, 43, '73.78 %'],
+      ['2018-2019', null, 85, 60, 25, '70.59 %'],
+      ['2017-2018', null, 39, 32, 7, '82.05 %'],
     ]
 
     cy.contains('#CourseStatPanes a.item', 'Attempts').click()
@@ -332,6 +383,7 @@ describe('Course Statistics tests', () => {
           .eq(trIndex)
           .within(() => {
             values.forEach((value, tdIndex) => {
+              if (value === null) return
               cy.get('td').eq(tdIndex).contains(value)
             })
           })

cypress/integration/Filters.js

@@ -17,6 +17,28 @@ const clearSingleDropdownSelection = dataCyAttribute => {
   cy.cs(dataCyAttribute).find('i.clear').click({ force: true })
 }
 
+const testRangeFilter = (parentEl, min, max, expected) => {
+  cy.cs(parentEl)
+    .cs('range-selector-min')
+    .find('input')
+    .invoke('val')
+    .then(initialMin => {
+      cy.cs(parentEl)
+        .cs('range-selector-max')
+        .find('input')
+        .invoke('val')
+        .then(initialMax => {
+          cy.cs(parentEl).cs('range-selector-min').find('input').type(`{selectall}{backspace}${min}`).blur()
+          cy.cs(parentEl).cs('range-selector-max').find('input').type(`{selectall}{backspace}${max}`).blur()
+
+          checkFilteringResult(expected)
+
+          cy.cs(parentEl).cs('range-selector-min').find('input').type(`{selectall}{backspace}${initialMin}`).blur()
+          cy.cs(parentEl).cs('range-selector-max').find('input').type(`{selectall}{backspace}${initialMax}`).blur()
+        })
+    })
+}
+
 // Helper tool to create pre and post steps for each filter step. Created to avoid copypasting clicking and checking
 // to every it-function. Reason behind using test function wrapper is that Cypresses internal beforeEach / afterEach
 // functions don't take any parameters and using global object for matching test step name seemed overcomplicated.
@@ -78,7 +100,10 @@ describe('Population Statistics', () => {
     })
   })
 
-  it('Study track filter works', () => {
+  // The test does not work since it tries to filter by "Ravitsemustiede"-studytrack when checking
+  // CS Bachelor students. Now that the irrelevant studytracks have been removed, the test fails.
+  // So fix this
+  it.skip('Study track filter works', () => {
     runTestStepWithPreAndPostParts('StudyTrack', () => {
       const card = cy.cs('StudyTrack-filter-card')
       const programmeDropdown = card.cs('StudyTrack-filter-dropdown').selectFromDropdown(0)
@@ -122,21 +147,13 @@ describe('Population Statistics', () => {
 
   it('Credit filter works', () => {
     runTestStepWithPreAndPostParts('CreditsEarned', () => {
-      cy.cs('credit-filter-min').type('50')
-      cy.cs('credit-filter-max').type('150')
-      checkFilteringResult(116)
-      cy.cs('credit-filter-min').clear()
-      cy.cs('credit-filter-max').clear()
+      testRangeFilter('CreditsEarned-filter-card', 50, 150, 116)
     })
   })
 
   it('Age filter works', () => {
     runTestStepWithPreAndPostParts('Age', () => {
-      cy.cs('ageFilter-min').type('20')
-      cy.cs('ageFilter-max').type('40')
-      checkFilteringResult(40)
-      cy.cs('ageFilter-min').find('input').clear()
-      cy.cs('ageFilter-max').find('input').clear()
+      testRangeFilter('Age-filter-card', 20, 40, 45)
     })
   })
 
@@ -200,11 +217,7 @@ describe('Population Statistics', () => {
       runTestStepWithPreAndPostParts('Age', () => {
         const getCard = () => cy.cs('GraduatedFromProgramme-filter-card')
         getCard().cs('option-graduated-true').click()
-        cy.cs('ageFilter-min').type('20')
-        cy.cs('ageFilter-max').type('30')
-        checkFilteringResult(11)
-        cy.cs('ageFilter-min').find('input').clear()
-        cy.cs('ageFilter-max').find('input').clear()
+        testRangeFilter('Age-filter-card', 20, 30, 11)
         getCard().cs('option-all').click()
       })
     })
@@ -213,7 +226,7 @@ describe('Population Statistics', () => {
 
 describe('Course Statistics', () => {
   const pathToDSAndAlgoSpring2019 =
-    '/coursepopulation?coursecodes=%5B%22TKT20001%22%2C%2258131%22%5D&from=138&separate=true&to=138&years=Kev%C3%A4t%202019'
+    '/coursepopulation?coursecodes=%5B%22TKT20001%22%2C%2258131%22%5D&from=138&separate=true&to=138&years=Kev%C3%A4t%202019&unifyCourses=unifyStats'
   const defaultAmountOfStudents = 118
   const runTestStepWithPreAndPostParts = createRunTestStepWithPreAndPostPartsFunction(defaultAmountOfStudents)
 
@@ -247,7 +260,10 @@ describe('Course Statistics', () => {
     })
   })
 
-  it('Study track filter works', () => {
+  // The test does not work since it tries to filter by "Ravitsemustiede"-studytrack when checking
+  // CS Bachelor students. Now that the irrelevant studytracks have been removed, the test fails.
+  // So fix this
+  it.skip('Study track filter works', () => {
     runTestStepWithPreAndPostParts('StudyTrack', () => {
       const card = cy.cs('StudyTrack-filter-card')
       const programmeDropdown = card.cs('StudyTrack-filter-dropdown').selectFromDropdown(0)
@@ -258,11 +274,7 @@ describe('Course Statistics', () => {
 
   it('Age filter works', () => {
     runTestStepWithPreAndPostParts('Age', () => {
-      cy.cs('ageFilter-min').type('20')
-      cy.cs('ageFilter-max').type('40')
-      checkFilteringResult(31)
-      cy.cs('ageFilter-min').find('input').clear()
-      cy.cs('ageFilter-max').find('input').clear()
+      testRangeFilter('Age-filter-card', 20, 40, 35)
     })
   })
 
@@ -295,11 +307,7 @@ describe('Course Statistics', () => {
     runTestStepWithPreAndPostParts('Grade', () => {
       runTestStepWithPreAndPostParts('Age', () => {
         cy.cs('gradeFilter-3').click()
-        cy.cs('ageFilter-min').type('20')
-        cy.cs('ageFilter-max').type('30')
-        checkFilteringResult(1)
-        cy.cs('ageFilter-min').find('input').clear()
-        cy.cs('ageFilter-max').find('input').clear()
+        testRangeFilter('Age-filter-card', 20, 30, 1)
         cy.cs('gradeFilter-3').click()
       })
     })
@@ -323,11 +331,7 @@ describe('Custom Population Statistics', () => {
 
   it('Age filter works', () => {
     runTestStepWithPreAndPostParts('Age', () => {
-      cy.cs('ageFilter-min').type('20')
-      cy.cs('ageFilter-max').type('30')
-      checkFilteringResult(1)
-      cy.cs('ageFilter-min').find('input').clear()
-      cy.cs('ageFilter-max').find('input').clear()
+      testRangeFilter('Age-filter-card', 20, 30, 1)
     })
   })
 

cypress/integration/Population_statistics.js

@@ -3,15 +3,15 @@
 const moment = require('moment')
 const _ = require('lodash')
 
-const setPopStatsUntil = (until, includeSettings = []) => {
-  cy.contains('Advanced settings').siblings().get('[data-cy=advanced-toggle]').click()
-  includeSettings.forEach(setting => {
-    cy.contains('Advanced settings').parent().siblings().contains(setting).click()
-  })
-  cy.get('.adv-stats-until > .form-control').click().clear().type(until)
-  cy.contains('Fetch population with new settings').click()
-  cy.contains('Advanced settings')
-}
+// const setPopStatsUntil = (until, includeSettings = []) => {
+//   cy.contains('Advanced settings').siblings().get('[data-cy=advanced-toggle]').click()
+//   includeSettings.forEach(setting => {
+//     cy.contains('Advanced settings').parent().siblings().contains(setting).click()
+//   })
+//   cy.get('.adv-stats-until > .form-control').click().clear().type(until)
+//   cy.contains('Fetch population with new settings').click()
+//   cy.contains('Advanced settings')
+// }
 
 describe('Population Statistics tests', () => {
   const pathToCSBach2017 =
@@ -65,13 +65,14 @@ describe('Population Statistics tests', () => {
     it('Population statistics is usable on general level', () => {
       cy.visit(pathToCSBach2017)
       cy.cs('filtered-students')
-      setPopStatsUntil('toukokuu 2020')
+      // This advanced settings does not work correctly
+      // see https://github.com/UniversityOfHelsinkiCS/oodikone/issues/3552
+      // setPopStatsUntil('toukokuu 2020')
 
       cy.get('.card').within(() => {
         cy.contains('Tietojenkäsittelytieteen kandiohjelma')
         cy.contains('Sample size: 149 students')
         cy.contains('Excludes exchange students')
-        cy.contains("Excludes students who haven't enrolled present nor absent")
         cy.contains('Excludes students with non-degree study right')
         cy.contains('Excludes students who have transferred out of this programme')
       })
@@ -80,12 +81,12 @@ describe('Population Statistics tests', () => {
 
       cy.intercept('/api/v3/courseyearlystats**').as('coursePage')
       // eslint-disable-next-line cypress/no-unnecessary-waiting
-      cy.wait(15000) // a bit hacky way, wait until ui is ready
-      cy.get('[data-cy=expand-TKT1]').click()
-      cy.get('[data-cy=coursestats-link-TKT10002]').click()
+      cy.wait(25000) // a bit hacky way, wait until ui is ready
+      cy.get('[data-cy=toggle-group-module-TKT1]').click()
+      cy.contains('td', 'TKT10002').siblings().find('i.level.up').click()
       cy.wait('@coursePage')
       cy.url().should('include', '/coursestatistics')
-      cy.contains('TKT10002, 581325 Ohjelmoinnin perusteet')
+      cy.contains('TKT10002, 581325, AYTKT10002, A581325 Ohjelmoinnin perusteet')
     })
 
     it("Empty 'tags' tab has a link to the page where tags can be created", () => {
@@ -121,10 +122,9 @@ describe('Population Statistics tests', () => {
 
       cy.contains('Credit accumulation (for 149 students)')
 
-      // spring + fall and include cancelled
+      // spring + fall
       cy.get('[data-cy=advanced-toggle]').click()
       cy.cs('toggle-spring').click()
-      cy.cs('toggle-cancelled').click()
       cy.contains('Fetch population').click()
 
       cy.contains('Credit accumulation (for 170 students)')

cypress/integration/Student_statistics.js

@@ -37,7 +37,7 @@ describe('Student Statistics tests', () => {
   it('Can get student specific page by clicking student', () => {
     cy.url().should('include', '/students')
     cy.get('.prompt').type(student.studentnumber)
-    cy.contains(student.studentnumber).click()
+    cy.contains('td a', student.studentnumber).click()
     cy.contains('Started: 01.08.2017')
     cy.contains('Tietojenkäsittelytieteen kandiohjelma (01.08.2017 - 01.08.2025')
     cy.contains(student.lastname).should('not.exist')
@@ -54,7 +54,7 @@ describe('Student Statistics tests', () => {
 
   it('Can get back to search menu', () => {
     cy.get('.prompt').type(student.studentnumber)
-    cy.contains(student.studentnumber).click()
+    cy.contains('td a', student.studentnumber).click()
     cy.get('.remove').click()
     cy.contains('Student number').should('not.exist')
     cy.contains('Credits').should('not.exist')
@@ -62,7 +62,7 @@ describe('Student Statistics tests', () => {
 
   it('Can jump to course', () => {
     cy.get('.prompt').type(student.studentnumber)
-    cy.contains(student.studentnumber).click()
+    cy.contains('td a', student.studentnumber).click()
     cy.contains('Introduction to Machine Learning (DATA11002)')
       .siblings()
       .within(() => {
@@ -82,7 +82,7 @@ describe('Student Statistics tests', () => {
 
   it('Can jump to population page', () => {
     cy.get('.prompt').type(student.studentnumber)
-    cy.contains(student.studentnumber).click()
+    cy.contains('td a', student.studentnumber).click()
     cy.get('i.level.up.alternate.icon').eq(0).click()
     cy.contains('Population statistics')
     cy.contains('Tietojenkäsittelytieteen kandiohjelma')

cypress/integration/Studyprogramme_overview.js

@@ -1,62 +1,61 @@
 /// <reference types="Cypress" />
 
 const deleteTag = name => {
-  cy.contains(name).siblings().contains('Delete').click()
+  cy.contains('td', name).siblings().contains('Delete').click()
   cy.contains('Are you sure you want to delete tag')
   cy.contains('Confirm').click()
-  cy.contains(name).should('not.exist')
+  cy.contains('td', name).should('not.exist')
 }
 
-const getEmptyYears = () => {
+const getEmptyYears = isAcademicYear => {
   const thisYear = new Date().getFullYear()
   const years = []
   for (let year = thisYear; year > 2021; year--) {
-    years.push(year)
+    if (isAcademicYear) {
+      years.push(`${year} - ${year + 1}`)
+    } else {
+      years.push(year)
+    }
   }
   return years
 }
 
 describe('Studyprogramme overview', () => {
-  describe('when opening programme page with basic user', () => {
+  /* Basic information overview -tests*/
+  describe('Basic information -view works for basic user', () => {
     beforeEach(() => {
-      cy.init('/study-programme/KH50_005')
+      cy.init('/study-programme')
+      cy.viewport(1536, 960)
     })
 
     // If the backend breaks for one of the sections, the section header is not rendered and this will fail
     it('Basic information -tab loads', () => {
-      cy.contains('Tietojenkäsittelytieteen kandiohjelma').click()
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
       cy.get('[data-cy=Section-StudentsOfTheStudyprogramme]')
       cy.get('[data-cy=Section-CreditsProducedByTheStudyprogramme]')
       cy.get('[data-cy=Section-GraduatedAndThesisWritersOfTheProgramme]')
-      cy.get('[data-cy=Section-ProgrammesAfterGraduation]')
-      cy.get('[data-cy=Section-AverageGraduationTimes]')
-    })
-
-    // If the backend breaks for one of the sections, the section header is not rendered and this will fail
-    it('Studytracks and student populations -tab loads', () => {
-      cy.contains('Tietojenkäsittelytieteen kandiohjelma').click()
-      cy.get('.attached').contains('Studytracks and student populations').click()
-      cy.get('[data-cy=Section-StudytrackOverview]')
-      cy.get('[data-cy=Section-StudytrackProgress]')
+      cy.get('[data-cy=Section-ProgrammesBeforeOrAfter]')
       cy.get('[data-cy=Section-AverageGraduationTimes]')
     })
 
     it('Basic information contains correct students', () => {
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
       const years = getEmptyYears()
       const tableContents = [
-        // [Year, All, Started, Graduated, Cancelled, Transferred Away, Transferred to]
-        ...years.map(year => [year, 0, 0, 0, 0, 0, 0]),
-        [2021, 0, 0, 0, 0, 1, 0],
-        [2020, 12, 10, 36, 16, 3, 2],
-        [2019, 87, 86, 17, 14, 0, 1],
-        [2018, 161, 162, 1, 3, 0, 0],
-        [2017, 171, 173, 0, 0, 0, 0],
+        // [Year, Started, Graduated, Transferred Away, Transferred to]
+        ...years.map(year => [year, 0, 0, 0, 0]),
+        [2021, 0, 0, 1, 0],
+        [2020, 12, 36, 3, 2],
+        [2019, 87, 17, 0, 1],
+        [2018, 161, 1, 0, 0],
+        [2017, 171, 0, 0, 0],
       ]
 
       cy.checkTableStats(tableContents, 'StudentsOfTheStudyprogramme')
     })
 
     it('Basic information contains correct credits', () => {
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
       const years = getEmptyYears()
       const tableContents = [
         // [Year, Total, Major credits, Non-major credits, Transferred credits]
@@ -72,6 +71,7 @@ describe('Studyprogramme overview', () => {
     })
 
     it('Basic information contains correct thesis writers and graduates', () => {
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
       const years = getEmptyYears()
       const tableContents = [
         // [Year, Graduated, Wrote thesis]
@@ -86,9 +86,291 @@ describe('Studyprogramme overview', () => {
       cy.checkTableStats(tableContents, 'GraduatedAndThesisWritersOfTheProgramme')
     })
 
+    it.skip('Special studyrights can be excluded and basic data changes accordingly', () => {
+      cy.contains('a', 'Tietojenkäsittelytieteen maisteriohjelma').click()
+      cy.get('[data-cy=StudentToggle]').click()
+      const years = getEmptyYears()
+      const studentTableContents = [
+        // [Year, Started, Graduated]
+        ...years.map(year => [year, 0, 0]),
+        [2021, 0, 0],
+        [2020, 22, 0],
+        [2019, 12, 0],
+        [2018, 0, 0],
+        [2017, 0, 0],
+      ]
+
+      cy.checkTableStats(studentTableContents, 'StudentsOfTheStudyprogramme')
+
+      const creditTableContents = [
+        // [Year, Total, Major students credits, Transferred credits]
+        ...years.map(year => [year, 0, 0, 0]),
+        [2021, 0, 0, 0],
+        [2020, 117.5, 0, 7.5],
+        [2019, 67, 0, 0],
+        [2018, 0, 0, 0],
+        [2017, 0, 0, 0],
+      ]
+
+      cy.checkTableStats(creditTableContents, 'CreditsProducedByTheStudyprogramme')
+
+      const graduatedTableContents = [
+        // [Year, Graduated, Wrote thesis]
+        ...years.map(year => [year, 0, 0]),
+        [2021, 0, 0],
+        [2020, 0, 0],
+        [2019, 0, 0],
+        [2018, 0, 0],
+        [2017, 0, 0],
+      ]
+
+      cy.checkTableStats(graduatedTableContents, 'GraduatedAndThesisWritersOfTheProgramme')
+      cy.get('[data-cy=StudentToggle]').click()
+    })
+
+    it('Year can be changed to academic year, and data changes accordingly', () => {
+      cy.contains('a', 'Tietojenkäsittelytieteen maisteriohjelma').click()
+      cy.get('[data-cy=YearToggle]').click()
+      const isAcademicYear = true
+      const years = getEmptyYears(isAcademicYear)
+      const studentTableContents = [
+        // [Year, Started, Graduated, Transferred away, Transferred to]
+        ...years.map(year => [year, 0, 0, 0, 0]),
+        ['2021 - 2022', 0, 0, 0, 0],
+        ['2020 - 2021', 5, 0, 0, 0],
+        ['2019 - 2020', 27, 0, 0, 0],
+        ['2018 - 2019', 4, 0, 0, 0],
+        ['2017 - 2018', 0, 0, 0, 0],
+      ]
+
+      cy.checkTableStats(studentTableContents, 'StudentsOfTheStudyprogramme')
+
+      const creditTableContents = [
+        // [Year, Total, Major students credits, Non-major students credits, Transferred credits]
+        ...years.map(year => [year, 0, 0, 0, 0]),
+        ['2021 - 2022', 0, 0, 0, 0],
+        ['2020 - 2021', 0, 0, 0, 0],
+        ['2019 - 2020', 338.5, 0, 331, 7.5],
+        ['2018 - 2019', 173, 0, 173, 0],
+        ['2017 - 2018', 42, 0, 42, 0],
+      ]
+
+      cy.checkTableStats(creditTableContents, 'CreditsProducedByTheStudyprogramme')
+      cy.get('[data-cy=YearToggle]').click()
+    })
+
+    it('Basic information graphs render', () => {
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
+
+      cy.get('[data-cy=Graph-StudentsOfTheStudyprogramme')
+        .should('contain', 'Started')
+        .should('contain', 'Graduated')
+        .should('contain', 'Transferred away')
+
+      cy.get('[data-cy=Graph-CreditsProducedByTheStudyprogramme')
+        .should('contain', 'Major students credits')
+        .should('contain', 'Non-major students credits')
+        .should('contain', 'Transferred credits')
+        .should('contain', 788)
+        .should('contain', 1820)
+
+      cy.get('[data-cy=Graph-GraduatedAndThesisWritersOfTheProgramme')
+        .should('contain', 'Graduated students')
+        .should('contain', 'Wrote thesis')
+        .should('contain', 1)
+        .should('contain', 5)
+        .should('contain', 17)
+        .should('contain', 25)
+        .should('contain', 36)
+        .should('contain', 35)
+
+      cy.get('[data-cy=Graph-2019-AverageGraduationTimes]')
+        .should('contain', '2019')
+        .should('contain', 'n = 17')
+        .should('contain', '23 kk')
+
+      cy.get('[data-cy=Graph-ProgrammesBeforeOrAfter')
+        .should('contain', 'Tietojenkäsittelytieteen maisteriohjelma')
+        .should('contain', 'Datatieteen maisteriohjelma')
+        .should('contain', 'Matematiikan ja tilastotieteen maisteriohjelma')
+        .should('contain', 1)
+        .should('contain', 4)
+        .should('contain', 13)
+    })
+  })
+
+  /* Studytrack overview -tests*/
+  describe('Studytrack overview works for basic user', () => {
+    beforeEach(() => {
+      cy.init('/study-programme')
+    })
+
+    // If the backend breaks for one of the sections, the section header is not rendered and this will fail
+    it('Studytracks and student populations -tab loads', () => {
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
+      cy.get('.attached').contains('Studytracks and student populations').click()
+      cy.get('[data-cy=Section-StudytrackOverview]')
+      cy.get('[data-cy=Section-StudytrackProgress]')
+      cy.get('[data-cy=Section-AverageGraduationTimes]')
+    })
+
+    it('Students of the studyprogramme are shown correctly', () => {
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
+      cy.get('.attached').contains('Studytracks and student populations').click()
+      const tableContents = [
+        // [Year, All, Started studying, Currently enrolled, Absent, Cancelled, Graduated, Men, Women, Finnish]
+        [
+          '2020 - 2021',
+          12,
+          '100.0 %',
+          10,
+          '83.3 %',
+          0,
+          '0 %',
+          0,
+          '0 %',
+          0,
+          '0 %',
+          0,
+          '0 %',
+          10,
+          '83.3 %',
+          2,
+          '16.7 %',
+          12,
+          '100.0 %',
+        ],
+        [
+          '2019 - 2020',
+          86,
+          '100.0 %',
+          86,
+          '100.0 %',
+          0,
+          '0 %',
+          0,
+          '0 %',
+          0,
+          '0 %',
+          1,
+          '1.2 %',
+          65,
+          '75.6 %',
+          21,
+          '24.4 %',
+          86,
+          '100.0 %',
+        ],
+        [
+          '2018 - 2019',
+          162,
+          '100.0 %',
+          161,
+          '99.4 %',
+          0,
+          '0 %',
+          0,
+          '0 %',
+          0,
+          '0 %',
+          11,
+          '6.8 %',
+          118,
+          '72.8 %',
+          44,
+          '27.2 %',
+          161,
+          '99.4 %',
+        ],
+        [
+          '2017 - 2018',
+          171,
+          '100.0 %',
+          171,
+          '100.0 %',
+          0,
+          '0 %',
+          0,
+          '0 %',
+          3,
+          '1.8 %',
+          42,
+          '24.6 %',
+          135,
+          '78.9 %',
+          36,
+          '21.1 %',
+          166,
+          '97.1 %',
+        ],
+        [
+          'Total',
+          431,
+          '100.0 %',
+          431,
+          '100.0 %',
+          0,
+          '0 %',
+          0,
+          '0 %',
+          3,
+          '0.7 %',
+          54,
+          '12.5 %',
+          328,
+          '76.1 %',
+          103,
+          '23.9 %',
+          425,
+          '98.6 %',
+        ],
+      ]
+
+      cy.checkTableStats(tableContents, 'StudytrackOverview')
+    })
+
+    it('Student progress data is shown correctly', () => {
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
+      cy.get('.attached').contains('Studytracks and student populations').click()
+      const tableContents = [
+        ['2020 - 2021', 12, 5, 2, 2, 0, 2, 0, 1],
+        ['2019 - 2020', 86, 13, 15, 32, 11, 2, 0, 13],
+        ['2018 - 2019', 162, 7, 16, 35, 33, 27, 18, 26],
+        ['2017 - 2018', 171, 10, 22, 18, 22, 24, 27, 48],
+        ['Total', 431, 35, 55, 87, 66, 55, 45, 88],
+      ]
+
+      cy.checkTableStats(tableContents, 'StudytrackProgress')
+    })
+
+    it('Studytrack overview graphs render', () => {
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
+      cy.get('.attached').contains('Studytracks and student populations').click()
+
+      cy.get('[data-cy=Graph-StudytrackProgress]')
+        .should('contain', 'Less than 30 credits')
+        .should('contain', '30-59 credits')
+        .should('contain', 'More than 180 credits')
+        .should('contain', '5.8%') // The percentage for less than 30 credits in 2017-2018, to check that the graph renders
+        .should('contain', '4.3%') // The percentage for less than 30 credits in 2018-2019
+        .should('contain', '15.1%') // The percentage for less than 30 credits in 2019-2020
+
+      cy.get('[data-cy=Graph-2018-AverageGraduationTimes]')
+        .should('contain', '2018 - 2019')
+        .should('contain', 'n = 11 / 162')
+        .should('contain', '22 kk')
+    })
+  })
+
+  /* Tag-tests*/
+  describe('Basic information -view works for basic user', () => {
+    beforeEach(() => {
+      cy.init('/study-programme')
+    })
+
     it('can create and delete tags for population', () => {
       const name = `tag-${new Date().getTime()}`
-      cy.contains('Tietojenkäsittelytieteen kandiohjelma').click()
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
       cy.get('.attached').contains('Tags').click()
       cy.get('.tagNameSelectInput > .ui > input').type(name)
       cy.get('.yearSelectInput').type('2018')
@@ -100,7 +382,7 @@ describe('Studyprogramme overview', () => {
 
     it('can create personal tags', () => {
       const name = `tag-${new Date().getTime()}`
-      cy.contains('Tietojenkäsittelytieteen kandiohjelma').click()
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
       cy.get('.attached').contains('Tags').click()
       cy.get('.tagNameSelectInput > .ui > input').type(name)
       cy.get('.yearSelectInput').type('2018')
@@ -116,7 +398,7 @@ describe('Studyprogramme overview', () => {
 
       const student = '010113437'
 
-      cy.contains('Tietojenkäsittelytieteen kandiohjelma').click()
+      cy.contains('a', 'Tietojenkäsittelytieteen kandiohjelma').click()
       cy.get('.attached').contains('Tags').click()
       cy.get('.tagNameSelectInput > .ui > input').type(name)
       cy.get('.yearSelectInput').type('2018')
@@ -124,7 +406,7 @@ describe('Studyprogramme overview', () => {
       cy.contains(name)
 
       cy.contains('Add tags to students').click()
-      cy.get('.form > .field > .dropdown').click().get('.ui > .search').type(name).click()
+      cy.get('.form > .field > .dropdown').click().get('.ui > input.search').type(name).click()
 
       cy.get('.form > .field > .dropdown > .visible').contains(name).click()
 
@@ -133,7 +415,7 @@ describe('Studyprogramme overview', () => {
 
       cy.contains('Student statistics').click()
       cy.get('.prompt').type(student)
-      cy.contains(student).click()
+      cy.contains('a', student).click()
       cy.contains(name)
 
       cy.go('back')
@@ -143,7 +425,7 @@ describe('Studyprogramme overview', () => {
 
       cy.contains('Student statistics').click()
       cy.get('.prompt').type(student)
-      cy.contains(student).click()
+      cy.contains('a', student).click()
       cy.contains(name).should('not.exist')
     })
   })

cypress/integration/Teachers.js

@@ -16,7 +16,7 @@ describe('Teachers page tests', () => {
     cy.contains('Tietojenkäsittelytieteen kandiohjelma').click()
     cy.cs('course-providers').children('.icon').click()
     cy.get('.form > .fluid').click()
-    cy.contains('Name')
+    cy.contains('Teacher')
     cy.contains(teacher1)
     cy.contains(teacher2)
   })
@@ -32,21 +32,13 @@ describe('Teachers page tests', () => {
     cy.url().should('include', '/teachers')
     cy.get('.borderless > :nth-child(3)').click()
     cy.get('.prompt').type(teacher1.split()[0])
-    cy.contains(teacher1).click()
+    cy.contains('td', teacher1).click()
     cy.contains('Aineopintojen harjoitustyö: Tietokantasovellus')
   })
 
   it('Check leaderboad works', () => {
     cy.get('.borderless > :nth-child(2)').click({ force: true })
     cy.get(':nth-child(1) > .ui > .search').click({ force: true })
-    cy.get(':nth-child(1) > .ui > .search').click({ force: true })
-    cy.contains('2019-2020').click({ force: true })
-    cy.contains('Recalculate this year').click({ force: true })
-    cy.wait(5000)
-    cy.reload()
-    cy.contains('2019-2020').click({ force: true })
-    cy.get(':nth-child(1) > .ui > .search').click({ force: true })
-    cy.contains('Passed')
-    cy.contains('Ahokas Jarmo Ilkka')
+    cy.contains('2020-2021').click({ force: true })
   })
 })

cypress/integration/Users.js

@@ -39,9 +39,7 @@ describe('Users tests', () => {
 
     it("mocking normal user shows only the mocked user's programmes", () => {
       cy.contains('mocking').should('not.exist')
-      cy.contains('tr', 'basic').within(() => {
-        cy.contains('.button', 'Edit').click()
-      })
+      cy.cs('user-edit-button-basic').click()
       cy.get('i.spy').click()
       cy.contains('mocking as basic')
       cy.wait(1000)

cypress/support/commands.js

@@ -106,7 +106,7 @@ Cypress.Commands.add('selectStudyProgramme', name => {
 })
 
 Cypress.Commands.add('checkTableStats', (correctStats, tableName) => {
-  cy.get(`[data-cy=${tableName}]>tbody`).within(() => {
+  cy.get(`[data-cy=Table-${tableName}]>tbody`).within(() => {
     correctStats.forEach((values, trIndex) => {
       cy.get('tr')
         .eq(trIndex)

cypress/support/index.js

@@ -14,3 +14,13 @@
 // ***********************************************************
 
 import './commands'
+
+// This error is benign and seems to be only present in Cypress
+const resizeObserverLoopErrRe = /^[^(ResizeObserver loop limit exceeded)]/
+
+Cypress.on('uncaught:exception', err => {
+  /* returning false here prevents Cypress from failing the test */
+  if (resizeObserverLoopErrRe.test(err.message)) {
+    return false
+  }
+})

package.json

@@ -28,24 +28,24 @@
   },
   "homepage": "https://github.com/UniversityOfHelsinkiCS/oodikone#readme",
   "devDependencies": {
-    "@babel/eslint-parser": "^7.15.0",
-    "@babel/plugin-syntax-jsx": "^7.14.5",
-    "concurrently": "^6.2.1",
-    "cypress": "^8.3.1",
+    "@babel/eslint-parser": "^7.17.0",
+    "@babel/plugin-syntax-jsx": "^7.16.7",
+    "concurrently": "^6.5.1",
+    "cypress": "^8.7.0",
     "eslint": "^7.32.0",
     "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-cypress": "^2.11.3",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-cypress": "^2.12.1",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
     "eslint-plugin-prettier": "^3.4.1",
-    "eslint-plugin-react": "^7.24.0",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "husky": "^7.0.2",
-    "lint-staged": "^11.1.2",
-    "prettier": "^2.3.2",
+    "eslint-plugin-react": "^7.29.3",
+    "eslint-plugin-react-hooks": "^4.3.0",
+    "husky": "^7.0.4",
+    "lint-staged": "^11.2.6",
+    "prettier": "^2.5.1",
     "stylelint": "^13.13.1",
     "stylelint-config-prettier": "^8.0.2",
     "stylelint-config-standard": "^22.0.0",

services/backend/package-lock.json

@@ -3,10 +3,15 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
+    "@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="
+    },
     "@dabh/diagnostics": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz",
-      "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
+      "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==",
       "requires": {
         "colorspace": "1.1.x",
         "enabled": "2.0.x",
@@ -76,48 +81,48 @@
       }
     },
     "@sentry/tracing": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.11.0.tgz",
-      "integrity": "sha512-9VA1/SY++WeoMQI4K6n/sYgIdRtCu9NLWqmGqu/5kbOtESYFgAt1DqSyqGCr00ZjQiC2s7tkDkTNZb38K6KytQ==",
+      "version": "6.18.2",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.18.2.tgz",
+      "integrity": "sha512-hg6NLqrqJ5sUPTyWEQ2RqdnhQVnyLtx8II0IyWxQLDWD8UCe3Mu6G7mroDtakPWcP+lWz6OnKfMEfuhMcxR8fw==",
       "requires": {
-        "@sentry/hub": "6.11.0",
-        "@sentry/minimal": "6.11.0",
-        "@sentry/types": "6.11.0",
-        "@sentry/utils": "6.11.0",
+        "@sentry/hub": "6.18.2",
+        "@sentry/minimal": "6.18.2",
+        "@sentry/types": "6.18.2",
+        "@sentry/utils": "6.18.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
         "@sentry/hub": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.11.0.tgz",
-          "integrity": "sha512-pT9hf+ZJfVFpoZopoC+yJmFNclr4NPqPcl2cgguqCHb69DklD1NxgBNWK8D6X05qjnNFDF991U6t1mxP9HrGuw==",
+          "version": "6.18.2",
+          "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.18.2.tgz",
+          "integrity": "sha512-d0AugekMkbnN12b4EXMjseJxtLPc9S20DGobCPUb4oAQT6S2oDQEj1jwP6PQ5vtgyy+GMYWxBMgqAQ4pjVYISQ==",
           "requires": {
-            "@sentry/types": "6.11.0",
-            "@sentry/utils": "6.11.0",
+            "@sentry/types": "6.18.2",
+            "@sentry/utils": "6.18.2",
             "tslib": "^1.9.3"
           }
         },
         "@sentry/minimal": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.11.0.tgz",
-          "integrity": "sha512-XkZ7qrdlGp4IM/gjGxf1Q575yIbl5RvPbg+WFeekpo16Ufvzx37Mr8c2xsZaWosISVyE6eyFpooORjUlzy8EDw==",
+          "version": "6.18.2",
+          "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.18.2.tgz",
+          "integrity": "sha512-n7KYuo34W2LxE+3dnZ47of7XHuORINCnXq66XH72eoj67tf0XeWbIhEJrYGmoLRyRfoCYYrBLWiDl/uTjLzrzQ==",
           "requires": {
-            "@sentry/hub": "6.11.0",
-            "@sentry/types": "6.11.0",
+            "@sentry/hub": "6.18.2",
+            "@sentry/types": "6.18.2",
             "tslib": "^1.9.3"
           }
         },
         "@sentry/types": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.11.0.tgz",
-          "integrity": "sha512-gm5H9eZhL6bsIy/h3T+/Fzzz2vINhHhqd92CjHle3w7uXdTdFV98i2pDpErBGNTSNzbntqOMifYEB5ENtZAvcg=="
+          "version": "6.18.2",
+          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.18.2.tgz",
+          "integrity": "sha512-WzpJf/Q5aORTzrSwer/As1NlO90dBAQpaHV2ikDDKqOyMWEgjKb5/4gh59p9gH8JMMnLetP1AvQel0fOj5UnUw=="
         },
         "@sentry/utils": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.11.0.tgz",
-          "integrity": "sha512-IOvyFHcnbRQxa++jO+ZUzRvFHEJ1cZjrBIQaNVc0IYF0twUOB5PTP6joTcix38ldaLeapaPZ9LGfudbvYvxkdg==",
+          "version": "6.18.2",
+          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.18.2.tgz",
+          "integrity": "sha512-EC619jesknyu4xpwud5WC/5odYLz6JUy7OSFy5405PpdGeh/m8XUvuJAx4zDx0Iz/Mlk0S1Md+ZcQwqkv39dkw==",
           "requires": {
-            "@sentry/types": "6.11.0",
+            "@sentry/types": "6.18.2",
             "tslib": "^1.9.3"
           }
         }
@@ -137,10 +142,28 @@
         "tslib": "^1.9.3"
       }
     },
+    "@types/debug": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
+      "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
+      "requires": {
+        "@types/ms": "*"
+      }
+    },
+    "@types/ms": {
+      "version": "0.7.31",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
+      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="
+    },
     "@types/node": {
-      "version": "14.14.39",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.39.tgz",
-      "integrity": "sha512-Qipn7rfTxGEDqZiezH+wxqWYR8vcXq5LRpZrETD19Gs4o8LbklbmqotSUsMU+s5G3PJwMRDfNEYoxrcBwIxOuw=="
+      "version": "17.0.21",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz",
+      "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="
+    },
+    "@types/validator": {
+      "version": "13.7.1",
+      "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.1.tgz",
+      "integrity": "sha512-I6OUIZ5cYRk5lp14xSOAiXjWrfVoMZVjDuevBYgQDYzZIjsf2CAISpEcXOkFAtpAHbmWIDLcZObejqny/9xq5Q=="
     },
     "abbrev": {
       "version": "1.1.1",
@@ -149,12 +172,12 @@
       "dev": true
     },
     "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
     "agent-base": {
@@ -165,11 +188,6 @@
         "debug": "4"
       }
     },
-    "any-promise": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
-    },
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -206,9 +224,9 @@
       "dev": true
     },
     "async": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
-      "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
     },
     "async-each": {
       "version": "1.0.3",
@@ -217,9 +235,9 @@
       "dev": true
     },
     "async-lock": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.3.0.tgz",
-      "integrity": "sha512-8A7SkiisnEgME2zEedtDYPxUPzdv3x//E7n5IFktPAtMYSEAV7eNJF0rMwrVyUFj6d/8rgajLantbjcNRQYXIg=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.3.1.tgz",
+      "integrity": "sha512-zK7xap9UnttfbE23JmcrNIyueAn6jWshihJqA33U/hEnKprF/lVGBDsBv/bqLm2YMMl1DnpHhUY044eA0t1TUw=="
     },
     "atob": {
       "version": "2.1.2",
@@ -228,9 +246,9 @@
       "dev": true
     },
     "axios": {
-      "version": "0.21.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz",
-      "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==",
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "requires": {
         "follow-redirects": "^1.14.0"
       }
@@ -291,20 +309,20 @@
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
     },
     "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
+      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
       "requires": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
         "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "http-errors": "1.8.1",
         "iconv-lite": "0.4.24",
         "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "qs": "6.9.7",
+        "raw-body": "2.4.3",
+        "type-is": "~1.6.18"
       },
       "dependencies": {
         "debug": {
@@ -338,9 +356,9 @@
       "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="
     },
     "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
     },
     "cache-base": {
       "version": "1.0.1",
@@ -514,12 +532,12 @@
       }
     },
     "color": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
-      "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
       "requires": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
+        "color-convert": "^1.9.3",
+        "color-string": "^1.6.0"
       }
     },
     "color-convert": {
@@ -536,25 +554,20 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-string": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
-      "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
       "requires": {
         "color-name": "^1.0.0",
         "simple-swizzle": "^0.2.2"
       }
     },
-    "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
-    },
     "colorspace": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
-      "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
+      "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
       "requires": {
-        "color": "3.0.x",
+        "color": "^3.1.3",
         "text-hex": "1.0.x"
       }
     },
@@ -571,11 +584,18 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
       }
     },
     "content-type": {
@@ -602,7 +622,8 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
     },
     "cors": {
       "version": "2.8.5",
@@ -838,16 +859,16 @@
       }
     },
     "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.17.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
+      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.19.2",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.4.2",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -861,13 +882,13 @@
         "on-finished": "~2.3.0",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.9.7",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.17.2",
+        "serve-static": "1.14.2",
+        "setprototypeof": "1.2.0",
         "statuses": "~1.5.0",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
@@ -875,9 +896,9 @@
       },
       "dependencies": {
         "cookie": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
         },
         "debug": {
           "version": "2.6.9",
@@ -891,6 +912,11 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
         }
       }
     },
@@ -951,11 +977,6 @@
         }
       }
     },
-    "fast-safe-stringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
-    },
     "fecha": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
@@ -1003,9 +1024,9 @@
       "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
     },
     "follow-redirects": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
-      "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw=="
+      "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
+      "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -1014,9 +1035,9 @@
       "dev": true
     },
     "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
     },
     "fragment-cache": {
       "version": "0.2.1",
@@ -1106,22 +1127,15 @@
       }
     },
     "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
       "requires": {
         "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
         "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        }
+        "toidentifier": "1.0.1"
       }
     },
     "https-proxy-agent": {
@@ -1160,9 +1174,9 @@
       "dev": true
     },
     "inflection": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.1.tgz",
-      "integrity": "sha512-dldYtl2WlN0QDkIDtg8+xFwOS2Tbmp12t1cHa5/YClU6ZQjTFm7B66UcVbh9NQB+HvT5BAd2t5+yKsBkw5pcqA=="
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.13.2.tgz",
+      "integrity": "sha512-cmZlljCRTBFouT8UzMzrGcVEvkv6D/wBdcdKG7J1QH5cXjtU75Dm+P27v9EKu/Y43UYyCJd1WC4zLebRrC8NBw=="
     },
     "inherits": {
       "version": "2.0.4",
@@ -1303,7 +1317,8 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "isexe": {
       "version": "2.0.0",
@@ -1334,14 +1349,14 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "logform": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz",
-      "integrity": "sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz",
+      "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==",
       "requires": {
-        "colors": "^1.2.1",
-        "fast-safe-stringify": "^2.0.4",
+        "@colors/colors": "1.5.0",
         "fecha": "^4.2.0",
         "ms": "^2.1.1",
+        "safe-stable-stringify": "^2.3.1",
         "triple-beam": "^1.3.0"
       }
     },
@@ -1400,16 +1415,16 @@
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.47.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
-      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="
+      "version": "1.51.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
     },
     "mime-types": {
-      "version": "2.1.30",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
-      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
+      "version": "2.1.34",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
       "requires": {
-        "mime-db": "1.47.0"
+        "mime-db": "1.51.0"
       }
     },
     "minimatch": {
@@ -1443,9 +1458,9 @@
       "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
     "moment-timezone": {
-      "version": "0.5.33",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz",
-      "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==",
+      "version": "0.5.34",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz",
+      "integrity": "sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==",
       "requires": {
         "moment": ">= 2.9.0"
       }
@@ -1514,9 +1529,9 @@
       }
     },
     "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
     },
     "nodemon": {
       "version": "1.19.4",
@@ -2205,14 +2220,14 @@
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
     "pg": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.7.1.tgz",
-      "integrity": "sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==",
+      "version": "8.7.3",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.7.3.tgz",
+      "integrity": "sha512-HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw==",
       "requires": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
         "pg-connection-string": "^2.5.0",
-        "pg-pool": "^3.4.1",
+        "pg-pool": "^3.5.1",
         "pg-protocol": "^1.5.0",
         "pg-types": "^2.1.0",
         "pgpass": "1.x"
@@ -2229,9 +2244,9 @@
       "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
     },
     "pg-pool": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz",
-      "integrity": "sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ=="
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz",
+      "integrity": "sha512-6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="
     },
     "pg-protocol": {
       "version": "1.5.0",
@@ -2251,11 +2266,11 @@
       }
     },
     "pgpass": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz",
-      "integrity": "sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
+      "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
       "requires": {
-        "split2": "^3.1.1"
+        "split2": "^4.1.0"
       }
     },
     "posix-character-classes": {
@@ -2290,14 +2305,15 @@
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
     },
     "proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
       }
     },
@@ -2314,9 +2330,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="
     },
     "range-parser": {
       "version": "1.2.1",
@@ -2324,12 +2340,12 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
+      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
       "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "1.8.1",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
@@ -2350,6 +2366,7 @@
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
       "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -2430,12 +2447,9 @@
       "dev": true
     },
     "retry-as-promised": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-3.2.0.tgz",
-      "integrity": "sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg==",
-      "requires": {
-        "any-promise": "^1.3.0"
-      }
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-5.0.0.tgz",
+      "integrity": "sha512-6S+5LvtTl2ggBumk04hBo/4Uf6fRJUwIgunGZ7CYEBCeufGFW1Pu6ucUf/UskHeWOIsUcLOGLFXPig5tR5V1nA=="
     },
     "safe-buffer": {
       "version": "5.1.2",
@@ -2451,11 +2465,39 @@
         "ret": "~0.1.10"
       }
     },
+    "safe-stable-stringify": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz",
+      "integrity": "sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="
+    },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
+    "semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
+      }
+    },
     "semver-diff": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
@@ -2474,9 +2516,9 @@
       }
     },
     "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.17.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
+      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
       "requires": {
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -2485,9 +2527,9 @@
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "1.8.1",
         "mime": "1.6.0",
-        "ms": "2.1.1",
+        "ms": "2.1.3",
         "on-finished": "~2.3.0",
         "range-parser": "~1.2.1",
         "statuses": "~1.5.0"
@@ -2507,76 +2549,66 @@
               "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
             }
           }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
     "sequelize": {
-      "version": "6.6.5",
-      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.6.5.tgz",
-      "integrity": "sha512-QyRrJrDRiwuiILqTMHUA1yWOPIL12KlfmgZ3hnzQwbMvp2vJ6fzu9bYJQB+qPMosck4mBUggY4Cjoc6Et8FBIQ==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.17.0.tgz",
+      "integrity": "sha512-AZus+0YZDq91Zg0hzDaO5atTzHgJruI23V8nBlAhkLuI81Z53nSRdAe/4R1A6vGOZ/RfCLP9idF4tfQnoAsM5A==",
       "requires": {
-        "debug": "^4.1.1",
-        "dottie": "^2.0.0",
-        "inflection": "1.13.1",
-        "lodash": "^4.17.20",
-        "moment": "^2.26.0",
-        "moment-timezone": "^0.5.31",
-        "retry-as-promised": "^3.2.0",
-        "semver": "^7.3.2",
-        "sequelize-pool": "^6.0.0",
+        "@types/debug": "^4.1.7",
+        "@types/validator": "^13.7.1",
+        "debug": "^4.3.3",
+        "dottie": "^2.0.2",
+        "inflection": "^1.13.2",
+        "lodash": "^4.17.21",
+        "moment": "^2.29.1",
+        "moment-timezone": "^0.5.34",
+        "pg-connection-string": "^2.5.0",
+        "retry-as-promised": "^5.0.0",
+        "semver": "^7.3.5",
+        "sequelize-pool": "^7.1.0",
         "toposort-class": "^1.0.1",
-        "uuid": "^8.1.0",
-        "validator": "^13.6.0",
+        "uuid": "^8.3.2",
+        "validator": "^13.7.0",
         "wkx": "^0.5.0"
       },
       "dependencies": {
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+        "debug": {
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "requires": {
-            "yallist": "^4.0.0"
+            "ms": "2.1.2"
           }
         },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "uuid": {
           "version": "8.3.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
           "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
         }
       }
     },
     "sequelize-pool": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-6.1.0.tgz",
-      "integrity": "sha512-4YwEw3ZgK/tY/so+GfnSgXkdwIJJ1I32uZJztIEgZeAO6HMgj64OzySbWLgxj+tXhZCJnzRfkY9gINw8Ft8ZMg=="
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-7.1.0.tgz",
+      "integrity": "sha512-G9c0qlIWQSK29pR/5U2JF5dDQeqqHRragoyahj/Nx4KOOQ3CPPfzxnfqFPCSB7x5UgjOgnZ61nSxz+fjDpRlJg=="
     },
     "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
+      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.17.2"
       }
     },
     "set-value": {
@@ -2618,9 +2650,9 @@
       }
     },
     "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
     "shebang-command": {
       "version": "1.2.0",
@@ -2842,24 +2874,9 @@
       }
     },
     "split2": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
-      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
-      "requires": {
-        "readable-stream": "^3.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz",
+      "integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ=="
     },
     "stack-trace": {
       "version": "0.0.10",
@@ -3072,9 +3089,9 @@
       }
     },
     "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
     "toposort-class": {
       "version": "1.0.1",
@@ -3323,19 +3340,20 @@
       }
     },
     "winston": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz",
-      "integrity": "sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.6.0.tgz",
+      "integrity": "sha512-9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w==",
       "requires": {
         "@dabh/diagnostics": "^2.0.2",
-        "async": "^3.1.0",
+        "async": "^3.2.3",
         "is-stream": "^2.0.0",
-        "logform": "^2.2.0",
+        "logform": "^2.4.0",
         "one-time": "^1.0.0",
         "readable-stream": "^3.4.0",
+        "safe-stable-stringify": "^2.3.1",
         "stack-trace": "0.0.x",
         "triple-beam": "^1.3.0",
-        "winston-transport": "^4.4.0"
+        "winston-transport": "^4.5.0"
       },
       "dependencies": {
         "is-stream": {
@@ -3356,12 +3374,25 @@
       }
     },
     "winston-transport": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz",
-      "integrity": "sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz",
+      "integrity": "sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==",
       "requires": {
-        "readable-stream": "^2.3.7",
-        "triple-beam": "^1.2.0"
+        "logform": "^2.3.2",
+        "readable-stream": "^3.6.0",
+        "triple-beam": "^1.3.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
     "wkx": {

services/backend/package.json

@@ -8,27 +8,27 @@
   },
   "dependencies": {
     "@sentry/node": "^5.30.0",
-    "@sentry/tracing": "^6.11.0",
-    "async": "^3.2.1",
-    "async-lock": "^1.3.0",
-    "axios": "^0.21.2",
+    "@sentry/tracing": "^6.18.2",
+    "async": "^3.2.3",
+    "async-lock": "^1.3.1",
+    "axios": "^0.21.4",
     "bluebird": "^3.7.2",
     "cors": "^2.8.5",
     "cron": "^1.8.2",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
     "express-async-errors": "^3.1.1",
     "lodash": "^4.17.21",
     "lru-cache": "^5.1.1",
     "moment": "^2.29.1",
-    "moment-timezone": "^0.5.33",
+    "moment-timezone": "^0.5.34",
     "morgan": "^1.10.0",
-    "pg": "^8.7.1",
+    "pg": "^8.7.3",
     "redis": "^3.1.2",
-    "sequelize": "^6.6.5",
+    "sequelize": "^6.17.0",
     "umzug": "^2.3.0",
     "unfuck-utf8-headers-middleware": "^1.0.1",
     "uuid": "^3.4.0",
-    "winston": "^3.3.3"
+    "winston": "^3.6.0"
   },
   "devDependencies": {
     "nodemon": "^1.19.4"

services/backend/src/database/migrations_kone/20220307_00_remove_thesis_courses.js

@@ -0,0 +1,6 @@
+module.exports = {
+  up: async queryInterface => {
+    await queryInterface.dropTable('thesis_courses')
+  },
+  down: async () => {},
+}

services/backend/src/models/enrollment.js

@@ -0,0 +1,69 @@
+const { Model, DATE, INTEGER, STRING, BOOLEAN } = require('sequelize')
+const { dbConnections } = require('../database/connection')
+
+class Enrollment extends Model {}
+
+Enrollment.init(
+  {
+    id: {
+      primaryKey: true,
+      type: STRING,
+    },
+    studentnumber: {
+      type: STRING,
+      references: {
+        model: 'student',
+        key: 'studentnumber',
+      },
+      onUpdate: 'cascade',
+      onDelete: 'cascade',
+    },
+    course_code: {
+      type: STRING,
+    },
+    state: {
+      type: STRING,
+    },
+    enrollment_date_time: {
+      type: DATE,
+    },
+    course_id: {
+      type: STRING,
+      references: {
+        model: 'course',
+        key: 'id',
+      },
+      onUpdate: 'cascade',
+      onDelete: 'cascade',
+    },
+    semester_composite: {
+      type: STRING,
+      references: {
+        model: 'semesters',
+        key: 'composite',
+      },
+      onUpdate: 'cascade',
+      onDelete: 'cascade',
+    },
+    semestercode: {
+      type: INTEGER,
+    },
+    createdAt: {
+      type: DATE,
+    },
+    updatedAt: {
+      type: DATE,
+    },
+    is_open: {
+      type: BOOLEAN,
+    },
+  },
+  {
+    underscored: false,
+    sequelize: dbConnections.sequelize,
+    modelName: 'enrollment',
+    tableName: 'enrollment',
+  }
+)
+
+module.exports = Enrollment

services/backend/src/models/index.js

@@ -10,6 +10,7 @@ const CreditType = require('./creditType')
 const Credit = require('./credit')
 const CreditTeacher = require('./creditTeacher')
 const ElementDetail = require('./elementDetail')
+const Studyplan = require('./studyplan')
 const StudyrightExtent = require('./studyrightExtent')
 const Studyright = require('./studyright')
 const StudyrightElement = require('./studyrightElement')
@@ -17,6 +18,7 @@ const Transfer = require('./transfer')
 const ProgrammeModule = require('./programmeModule')
 const ProgrammeModuleChild = require('./programmeModuleChild')
 const ExcludedCourse = require('./excludedCourse')
+const Enrollment = require('./enrollment')
 
 CourseType.hasMany(Course, { foreignKey: 'coursetypecode', sourceKey: 'coursetypecode' })
 Course.belongsTo(CourseType, { foreignKey: 'coursetypecode', targetKey: 'coursetypecode' })
@@ -62,6 +64,9 @@ Teacher.belongsToMany(Credit, { through: CreditTeacher, foreignKey: 'teacher_id'
 Organization.hasMany(Studyright, { foreignKey: 'facultyCode', sourceKey: 'code' })
 Studyright.belongsTo(Organization, { foreignKey: 'facultyCode', targetKey: 'code' })
 
+Studyplan.belongsTo(Student, { foreignKey: 'studentnumber', targetKey: 'studentnumber' })
+Student.hasMany(Studyplan, { foreignKey: 'studentnumber', sourceKey: 'studentnumber' })
+
 Studyright.belongsTo(Student, { foreignKey: 'studentStudentnumber', targetKey: 'studentnumber' })
 Student.hasMany(Studyright, { foreignKey: 'studentStudentnumber', sourceKey: 'studentnumber' })
 
@@ -88,6 +93,12 @@ Studyright.hasMany(Transfer, { foreignKey: 'studyrightid', sourceKey: 'studyrigh
 Transfer.belongsTo(ElementDetail, { as: 'source', foreignKey: 'sourcecode' })
 Transfer.belongsTo(ElementDetail, { as: 'target', foreignKey: 'targetcode' })
 
+Enrollment.belongsTo(Student, { foreignKey: 'studentnumber', targetKey: 'studentnumber' })
+Student.hasMany(Enrollment, { foreignKey: 'studentnumber', sourceKey: 'studentnumber' })
+Enrollment.belongsTo(Course, { foreignKey: 'course_id' })
+Course.hasMany(Enrollment, { foreignKey: 'course_id' })
+Enrollment.belongsTo(Semester, { foreignKey: { name: 'semester_composite', allowNull: false } })
+
 ProgrammeModule.belongsToMany(ProgrammeModule, {
   as: 'parents',
   through: ProgrammeModuleChild,
@@ -114,6 +125,7 @@ module.exports = {
   Credit,
   CreditTeacher,
   ElementDetail,
+  Studyplan,
   StudyrightExtent,
   Studyright,
   StudyrightElement,
@@ -121,4 +133,5 @@ module.exports = {
   ProgrammeModule,
   ProgrammeModuleChild,
   ExcludedCourse,
+  Enrollment,
 }

services/backend/src/models/models_kone.js

@@ -104,20 +104,6 @@ const MandatoryCourseLabels = sequelizeKone.define('mandatory_course_labels', {
   },
 })
 
-const ThesisCourse = sequelizeKone.define('thesis_courses', {
-  programmeCode: {
-    primaryKey: true,
-    type: Sequelize.STRING,
-  },
-  courseCode: {
-    primaryKey: true,
-    type: Sequelize.STRING,
-  },
-  thesisType: {
-    type: Sequelize.ENUM([ThesisTypeEnums.BACHELOR, ThesisTypeEnums.MASTER]),
-  },
-})
-
 const CustomPopulationSearch = sequelizeKone.define('custom_population_searches', {
   id: {
     primaryKey: true,
@@ -173,7 +159,6 @@ module.exports = {
   MandatoryCourse,
   TagStudent,
   Tag,
-  ThesisCourse,
   ThesisTypeEnums,
   MandatoryCourseLabels,
   CustomPopulationSearch,

services/backend/src/models/studyplan.js

@@ -0,0 +1,48 @@
+const { Model, DATE, ARRAY, STRING, INTEGER } = require('sequelize')
+const { dbConnections } = require('../database/connection')
+
+class Studyplan extends Model {}
+
+Studyplan.init(
+  {
+    id: {
+      primaryKey: true,
+      type: INTEGER,
+      autoIncrement: true,
+      allowNull: false,
+    },
+    studentnumber: {
+      type: STRING,
+      references: {
+        model: 'student',
+        key: 'studentnumber',
+      },
+      onUpdate: 'cascade',
+      onDelete: 'cascade',
+      unique: 'source', // This and programme_code create a composite key for this table.
+      allowNull: false,
+    },
+    programme_code: {
+      type: STRING,
+      allowNull: false,
+      unique: 'source',
+    },
+    included_courses: {
+      type: ARRAY(STRING),
+    },
+    createdAt: {
+      type: DATE,
+    },
+    updatedAt: {
+      type: DATE,
+    },
+  },
+  {
+    underscored: false,
+    sequelize: dbConnections.sequelize,
+    modelName: 'studyplan',
+    tableName: 'studyplan',
+  }
+)
+
+module.exports = Studyplan

services/backend/src/models/studyright.js

@@ -27,6 +27,9 @@ Studyright.init(
     graduated: {
       type: INTEGER,
     },
+    active: {
+      type: INTEGER,
+    },
     // irtisanomisperuste
     studentStudentnumber: {
       type: STRING,

services/backend/src/rapodiff.js

@@ -1,41 +1,69 @@
 /* eslint no-console: 0 */
 
-// script needs rapo certs, so you need to run this in production pannu
-//
-// possible workflows:
-// - go to oodikone pannu, then "docker exec -it backend sh", then run this script with "npm
-// run rapodiff". Modify with vim / nano until you're happy, then copy changes to local version and commit.
-// - or bind mount a file to backend container in pannu, overriding this file. Modify that file
-// inside or outside container, however you want. Keep file in pannu, or put it to pannu's git repo (oodikone-server-setup).
+/*
+  depends on nodeproxy running in importer.cs.helsinki.fi, and env RAPO_NODEPROXY (see importer for a proper value)
+  needs also acces to importer db api, uses env IMPORTER_API
+
+  known differences in APIs
+    - rapo does not show students that have graduated (it however takes some days for rapo to notice a graduation)
+    - rapo does not handle the starting year of transfers properly (shows in old staring population)
+    - rapo show some students incorrectly passive, see https://github.com/UniversityOfHelsinkiCS/oodikone/issues/3521
+*/
 
 const axios = require('axios').default
-const fs = require('fs')
-const https = require('https')
+
 const _ = require('lodash')
 
 const { optimizedStatisticsOf } = require('./services/populations')
+const { Student, Transfer, StudyrightElement, Studyright } = require('./models')
 
-const { RAPO_CERT_PATH, RAPO_KEY_PATH, RAPO_API_KEY } = process.env
+const token = process.env.RAPO_NODEPROXY
 
-const agent = new https.Agent({
-  cert: fs.readFileSync(RAPO_CERT_PATH, 'utf8'),
-  key: fs.readFileSync(RAPO_KEY_PATH, 'utf8'),
-})
+const getFromRapo = async (urlStart, urlEnd) => {
+  const { data: rapoStuffLasna } = await axios.get(urlStart)
+  const { data: rapoStuffLasnaMinus } = await axios.get(urlEnd)
 
-const api = axios.create({
-  baseURL: 'https://gw.api.helsinki.fi/secure/rapo/report/',
-  headers: { 'X-Api-Key': RAPO_API_KEY },
-  httpsAgent: agent,
-})
+  const rapoStudents = _.difference(
+    rapoStuffLasna.map(s => s.opiskelijanumero),
+    rapoStuffLasnaMinus.map(s => s.opiskelijanumero)
+  )
 
-const main = async () => {
-  const facultyCode = 'H50'
-  const programme = 'KH50_005'
-  const studyrightStartDate = '2020-08-01'
-  const presence = 'LÄSNÄOLEVA'
+  return rapoStudents
+}
 
-  const months = 12 // some amount of months, dunno
-  const year = 2020
+const known_problems_in_oodikone = {
+  KH30_001: ['013896191'],
+  KH40_003: ['013200457'],
+  KH55_001: ['013195834', '015119708', '015138336'],
+}
+
+const known_problems_in_rapo = {
+  KH55_001: ['015160142', '015135575', '015119708', '015138336'],
+}
+
+const getFromOodikone = async (programme, year) => {
+  const isNotAmongKnownProblems = student => {
+    const hasProblems = known_problems_in_oodikone[programme] ? known_problems_in_oodikone[programme] : []
+    return !hasProblems.includes(student.studentNumber)
+  }
+
+  const theStudyrights = student => {
+    const theOne = s => s.studyright_elements.find(e => e.code === programme)
+    // in some rare cases student may have more than one studyright for same programme
+    return student.studyrights.filter(theOne)
+  }
+
+  const notGraduated = student => {
+    const graduation = theStudyrights(student).filter(r => r.graduated === 1)
+    return graduation.length === 0
+  }
+
+  const notTransferred = student => {
+    const transfer = student.transfers.find(t => t.targetcode === programme)
+    return transfer === undefined
+  }
+
+  const months = 12
 
   const oodikoneQuery = {
     semesters: ['FALL', 'SPRING'],
@@ -44,21 +72,292 @@ const main = async () => {
     year,
   }
 
-  const oodikoneStuff = await optimizedStatisticsOf(oodikoneQuery)
-  const oodikoneStudents = oodikoneStuff.students.map(s => s.studentNumber)
+  const oodikoneStuff = (await optimizedStatisticsOf(oodikoneQuery)).students
 
-  const rapoUrl = encodeURI(
-    `studyrights?faculty=${facultyCode}&presence=${presence}&education=${programme}&studyrightStartDate=${studyrightStartDate}`
+  return oodikoneStuff
+    .filter(notGraduated)
+    .filter(notTransferred)
+    .filter(isNotAmongKnownProblems)
+    .map(s => s.studentNumber)
+}
+
+const isAcuallyActive = async student => {
+  const currentSemester = 144
+  const tokenImporterApi = process.env.IMPORTER_API
+
+  const url = `https://importer.cs.helsinki.fi/api/importer/students/${student}/rapo_semester_enrollments?token=${tokenImporterApi}`
+  const { data } = await axios.get(url)
+  const terms = data.reduce((all, s) => all.concat(s.terms), []).filter(t => t.semester_code === currentSemester)
+  const active = terms.filter(t => t.type !== 'NEGLECTED')
+  const negl = terms.filter(t => t.type === 'NEGLECTED')
+  return active.length > 0 && negl.length > 0
+}
+
+const hasTransferred = async (student, programme) => {
+  const data = await Student.findByPk(student, {
+    include: [
+      {
+        model: Transfer,
+      },
+    ],
+  })
+
+  const transferTo = data.transfers.find(t => t.targetcode === programme)
+  return transferTo !== undefined
+}
+
+const graduatedVeryRecently = async (student, programme) => {
+  const data = await Student.findByPk(student, {
+    include: [
+      {
+        model: Studyright,
+        include: [
+          {
+            model: StudyrightElement,
+            required: true,
+            where: {
+              code: programme,
+            },
+          },
+        ],
+        where: {
+          graduated: 1,
+        },
+      },
+    ],
+  })
+
+  if (!data || data.studyrights.length === 0) {
+    return false
+  }
+
+  const graduated = new Date(data.studyrights[0].enddate)
+  const weekAgo = new Date(new Date().getTime() - 7 * 24 * 60 * 60 * 1000)
+  return graduated > weekAgo
+}
+
+const programme_diff_year = async (programme, facultyCode, year, brief = false) => {
+  const oodikoneStudents = await getFromOodikone(programme, year)
+
+  const studyrightStartDate = `${year}-08-01`
+  const studyrightEndDate = `${year + 1}-08-01`
+
+  const rapoUrlStart = presence =>
+    encodeURI(
+      `https://importer.cs.helsinki.fi/test/rapo/${facultyCode}/${programme}/${studyrightStartDate}/${presence}?token=${token}`
+    )
+  const rapoUrlEnd = presence =>
+    encodeURI(
+      `https://importer.cs.helsinki.fi/test/rapo/${facultyCode}/${programme}/${studyrightEndDate}/${presence}?token=${token}`
+    )
+
+  const rapoStudentsLasna = await getFromRapo(rapoUrlStart('Läsnä'), rapoUrlEnd('Läsnä'))
+  const rapoStudentsPoissa = await getFromRapo(rapoUrlStart('Poissa'), rapoUrlEnd('Poissa'))
+  const rapoStudentPoissaLaki = await getFromRapo(
+    rapoUrlStart('Poissa ei kuluta opintoaikaa'),
+    rapoUrlEnd('Poissa ei kuluta opintoaikaa')
   )
 
-  const { data: rapoStuff } = await api.get(rapoUrl)
-  const rapoStudents = rapoStuff.map(s => s.opiskelijanumero)
+  const isNotAmongKnownProblems = student => {
+    const hasProblems = known_problems_in_rapo[programme] ? known_problems_in_rapo[programme] : []
+    return !hasProblems.includes(student.studentNumber)
+  }
+
+  const rapoStudents = rapoStudentsLasna
+    .concat(rapoStudentsPoissa)
+    .concat(rapoStudentPoissaLaki)
+    .filter(isNotAmongKnownProblems)
 
   const onlyInOodikone = _.difference(oodikoneStudents, rapoStudents)
   const onlyInRapo = _.difference(rapoStudents, oodikoneStudents)
 
-  console.log('Only in Oodikone:', onlyInOodikone)
-  console.log('Only in Rapo:', onlyInRapo)
+  const wrongMissingInRapo = []
+  for (let student of onlyInOodikone) {
+    const status = await isAcuallyActive(student)
+    if (status) {
+      wrongMissingInRapo.push(student)
+    }
+  }
+
+  // these are in wrong RAPO-population
+  const transferred = []
+  for (let student of onlyInRapo) {
+    const isTransfer = await hasTransferred(student, programme)
+    if (isTransfer) {
+      transferred.push(student)
+    } else {
+      const isRecentGraduation = await graduatedVeryRecently(student, programme)
+      if (isRecentGraduation) {
+        transferred.push(student)
+      }
+    }
+  }
+
+  const checkOodikoneOnly = _.difference(onlyInOodikone, wrongMissingInRapo)
+  const checkRapoOnly = _.difference(onlyInRapo, transferred)
+
+  if (!brief) {
+    console.log('vuosi', year)
+    console.log('')
+    console.log('oodikone', oodikoneStudents.length, ' transferred', transferred.length)
+    console.log('rapo', rapoStudents.length, ' activeness wrong rapo', wrongMissingInRapo.length)
+    console.log('only rapo', checkRapoOnly.length)
+    console.log('only oodikone', checkOodikoneOnly.length)
+
+    console.log('')
+
+    if (checkRapoOnly.length > 0) {
+      console.log('Only in Rapo:')
+      console.log(checkRapoOnly.join('\n'))
+    }
+
+    if (checkOodikoneOnly.length > 0) {
+      console.log('Only in Oodikone:')
+      console.log(checkOodikoneOnly.join('\n'))
+    }
+  }
+
+  if (checkRapoOnly.length + checkOodikoneOnly.length) {
+    console.log('******************************', year)
+    if (checkRapoOnly.length > 0) {
+      console.log('Only in Rapo:')
+      console.log(checkRapoOnly.join('\n'))
+    }
+
+    if (checkOodikoneOnly.length > 0) {
+      console.log('Only in Oodikone:')
+      console.log(checkOodikoneOnly.join('\n'))
+    }
+  }
+
+  if (!brief) {
+    console.log('')
+  }
+}
+
+const programme_diff = async (programme, faculty, brief) => {
+  console.log()
+  console.log(programme)
+  console.log('--------', '\n')
+
+  await programme_diff_year(programme, faculty, 2017, brief)
+  await programme_diff_year(programme, faculty, 2018, brief)
+  await programme_diff_year(programme, faculty, 2019, brief)
+  await programme_diff_year(programme, faculty, 2020, brief)
+  await programme_diff_year(programme, faculty, 2021, brief)
+}
+
+const faculty_diff = async (faculty, programmes, brief) => {
+  console.log('\n')
+  console.log(faculty)
+  console.log('==')
+  for (let programme of programmes) {
+    await programme_diff(programme, faculty, brief)
+  }
+}
+
+// eslint-disable-next-line no-unused-vars
+const msc_programme_diff_year = async (programme, facultyCode, year, brief = false) => {
+  const oodikoneStudents = await getFromOodikone(programme, year)
+
+  const studyrightStartDate = `${year}-08-01`
+  const studyrightEndDate = `${year + 1}-08-01`
+
+  const rapoUrlStart = presence =>
+    encodeURI(
+      `https://importer.cs.helsinki.fi/test/rapo/${facultyCode}/${programme}/${studyrightStartDate}/${presence}?token=${token}`
+    )
+  const rapoUrlEnd = presence =>
+    encodeURI(
+      `https://importer.cs.helsinki.fi/test/rapo/${facultyCode}/${programme}/${studyrightEndDate}/${presence}?token=${token}`
+    )
+
+  const rapoStudentsLasna = await getFromRapo(rapoUrlStart('Läsnä'), rapoUrlEnd('Läsnä'))
+  const rapoStudentsPoissa = await getFromRapo(rapoUrlStart('Poissa'), rapoUrlEnd('Poissa'))
+  const rapoStudentPoissaLaki = await getFromRapo(
+    rapoUrlStart('Poissa ei kuluta opintoaikaa'),
+    rapoUrlEnd('Poissa ei kuluta opintoaikaa')
+  )
+
+  const rapoStudents = rapoStudentsLasna.concat(rapoStudentsPoissa).concat(rapoStudentPoissaLaki)
+
+  const onlyInOodikone = _.difference(oodikoneStudents, rapoStudents)
+  const onlyInRapo = _.difference(rapoStudents, oodikoneStudents)
+
+  const wrongInRapo = []
+  for (let student of onlyInOodikone) {
+    const status = await isAcuallyActive(student)
+    if (status) {
+      //wrongInRapo.push(student)
+    }
+  }
+
+  // in wrong RAPO population
+  const transferred = []
+  for (let student of onlyInRapo) {
+    const status = await hasTransferred(student, programme)
+    if (status) {
+      transferred.push(student)
+    }
+  }
+
+  const checkOodikoneOnly = _.difference(onlyInOodikone, wrongInRapo)
+  const checkRapoOnly = _.difference(onlyInRapo, transferred)
+  const both = _.intersection(oodikoneStudents, rapoStudents)
+
+  console.log('vuosi', year)
+
+  if (!brief) {
+    console.log('')
+    console.log('oodikone', oodikoneStudents.length, ' transferred', transferred.length)
+    console.log('rapo', rapoStudents.length, ' activeness wrong rapo', wrongInRapo.length)
+    console.log('both', both.length)
+    console.log('only rapo', checkRapoOnly.length)
+    console.log('only oodikone', checkOodikoneOnly.length)
+
+    console.log('')
+
+    if (checkRapoOnly.length > 0) {
+      console.log('Only in Rapo:')
+      console.log(checkRapoOnly.join('\n'))
+    }
+
+    if (checkOodikoneOnly.length > 0) {
+      console.log('Only in Oodikone:')
+      console.log(checkOodikoneOnly.join('\n'))
+    }
+  }
+
+  if (checkRapoOnly.length + checkOodikoneOnly.length) {
+    console.log('******************************************************')
+  }
+
+  if (!brief) {
+    console.log('')
+  }
+}
+
+const bsc_priogrammes_of_faculties = {
+  H10: ['KH10_001'],
+  H20: ['KH20_001'],
+  H30: ['KH30_001', 'KH30_002'],
+  H40: ['KH40_001', 'KH40_002', 'KH40_003', 'KH40_004', 'KH40_005', 'KH40_006'],
+  H50: ['KH50_001', 'KH50_002', 'KH50_003', 'KH50_004', 'KH50_005', 'KH50_006', 'KH50_007', 'KH50_008'],
+  H55: ['KH55_001'],
+  H60: ['KH60_001'],
+  H70: ['KH70_001', 'KH70_002', 'KH70_003', 'KH70_004'],
+  H74: ['KH74_001'],
+  H80: ['KH80_001', 'KH80_002', 'KH80_003', 'KH80_004'],
+  H90: ['KH90_001'],
+}
+
+const main = async () => {
+  for (let faculty of Object.keys(bsc_priogrammes_of_faculties)) {
+    await faculty_diff(faculty, bsc_priogrammes_of_faculties[faculty], true)
+  }
+
+  //await programme_diff_year('KH55_001', 'H55', 2021, true)
+  //await programme_diff('KH60_001', 'H60', true)
 }
 
 main().then(() => process.exit(0))

services/backend/src/routes/elementdetails.js

@@ -1,23 +1,6 @@
 const router = require('express').Router()
 const MandatoryCourses = require('../services/mandatoryCourses')
-const {
-  productivityStatsForStudytrack,
-  throughputStatsForStudytrack,
-  optionData,
-} = require('../services/studyprogramme')
-const { findProgrammeTheses, createThesisCourse, deleteThesisCourse } = require('../services/thesis')
-const {
-  getProductivity,
-  setProductivity,
-  getThroughput,
-  setThroughput,
-  patchProductivity,
-  patchThroughput,
-} = require('../services/analyticsService')
 const { getAllProgrammes, getAllElementDetails } = require('../services/studyrights')
-const logger = require('../util/logger')
-
-const programmeStatsSince = new Date('2017-07-31')
 
 router.get('/elementdetails/all', async (req, res) => {
   const elementdetails = await getAllElementDetails()
@@ -29,22 +12,6 @@ router.get('/studyprogrammes', async (req, res) => {
   res.json(studyrights)
 })
 
-router.get('/v2/studyprogrammes/:id/optiondata', async (req, res) => {
-  const code = req.params.id
-
-  let level
-  if (code.includes('MH')) {
-    level = 'MSC'
-  } else if (code.includes('KH')) {
-    level = 'BSC'
-  } else {
-    return res.json([])
-  }
-
-  const data = await optionData(new Date('2017-07-31'), new Date(), code, level)
-  res.json(data)
-})
-
 router.get('/v2/studyprogrammes/:id/mandatory_courses', async (req, res) => {
   if (req.params.id) {
     const codes = await MandatoryCourses.byStudyprogramme(req.params.id)
@@ -54,138 +21,4 @@ router.get('/v2/studyprogrammes/:id/mandatory_courses', async (req, res) => {
   }
 })
 
-router.get('/v2/studyprogrammes/:id/productivity', async (req, res) => {
-  const code = req.params.id
-  if (code) {
-    let data = null
-    try {
-      data = await getProductivity(code)
-    } catch (e) {
-      logger.error(`Failed to get code ${code} productivity`)
-    }
-    if (!data) {
-      try {
-        const stats = await productivityStatsForStudytrack(code, programmeStatsSince)
-        data = await setProductivity(stats)
-      } catch (e) {
-        logger.error(`Failed to update code ${code} patching status to recalculation erroring`)
-      }
-    }
-    return res.json(data)
-  } else {
-    res.status(422).end()
-  }
-})
-
-router.get('/v2/studyprogrammes/productivity/recalculate', async (req, res) => {
-  const code = req.query.code
-
-  await patchThroughput({ [code]: { status: 'RECALCULATING' } })
-  res.status(200).end()
-
-  try {
-    if (code.includes('MH') || code.includes('KH')) {
-      const data = await productivityStatsForStudytrack(code, new Date('2017-07-31'))
-      await setProductivity(data)
-    } else {
-      const data = await productivityStatsForStudytrack(code, new Date('2000-07-31'))
-      await setProductivity(data)
-    }
-  } catch (e) {
-    try {
-      await patchProductivity({
-        [code]: { status: 'RECALCULATION ERRORED' },
-      })
-    } catch (e) {
-      logger.error(`Failed to update code ${code} patching status to recalculation erroring`)
-      return
-    }
-
-    logger.error(`Failed to update productivity stats for code: ${code}, reason: ${e.message}`)
-  }
-  logger.info(`Produdtiviy stats recalculation for studyprogramme ${code} done`)
-})
-
-router.get('/v2/studyprogrammes/:id/throughput', async (req, res) => {
-  const code = req.params.id
-  if (code) {
-    const thesisPromise = findProgrammeTheses(req.params.id)
-
-    let data = null
-    try {
-      data = await getThroughput(code)
-    } catch (e) {
-      logger.error(`Failed to get code ${code} throughput`)
-    }
-    if (!data) {
-      try {
-        const result = await throughputStatsForStudytrack(req.params.id, programmeStatsSince.getFullYear())
-        data = await setThroughput(result)
-      } catch (e) {
-        logger.error(`Failed to update code ${code} patching status to recalculation erroring`)
-      }
-    }
-    return res.json({ ...data, thesis: await thesisPromise })
-  } else {
-    res.status(422).end()
-  }
-})
-
-router.get('/v2/studyprogrammes/throughput/recalculate', async (req, res) => {
-  const code = req.query.code
-
-  await patchThroughput({ [code]: { status: 'RECALCULATING' } })
-  res.status(200).end()
-
-  try {
-    if (code.includes('MH') || code.includes('KH')) {
-      const data = await throughputStatsForStudytrack(code, 2017)
-      await setThroughput(data)
-    } else {
-      const data = await throughputStatsForStudytrack(code, 2000)
-      await setThroughput(data)
-    }
-  } catch (e) {
-    try {
-      await patchThroughput({ [code]: { status: 'RECALCULATION ERRORED' } })
-    } catch (e) {
-      logger.error(`Failed to update code ${code} patching status to recalculation erroring`)
-      return
-    }
-    logger.error(`Failed to update throughput stats for code: ${code}, reason: ${e.message}`)
-  }
-  logger.info(`Throughput stats recalculation for studyprogramme ${code} done`)
-})
-
-router.get('/v2/studyprogrammes/:id/thesis', async (req, res) => {
-  const { id } = req.params
-  if (id) {
-    const thesis = await findProgrammeTheses(id)
-    res.json(thesis)
-  } else {
-    res.status(422).end()
-  }
-})
-
-router.post('/v2/studyprogrammes/:id/thesis', async (req, res) => {
-  const { id } = req.params
-  const { course, thesisType } = req.body
-  if (id && course && thesisType) {
-    const thesis = await createThesisCourse(id, course, thesisType)
-    res.status(201).json(thesis)
-  } else {
-    res.status(422).end()
-  }
-})
-
-router.delete('/v2/studyprogrammes/:id/thesis/:course', async (req, res) => {
-  const { id, course } = req.params
-  if (id && course) {
-    const deleted = await deleteThesisCourse(id, course)
-    res.status(204).json(deleted)
-  } else {
-    res.status(422).end()
-  }
-})
-
 module.exports = router

services/backend/src/routes/population.js

@@ -274,7 +274,7 @@ router.get('/v3/populationstatisticsbytag', async (req, res) => {
 })
 
 router.get('/v3/populationstatisticsbycourse', async (req, res) => {
-  const { coursecodes, from, to, separate: sep } = req.query
+  const { coursecodes, from, to, separate: sep, unifyCourses } = req.query
   const {
     user: { id, isAdmin, studentsUserCanAccess: allStudentsUserCanAccess },
   } = req
@@ -293,7 +293,13 @@ router.get('/v3/populationstatisticsbycourse', async (req, res) => {
   }
 
   const semesters = ['FALL', 'SPRING']
-  const studentnumbers = await Student.findByCourseAndSemesters(JSON.parse(coursecodes), from, to, separate)
+  const studentnumbers = await Student.findByCourseAndSemesters(
+    JSON.parse(coursecodes),
+    from,
+    to,
+    separate,
+    unifyCourses
+  )
   const result = await Population.optimizedStatisticsOf(
     {
       // Useless, because studentnumbers are already filtered above by from & to.
@@ -381,8 +387,23 @@ router.get('/v3/populationstatistics/studyprogrammes/unfiltered', async (req, re
 
 router.get('/v3/populationstatistics/maxYearsToCreatePopulationFrom', async (req, res) => {
   const { courseCodes } = req.query
-  const maxYearsToCreatePopulationFrom = await CourseService.maxYearsToCreatePopulationFrom(JSON.parse(courseCodes))
-  return res.json(maxYearsToCreatePopulationFrom)
+  const maxYearsToCreatePopulationFromOpen = await CourseService.maxYearsToCreatePopulationFrom(
+    JSON.parse(courseCodes),
+    'openStats'
+  )
+  const maxYearsToCreatePopulationFromUni = await CourseService.maxYearsToCreatePopulationFrom(
+    JSON.parse(courseCodes),
+    'reqularStats'
+  )
+  const maxYearsToCreatePopulationFromBoth = await CourseService.maxYearsToCreatePopulationFrom(
+    JSON.parse(courseCodes),
+    'unifyStats'
+  )
+  return res.json({
+    openCourses: maxYearsToCreatePopulationFromOpen,
+    uniCourses: maxYearsToCreatePopulationFromUni,
+    unifyCourses: maxYearsToCreatePopulationFromBoth,
+  })
 })
 
 module.exports = router

services/backend/src/routes/studyProgramme.js

@@ -32,8 +32,10 @@ router.get('/v2/studyprogrammes/:id/basicstats', async (req, res) => {
       try {
         const result = await getBasicStatsForStudytrack({
           studyprogramme: req.params.id,
-          yearType,
-          specialGroups,
+          settings: {
+            isAcademicYear: yearType === 'ACADEMIC_YEAR',
+            includeAllSpecials: specialGroups === 'SPECIAL_INCLUDED',
+          },
         })
         data = await setBasicStats(result, yearType, specialGroups)
       } catch (e) {
@@ -62,8 +64,10 @@ router.get('/v2/studyprogrammes/:id/creditstats', async (req, res) => {
       try {
         const result = await getCreditStatsForStudytrack({
           studyprogramme: req.params.id,
-          yearType,
-          specialGroups,
+          settings: {
+            isAcademicYear: yearType === 'ACADEMIC_YEAR',
+            includeAllSpecials: specialGroups === 'SPECIAL_INCLUDED',
+          },
         })
         data = await setCreditStats(result, yearType, specialGroups)
       } catch (e) {
@@ -92,8 +96,10 @@ router.get('/v2/studyprogrammes/:id/graduationstats', async (req, res) => {
       try {
         const result = await getGraduationStatsForStudytrack({
           studyprogramme: req.params.id,
-          yearType,
-          specialGroups,
+          settings: {
+            isAcademicYear: yearType === 'ACADEMIC_YEAR',
+            includeAllSpecials: specialGroups === 'SPECIAL_INCLUDED',
+          },
         })
         data = await setGraduationStats(result, yearType, specialGroups)
       } catch (e) {
@@ -120,7 +126,13 @@ router.get('/v2/studyprogrammes/:id/studytrackstats', async (req, res) => {
     }
     if (!data) {
       try {
-        const result = await getStudytrackStatsForStudyprogramme({ studyprogramme: code, specialGroups, graduated })
+        const result = await getStudytrackStatsForStudyprogramme({
+          studyprogramme: code,
+          settings: {
+            graduated: graduated === 'GRADUATED_INCLUDED',
+            specialGroups: specialGroups === 'SPECIAL_INCLUDED',
+          },
+        })
         data = await setStudytrackStats(result, graduated, specialGroups)
       } catch (e) {
         logger.error(`Failed to update code ${code} studytrack stats: ${e}`)

services/backend/src/services/analyticsService.js

@@ -1,8 +1,6 @@
 const { redisClient } = require('../services/redis')
 const moment = require('moment')
 
-const createRedisKeyForProductivity = id => `PRODUCTIVITY_${id}`
-const createRedisKeyForThroughput = id => `THROUGHPUT_${id}`
 const createRedisKeyForBasicStats = (id, yearType, specialGroups) => `BASIC_STATS_${id}_${yearType}_${specialGroups}`
 const createRedisKeyForCreditStats = (id, yearType, specialGroups) => `CREDIT_STATS_${id}_${yearType}_${specialGroups}`
 const createRedisKeyForGraduationStats = (id, yearType, specialGroups) =>
@@ -10,89 +8,6 @@ const createRedisKeyForGraduationStats = (id, yearType, specialGroups) =>
 const createRedisKeyForStudytrackStats = (id, graduated, specialGroups) =>
   `STUDYTRACK_STATS_${id}_${graduated}_${specialGroups}`
 
-const getProductivity = async id => {
-  const redisKey = createRedisKeyForProductivity(id)
-  const dataFromRedis = await redisClient.getAsync(redisKey)
-  if (!dataFromRedis) return null
-  return {
-    [id]: JSON.parse(dataFromRedis),
-  }
-}
-
-const setProductivity = async data => {
-  const { id } = data
-  const redisKey = createRedisKeyForProductivity(id)
-  const dataToRedis = {
-    ...data,
-    status: 'DONE',
-    lastUpdated: moment().format(),
-  }
-  const setOperationStatus = await redisClient.setAsync(redisKey, JSON.stringify(dataToRedis))
-  if (setOperationStatus !== 'OK') return null
-  return {
-    [id]: dataToRedis,
-  }
-}
-
-const patchProductivity = async data => {
-  const { id } = data
-  const redisKey = createRedisKeyForProductivity(id)
-  const dataFromRedis = JSON.parse(await redisClient.getAsync(redisKey))
-  const patchedData = {
-    ...dataFromRedis,
-    ...data,
-    lastUpdated: moment().format(),
-  }
-  const setOperationStatus = await redisClient.setAsync(redisKey, JSON.stringify(patchedData))
-  if (setOperationStatus !== 'OK') return null
-  return {
-    [id]: patchedData,
-  }
-}
-
-const getThroughput = async id => {
-  const redisKey = createRedisKeyForThroughput(id)
-  const dataFromRedis = await redisClient.getAsync(redisKey)
-  if (!dataFromRedis) return null
-  return {
-    [id]: JSON.parse(dataFromRedis),
-  }
-}
-
-const setThroughput = async data => {
-  const { id, data: dataToSet } = data
-  const redisKey = createRedisKeyForThroughput(id)
-  const dataToRedis = {
-    data: dataToSet.years,
-    totals: dataToSet.totals,
-    stTotals: dataToSet.stTotals,
-    status: 'DONE',
-    lastUpdated: moment().format(),
-  }
-  const setOperationStatus = await redisClient.setAsync(redisKey, JSON.stringify(dataToRedis))
-  if (setOperationStatus !== 'OK') return null
-  return {
-    [id]: dataToRedis,
-  }
-}
-
-const patchThroughput = async data => {
-  const [id, dataToPatch] = Object.entries(data)[0]
-  const redisKey = createRedisKeyForThroughput(id)
-  const { status } = dataToPatch
-  const dataFromRedis = JSON.parse(await redisClient.getAsync(redisKey))
-  const patchedData = {
-    ...dataFromRedis,
-    status,
-    lastUpdated: moment().format(),
-  }
-  const setOperationStatus = await redisClient.setAsync(redisKey, JSON.stringify(patchedData))
-  if (setOperationStatus !== 'OK') return null
-  return {
-    [id]: patchedData,
-  }
-}
-
 const getBasicStats = async (id, yearType, specialGroups) => {
   const redisKey = createRedisKeyForBasicStats(id, yearType, specialGroups)
   const dataFromRedis = await redisClient.getAsync(redisKey)
@@ -174,12 +89,6 @@ const setStudytrackStats = async (data, graduated, specialGroups) => {
 }
 
 module.exports = {
-  getProductivity,
-  setProductivity,
-  patchProductivity,
-  getThroughput,
-  setThroughput,
-  patchThroughput,
   getBasicStats,
   setBasicStats,
   getCreditStats,

services/backend/src/services/course_yearly_stats_counter.js

@@ -8,12 +8,23 @@ class CourseYearlyStatsCounter {
   }
 
   initProgramme(code, name) {
-    this.programmes[code] = { name, students: {}, passed: {}, credits: {} }
+    this.programmes[code] = {
+      name,
+      students: {},
+      passed: {},
+      credits: {},
+    }
   }
 
   initFacultyYear(code) {
     const year = `${1949 + Number(code)}-${1950 + Number(code)}`
-    this.facultyStats[code] = { year, allStudents: [], allPassed: [], faculties: {}, allCredits: 0 }
+    this.facultyStats[code] = {
+      year,
+      allStudents: [],
+      allPassed: [],
+      faculties: {},
+      allCredits: 0,
+    }
   }
 
   initFaculty(yearcode, faculty_code, organization) {
@@ -45,6 +56,8 @@ class CourseYearlyStatsCounter {
         },
         studentnumbers: [],
       },
+      enrollments: [],
+      allEnrollments: [],
       yearcode,
     }
   }
@@ -97,6 +110,21 @@ class CourseYearlyStatsCounter {
     })
   }
 
+  markStudyProgrammesEnrollment(studentnumber, programmes, yearcode, state, enrollment_date_time) {
+    programmes.forEach(({ code, name, faculty_code, organization }) => {
+      this.markStudyProgrammeEnrollment(
+        code,
+        name,
+        studentnumber,
+        yearcode,
+        state,
+        enrollment_date_time,
+        faculty_code,
+        organization
+      )
+    })
+  }
+
   markCreditToGroup(studentnumber, passed, grade, groupcode, groupname, coursecode, yearcode) {
     if (!this.groups[groupcode]) {
       this.initGroup(groupcode, groupname, coursecode, yearcode)
@@ -104,6 +132,20 @@ class CourseYearlyStatsCounter {
     this.markCreditToAttempts(studentnumber, passed, grade, groupcode)
   }
 
+  markEnrollmentToGroup(studentnumber, state, enrollment_date_time, groupcode, groupname, coursecode, yearcode) {
+    if (!this.groups[groupcode]) this.initGroup(groupcode, groupname, coursecode, yearcode)
+
+    const enrollment = { studentnumber, state, enrollment_date_time }
+    this.groups[groupcode].allEnrollments.push(enrollment)
+    const oldEnrollment = this.groups[groupcode].enrollments.find(e => e.studentnumber === studentnumber)
+    if (!oldEnrollment) return this.groups[groupcode].enrollments.push({ studentnumber, state, enrollment_date_time })
+    if (oldEnrollment.state === 'ENROLLED' || oldEnrollment.state === 'CONFIRMED') return
+    if (state !== 'ENROLLED' || state !== 'CONFIRMED') return
+    this.groups[groupcode].enrollments = this.groups[groupcode].enrollments
+      .filter(e => e.studentnumber !== studentnumber)
+      .concat([enrollment])
+  }
+
   markCreditToAttempts(studentnumber, passed, grade, groupcode) {
     const { attempts } = this.groups[groupcode]
     const { grades, categories } = attempts

services/backend/src/services/courses.js

@@ -8,12 +8,14 @@ const {
   Studyright,
   Semester,
   Organization,
+  Enrollment,
 } = require('../models')
 
 const { parseCredit } = require('./parseCredits')
 const Op = Sequelize.Op
 const { CourseYearlyStatsCounter } = require('./course_yearly_stats_counter')
 const { sortMainCode, getSortRank } = require('../util/utils')
+const { parseEnrollment } = require('./parseEnrollments')
 
 const byNameOrCode = (searchTerm, language) =>
   Course.findAll({
@@ -59,10 +61,12 @@ const findOneByCode = code => {
   })
 }
 
-const creditsForCourses = async (codes, anonymizationSalt, unifyOpenUniCourses) => {
+const creditsForCourses = async (codes, anonymizationSalt, unification) => {
   let is_open = false
 
-  if (unifyOpenUniCourses) {
+  if (unification === 'open') is_open = true
+
+  if (unification === 'unify') {
     is_open = {
       [Op.in]: [false, true],
     }
@@ -122,6 +126,71 @@ const creditsForCourses = async (codes, anonymizationSalt, unifyOpenUniCourses)
   return parsedCredits
 }
 
+const enrollmentsForCourses = async (codes, anonymizationSalt, unification) => {
+  let is_open = false
+
+  if (unification === 'open') is_open = true
+
+  if (unification === 'unify') {
+    is_open = {
+      [Op.in]: [false, true],
+    }
+  }
+
+  const enrollments = await Enrollment.findAll({
+    include: [
+      {
+        model: Student,
+        attributes: ['studentnumber'],
+        include: {
+          model: StudyrightElement,
+          attributes: ['code', 'startdate'],
+          include: [
+            {
+              model: ElementDetail,
+              attributes: ['name', 'type'],
+              where: {
+                type: {
+                  [Op.eq]: 20,
+                },
+              },
+            },
+            {
+              model: Studyright,
+              attributes: ['prioritycode', 'faculty_code'],
+              where: {
+                prioritycode: {
+                  [Op.eq]: 1,
+                },
+              },
+              include: {
+                model: Organization,
+              },
+            },
+          ],
+        },
+      },
+      {
+        model: Semester,
+        attributes: ['semestercode', 'name', 'yearcode', 'yearname'],
+      },
+    ],
+    where: {
+      course_code: {
+        [Op.in]: codes,
+      },
+      studentnumber: {
+        [Op.ne]: null,
+      },
+      enrollment_date_time: { [Op.gte]: new Date('2021-05-31') },
+      state: ['ENROLLED', 'CONFIRMED', 'REJECTED', 'ABORTED_BY_STUDENT', 'ABORTED_BY_TEACHER'],
+      [Op.or]: [{ is_open }, { is_open: null }],
+    },
+  })
+
+  return enrollments.map(enrollment => parseEnrollment(enrollment, anonymizationSalt))
+}
+
 const bySearchTerm = async (term, language) => {
   const formatCourse = course => ({
     name: course.name[language],
@@ -162,23 +231,20 @@ const allCodeAlternatives = async code => {
   return sortMainCode([...course.substitutions, code])
 }
 
-const yearlyStatsOfNew = async (coursecode, separate, unifyOpenUniCourses, anonymizationSalt) => {
+const yearlyStatsOfNew = async (coursecode, separate, unification, anonymizationSalt) => {
   const courseForSubs = await Course.findOne({
     where: { code: coursecode },
   })
 
   let codes = courseForSubs.substitutions ? sortMainCode([...courseForSubs.substitutions, coursecode]) : [coursecode]
 
-  if (isOpenUniCourseCode(coursecode) && !unifyOpenUniCourses) {
-    codes = [coursecode]
+  if (unification === 'reqular') {
+    codes = codes.filter(course => !isOpenUniCourseCode(course))
   }
 
-  if (!isOpenUniCourseCode(coursecode) && !unifyOpenUniCourses) {
-    codes = codes.filter(code => !code.match(/^[A][0-9]|^AY/))
-  }
-
-  const [credits, course] = await Promise.all([
-    creditsForCourses(codes, anonymizationSalt, unifyOpenUniCourses),
+  const [credits, enrollments, course] = await Promise.all([
+    creditsForCourses(codes, anonymizationSalt, unification),
+    enrollmentsForCourses(codes, anonymizationSalt, unification),
     Course.findOne({
       where: {
         code: coursecode,
@@ -233,7 +299,27 @@ const yearlyStatsOfNew = async (coursecode, separate, unifyOpenUniCourses, anony
     counter.markCreditToGroup(studentnumber, passed, grade, groupcode, groupname, coursecode, yearcode)
     counter.markCreditToStudentCategories(studentnumber, passed, attainment_date, groupcode)
   }
+
+  enrollments.forEach(enrollment => {
+    const { studentnumber, semestercode, semestername, yearcode, yearname, coursecode, state, enrollment_date_time } =
+      enrollment
+
+    const groupcode = separate ? semestercode : yearcode
+    const groupname = separate ? semestername : yearname
+
+    counter.markEnrollmentToGroup(
+      studentnumber,
+      state,
+      enrollment_date_time,
+      groupcode,
+      groupname,
+      coursecode,
+      yearcode
+    )
+  })
+
   const statistics = counter.getFinalStatistics(anonymizationSalt)
+
   return {
     ...statistics,
     coursecode,
@@ -242,7 +328,17 @@ const yearlyStatsOfNew = async (coursecode, separate, unifyOpenUniCourses, anony
   }
 }
 
-const maxYearsToCreatePopulationFrom = async coursecodes => {
+const maxYearsToCreatePopulationFrom = async (coursecodes, unifyCourses) => {
+  let is_open = false
+
+  if (unifyCourses === 'openStats') is_open = true
+
+  if (unifyCourses === 'unifyStats') {
+    is_open = {
+      [Op.in]: [false, true],
+    }
+  }
+
   const maxAttainmentDate = new Date(
     Math.max(
       ...(
@@ -257,6 +353,7 @@ const maxYearsToCreatePopulationFrom = async coursecodes => {
       ).map(c => new Date(c.max_attainment_date).getTime())
     )
   )
+
   const attainmentThreshold = new Date(maxAttainmentDate.getFullYear(), 0, 1)
   attainmentThreshold.setFullYear(attainmentThreshold.getFullYear() - 6)
 
@@ -268,6 +365,7 @@ const maxYearsToCreatePopulationFrom = async coursecodes => {
       attainment_date: {
         [Op.gt]: attainmentThreshold,
       },
+      is_open,
     },
     order: [['attainment_date', 'ASC']],
   })
@@ -291,11 +389,18 @@ const maxYearsToCreatePopulationFrom = async coursecodes => {
   return maxYearsToCreatePopulationFrom
 }
 
-const courseYearlyStats = async (coursecodes, separate, unifyOpenUniCourses, anonymizationSalt) => {
-  const stats = await Promise.all(
-    coursecodes.map(code => yearlyStatsOfNew(code, separate, unifyOpenUniCourses, anonymizationSalt))
+const courseYearlyStats = async (coursecodes, separate, anonymizationSalt) => {
+  const statsReqular = await Promise.all(
+    coursecodes.map(async code => {
+      const unifyStats = await yearlyStatsOfNew(code, separate, 'unify', anonymizationSalt)
+      const reqularStats = await yearlyStatsOfNew(code, separate, 'reqular', anonymizationSalt)
+      const openStats = await yearlyStatsOfNew(code, separate, 'open', anonymizationSalt)
+
+      return { unifyStats, reqularStats, openStats }
+    })
   )
-  return stats
+
+  return statsReqular
 }
 
 const nameLikeTerm = name => {

services/backend/src/services/mailservice.js

@@ -3,7 +3,7 @@ const { isProduction, pateToken } = require('../conf-backend')
 const { ApplicationError } = require('../util/customErrors')
 
 const pateClient = axios.create({
-  baseURL: 'https://pate.toska.cs.helsinki.fi',
+  baseURL: 'https://importer.cs.helsinki.fi/api/pate/',
   params: {
     token: pateToken,
   },

services/backend/src/services/newStudyprogramme.js

@@ -1,402 +0,0 @@
-const sequelize = require('sequelize')
-const { Op } = sequelize
-const {
-  Credit,
-  Course,
-  Organization,
-  Studyright,
-  StudyrightElement,
-  ElementDetail,
-  Transfer,
-  Student,
-  SemesterEnrollment,
-  Semester,
-} = require('../models')
-const { formatStudyright, formatStudent, formatTransfer } = require('./studyprogrammeHelpers')
-const { getCurrentSemester } = require('./semesters')
-
-const whereStudents = studentnumbers => {
-  return studentnumbers ? studentnumbers : { [Op.not]: null }
-}
-
-const sinceDate = since => {
-  return since ? { [Op.gte]: since } : { [Op.not]: null }
-}
-
-const studytrackStudents = async studentnumbers =>
-  (
-    await Student.findAll({
-      where: {
-        studentnumber: {
-          [Op.in]: studentnumbers,
-        },
-      },
-    })
-  ).map(formatStudent)
-
-const enrolledStudents = async (studytrack, since, studentnumbers) => {
-  const currentSemester = await getCurrentSemester()
-
-  const students = await Student.findAll({
-    attributes: ['studentnumber'],
-    include: [
-      {
-        model: Studyright,
-        include: [
-          {
-            model: StudyrightElement,
-            required: true,
-            where: {
-              code: studytrack,
-            },
-          },
-        ],
-        attributes: ['studyrightid'],
-      },
-      {
-        model: SemesterEnrollment,
-        attributes: ['semestercode'],
-        include: [
-          {
-            model: Semester,
-            required: true,
-            where: {
-              semestercode: currentSemester.semestercode,
-            },
-          },
-        ],
-        where: {
-          enrollmenttype: 1,
-        },
-      },
-    ],
-    where: {
-      studentnumber: {
-        [Op.in]: studentnumbers,
-      },
-    },
-  })
-
-  return students.filter(s => s.semester_enrollments?.length)
-}
-
-const absentStudents = async (studytrack, studentnumbers) => {
-  const currentSemester = await getCurrentSemester()
-  const students = await Student.findAll({
-    attributes: ['studentnumber'],
-    include: [
-      {
-        model: Studyright,
-        include: [
-          {
-            model: StudyrightElement,
-            required: true,
-            where: {
-              code: studytrack,
-            },
-          },
-        ],
-        attributes: ['studyrightid'],
-      },
-      {
-        model: SemesterEnrollment,
-        attributes: ['semestercode'],
-        where: {
-          enrollmenttype: 2,
-          semestercode: currentSemester.semestercode,
-        },
-      },
-    ],
-    where: {
-      studentnumber: {
-        [Op.in]: studentnumbers,
-      },
-    },
-  })
-
-  return students
-}
-
-const allStudyrights = async (studytrack, since, studentnumbers) =>
-  (
-    await Studyright.findAll({
-      include: [
-        {
-          model: StudyrightElement,
-          required: true,
-          include: {
-            model: ElementDetail,
-            required: true,
-            where: {
-              code: studytrack,
-            },
-          },
-        },
-        {
-          model: Student,
-          attributes: ['studentnumber'],
-          required: true,
-        },
-      ],
-      where: {
-        student_studentnumber: whereStudents(studentnumbers),
-      },
-    })
-  ).map(formatStudyright)
-
-const startedStudyrights = async (studytrack, since, studentnumbers) =>
-  (
-    await Studyright.findAll({
-      include: [
-        {
-          model: StudyrightElement,
-          required: true,
-          include: {
-            model: ElementDetail,
-            required: true,
-            where: {
-              code: studytrack,
-            },
-          },
-        },
-        {
-          model: Student,
-          attributes: ['studentnumber'],
-          required: true,
-        },
-      ],
-      where: {
-        studystartdate: {
-          [Op.gte]: since,
-        },
-        student_studentnumber: whereStudents(studentnumbers),
-      },
-    })
-  ).map(formatStudyright)
-
-const graduatedStudyRights = async (studytrack, since, studentnumbers) =>
-  (
-    await Studyright.findAll({
-      include: [
-        {
-          model: StudyrightElement,
-          required: true,
-          include: {
-            model: ElementDetail,
-            required: true,
-            where: {
-              code: studytrack,
-            },
-          },
-        },
-        {
-          model: Student,
-          attributes: ['studentnumber'],
-          required: true,
-        },
-      ],
-      where: {
-        graduated: 1,
-        enddate: sinceDate(since),
-        student_studentnumber: whereStudents(studentnumbers),
-      },
-    })
-  ).map(formatStudyright)
-
-const followingStudyrights = async (since, studentnumbers) =>
-  (
-    await Studyright.findAll({
-      include: [
-        {
-          model: StudyrightElement,
-          required: true,
-          include: [
-            {
-              model: ElementDetail,
-              attributes: ['name'],
-            },
-          ],
-          attributes: ['code'],
-        },
-        {
-          model: Student,
-          attributes: ['studentnumber'],
-          required: true,
-        },
-      ],
-      where: {
-        studystartdate: {
-          [Op.gte]: since,
-        },
-        extentcode: 2,
-        student_studentnumber: whereStudents(studentnumbers),
-      },
-    })
-  ).map(formatStudyright)
-
-const transfersAway = async (studytrack, since) =>
-  (
-    await Transfer.findAll({
-      where: {
-        transferdate: {
-          [Op.gte]: since,
-        },
-        sourcecode: studytrack,
-      },
-      distinct: true,
-      col: 'studentnumber',
-    })
-  ).map(formatTransfer)
-
-const transfersTo = async (studytrack, since) =>
-  (
-    await Transfer.findAll({
-      where: {
-        transferdate: {
-          [Op.gte]: since,
-        },
-        targetcode: studytrack,
-      },
-      distinct: true,
-      col: 'studentnumber',
-    })
-  ).map(formatTransfer)
-
-const allTransfers = async (studytrack, since) => {
-  const transferredTo = await transfersTo(studytrack, since)
-  const transferredAway = await transfersAway(studytrack, since)
-  return [...transferredTo, ...transferredAway]
-}
-
-const getProgrammesStudyrights = async studyprogramme =>
-  (
-    await Studyright.findAll({
-      attributes: ['studyrightid', 'studystartdate', 'enddate', 'graduated', 'prioritycode', 'extentcode'],
-      include: [
-        {
-          model: StudyrightElement,
-          required: true,
-          where: {
-            code: {
-              [Op.in]: [studyprogramme],
-            },
-          },
-        },
-        {
-          model: Student,
-          attributes: ['studentnumber'],
-          required: true,
-        },
-      ],
-    })
-  ).map(formatStudyright)
-
-const getCreditsForStudyProgramme = async (provider, since) =>
-  await Credit.findAll({
-    attributes: ['id', 'course_code', 'credits', 'attainment_date', 'student_studentnumber'],
-    include: {
-      model: Course,
-      attributes: ['code'],
-      required: true,
-      where: {
-        is_study_module: false,
-      },
-      include: {
-        model: Organization,
-        required: true,
-        where: {
-          code: provider,
-        },
-      },
-    },
-    where: {
-      credittypecode: {
-        [Op.notIn]: [10, 9, 7],
-      },
-      isStudyModule: {
-        [Op.not]: true,
-      },
-      attainment_date: {
-        [Op.gte]: since,
-      },
-    },
-  })
-
-const getTransferredCredits = async (provider, since) =>
-  await Credit.findAll({
-    attributes: ['id', 'course_code', 'credits', 'attainment_date'],
-    include: {
-      model: Course,
-      attributes: ['code'],
-      required: true,
-      include: {
-        model: Organization,
-        required: true,
-        where: {
-          code: provider,
-        },
-      },
-    },
-    where: {
-      credittypecode: {
-        [Op.eq]: [9],
-      },
-      isStudyModule: {
-        [Op.not]: true,
-      },
-      attainment_date: {
-        [Op.gte]: since,
-      },
-    },
-  })
-
-const getThesisCredits = async (provider, since, thesisType, studentnumbers) =>
-  await Credit.findAll({
-    attributes: ['id', 'course_code', 'credits', 'attainment_date', 'student_studentnumber'],
-    include: {
-      model: Course,
-      attributes: ['code'],
-      required: true,
-      where: {
-        course_unit_type: {
-          [Op.in]: thesisType,
-        },
-      },
-      include: {
-        model: Organization,
-        required: true,
-        where: {
-          code: provider,
-        },
-      },
-    },
-    where: {
-      credittypecode: {
-        [Op.notIn]: [10, 9, 7],
-      },
-      isStudyModule: {
-        [Op.not]: true,
-      },
-      attainment_date: {
-        [Op.gte]: since,
-      },
-      student_studentnumber: whereStudents(studentnumbers),
-    },
-  })
-
-module.exports = {
-  studytrackStudents,
-  enrolledStudents,
-  absentStudents,
-  allStudyrights,
-  startedStudyrights,
-  graduatedStudyRights,
-  followingStudyrights,
-  transfersAway,
-  transfersTo,
-  allTransfers,
-  getProgrammesStudyrights,
-  getCreditsForStudyProgramme,
-  getTransferredCredits,
-  getThesisCredits,
-}

services/backend/src/services/parseCredits.js

@@ -65,4 +65,4 @@ const parseCredit = (credit, anonymizationSalt) => {
   }
 }
 
-module.exports = { parseCredit }
+module.exports = { parseCredit, formatStudyrightElement }

services/backend/src/services/parseEnrollments.js

@@ -0,0 +1,48 @@
+const crypto = require('crypto')
+const { formatStudyrightElement } = require('./parseCredits')
+
+const parseEnrollment = (enrollment, anonymizationSalt) => {
+  const { student, semester, state, enrollment_date_time, course_code } = enrollment
+  const { studentnumber, studyright_elements } = student
+  const { yearcode, yearname, semestercode, name: semestername } = semester
+
+  if (anonymizationSalt) {
+    const anonymizedStudentNumber = crypto
+      .createHash('sha256')
+      .update(`${studentnumber}${anonymizationSalt}`)
+      .digest('hex')
+
+    const anonymizedStudent = {
+      studentnumber: anonymizedStudentNumber,
+    }
+
+    return {
+      obfuscated: true,
+      student: anonymizedStudent,
+      yearcode,
+      yearname,
+      semestercode,
+      semestername,
+      coursecode: course_code,
+      state,
+      enrollment_date_time,
+      studentnumber: anonymizedStudentNumber,
+      programmes: studyright_elements.map(formatStudyrightElement),
+    }
+  }
+
+  return {
+    student,
+    yearcode,
+    yearname,
+    semestercode,
+    semestername,
+    coursecode: course_code,
+    state,
+    enrollment_date_time,
+    studentnumber,
+    programmes: studyright_elements.map(formatStudyrightElement),
+  }
+}
+
+module.exports = { parseEnrollment }

services/backend/src/services/populations.js

@@ -2,6 +2,7 @@ const { Op } = require('sequelize')
 const moment = require('moment')
 const { sortBy } = require('lodash')
 const { sortMainCode } = require('../util/utils')
+const { getCurrentSemester } = require('../services/semesters')
 
 const {
   Student,
@@ -10,6 +11,7 @@ const {
   Studyright,
   StudyrightExtent,
   ElementDetail,
+  Studyplan,
   CourseType,
   SemesterEnrollment,
   Semester,
@@ -47,6 +49,7 @@ const formatStudentForPopulationStatistics = (
     abbreviatedname,
     email,
     studyrights,
+    studyplans,
     semester_enrollments,
     transfers,
     updatedAt,
@@ -105,6 +108,7 @@ const formatStudentForPopulationStatistics = (
     starting: moment(started).isBetween(startDateMoment, endDateMoment, null, '[]'),
     option,
     birthdate,
+    studyplans,
   }
 }
 
@@ -250,6 +254,11 @@ const getStudentsIncludeCoursesBetween = async (studentnumbers, startDate, endDa
             },
           },
         },
+        {
+          model: Studyplan,
+          attributes: ['included_courses', 'programme_code'],
+          separate: true,
+        },
       ],
       where: {
         studentnumber: {
@@ -405,7 +414,7 @@ const studentnumbersWithAllStudyrightElements = async (
   }
 
   const students = await Studyright.findAll({
-    attributes: ['student_studentnumber', 'graduated'],
+    attributes: ['student_studentnumber', 'graduated', 'enddate'],
     include: {
       model: StudyrightElement,
       attributes: [],
@@ -446,7 +455,45 @@ const studentnumbersWithAllStudyrightElements = async (
     raw: true,
   })
 
-  const studentnumbers = [...new Set(students.map(s => s.student_studentnumber))]
+  let studentnumbers = [...new Set(students.map(s => s.student_studentnumber))]
+
+  // Oodi canceldates don't match SIS studyright statuses, so
+  // - filter out all students who haven't enrolled for semester
+  // - filter out all students who have enrolled for both semesters but whose studyright has ended
+  // - don't use above filtering to graduated students
+  // eslint-disable-next-line no-constant-condition
+  if (false && !cancelledStudents) {
+    const { semestercode } = await getCurrentSemester()
+
+    const enrolments = await SemesterEnrollment.findAll({
+      where: {
+        studentnumber: {
+          [Op.in]: studentnumbers,
+        },
+        semestercode,
+        enrollment_date: {
+          [Op.not]: null,
+        },
+        enrollmenttype: {
+          [Op.not]: 3,
+        },
+      },
+    })
+
+    const studentsByStudentnumber = students.reduce((res, curr) => {
+      res[curr.student_studentnumber] = curr
+      return res
+    }, {})
+
+    const today = new Date()
+    const graduated = [...new Set(students.filter(s => s.graduated).map(s => s.student_studentnumber))]
+
+    const enrolledStudentnumbers = enrolments
+      .map(e => e.studentnumber)
+      .filter(s => new Date(studentsByStudentnumber[s].enddate) >= today)
+
+    studentnumbers = [...new Set(graduated.concat(enrolledStudentnumbers))]
+  }
 
   // bit hacky solution, but this is used to filter out studentnumbers who have since changed studytracks
   const rights = await Studyright.findAll({
@@ -493,13 +540,17 @@ const studentnumbersWithAllStudyrightElements = async (
     return acc
   }, {})
 
+  // Take the newest studytrack primarily by latest starting date in the track, secondarily by the latest enddate
   const filteredStudentnumbers = studentnumbers.filter(studentnumber => {
-    const newestStudytrack = sortBy(formattedStudytracks[studentnumber], ['enddate', 'startdate']).reverse()[0]
+    const newestStudytrack = sortBy(formattedStudytracks[studentnumber], ['startdate', 'enddate']).reverse()[0]
     if (!newestStudytrack) return false
     return studyRights.includes(newestStudytrack.code)
   })
 
-  let studentnumberlist = filteredStudentnumbers.length > 0 ? filteredStudentnumbers : studentnumbers
+  // Use the filtered list, if the search includes studytracks
+  // Then the studyrights length is > 1, which means that there is [studyright, studytrack].
+  // When searching only for studyprogramme, there is [studyright]
+  let studentnumberlist = studyRights.length > 1 ? filteredStudentnumbers : studentnumbers
 
   // fetch students that have transferred out of the programme and filter out these studentnumbers
   if (!transferredOutStudents) {
@@ -856,6 +907,7 @@ const optimizedStatisticsOf = async (query, studentnumberlist) => {
     formattedQueryParams,
     optionData
   )
+
   return formattedStudents
 }
 

services/backend/src/services/semesters.js

@@ -1,3 +1,4 @@
+const moment = require('moment')
 const sequelize = require('sequelize')
 const { Semester } = require('../models')
 const Op = sequelize.Op
@@ -28,8 +29,8 @@ const getSemestersAndYears = async () => {
         acc.years[yearcode] = {
           yearcode,
           yearname,
-          startdate: Math.min(acc.years[yearcode].startdate, startdate),
-          enddate: Math.max(acc.years[yearcode].enddate, enddate),
+          startdate: moment.min(moment(acc.years[yearcode].startdate), moment(startdate)),
+          enddate: moment.max(moment(acc.years[yearcode].enddate), moment(enddate)),
         }
       }
       return acc

services/backend/src/services/students.js

@@ -99,28 +99,44 @@ const byId = async id => {
   return student
 }
 
-const findByCourseAndSemesters = async (coursecodes, from, to, separate) =>
+const getUnifyStatus = unifyCourses => {
+  switch (unifyCourses) {
+    case 'unifyStats':
+      return [true, false]
+
+    case 'openStats':
+      return [true]
+
+    case 'reqularStats':
+      return [false]
+
+    default:
+      return [true, false]
+  }
+}
+
+const findByCourseAndSemesters = async (coursecodes, from, to, separate, unifyCourses = 'unifyStats') =>
   (
     await sequelize.query(
       `
-  SELECT
-    studentnumber
-  FROM student
-  INNER JOIN credit ON
-    student.studentnumber=credit.student_studentnumber
+    SELECT
+      studentnumber
+      FROM student
+      INNER JOIN credit ON
+      student.studentnumber=credit.student_studentnumber
   WHERE
-    course_code IN (:coursecodes) AND
-    attainment_date
+  course_code IN (:coursecodes) AND
+  attainment_date
   BETWEEN
-    (select startdate FROM semesters where ${
-      separate ? 'semestercode' : 'yearcode'
-    }=:minYearCode ORDER BY semestercode LIMIT 1) AND
-    (select enddate FROM semesters where ${
-      separate ? 'semestercode' : 'yearcode'
-    }=:maxYearCode ORDER BY semestercode DESC LIMIT 1);
-`,
+  (select startdate FROM semesters where ${
+    separate ? 'semestercode' : 'yearcode'
+  }=:minYearCode ORDER BY semestercode LIMIT 1) AND
+  (select enddate FROM semesters where ${separate ? 'semestercode' : 'yearcode'}=:maxYearCode AND 
+  is_open IN (:isOpen)
+  ORDER BY semestercode DESC LIMIT 1);
+  `,
       {
-        replacements: { coursecodes, minYearCode: from, maxYearCode: to },
+        replacements: { coursecodes, minYearCode: from, maxYearCode: to, isOpen: getUnifyStatus(unifyCourses) },
         type: sequelize.QueryTypes.SELECT,
         raw: true,
       }

services/backend/src/services/studyprogrammeBasics.js

@@ -7,36 +7,9 @@ const {
   getStartDate,
   tableTitles,
 } = require('./studyprogrammeHelpers')
-const {
-  allStudyrights,
-  graduatedStudyRights,
-  startedStudyrights,
-  transfersAway,
-  transfersTo,
-} = require('./newStudyprogramme')
+const { graduatedStudyRights, startedStudyrights, transfersAway, transfersTo } = require('./studyprogramme')
 const { getYearStartAndEndDates } = require('../util/semester')
 
-const getAllStats = async ({ studyprogramme, years, isAcademicYear, includeAllSpecials }) => {
-  const { graphStats, tableStats } = getStatsBasis(years)
-
-  await Promise.all(
-    years.map(async year => {
-      const { startDate, endDate } = getYearStartAndEndDates(year, isAcademicYear)
-      const studentnumbersOfTheYear = await getCorrectStudentnumbers({
-        codes: [studyprogramme],
-        startDate,
-        endDate,
-        includeAllSpecials,
-      })
-      const all = await allStudyrights(studyprogramme, null, studentnumbersOfTheYear)
-
-      graphStats[indexOf(years, year)] = all.length
-      tableStats[year] += all.length
-    })
-  )
-  return { graphStats, tableStats }
-}
-
 const getStartedStats = async ({ studyprogramme, since, years, isAcademicYear, includeAllSpecials }) => {
   const { graphStats, tableStats } = getStatsBasis(years)
 
@@ -85,21 +58,6 @@ const getGraduatedStats = async ({ studyprogramme, since, years, isAcademicYear,
   return { graphStats, tableStats }
 }
 
-const getCancelledStats = async ({ studyprogramme, years, isAcademicYear }) => {
-  const studyrights = await allStudyrights(studyprogramme)
-  const { graphStats, tableStats } = getStatsBasis(years)
-
-  studyrights.forEach(({ canceldate }) => {
-    if (canceldate !== null && canceldate !== undefined) {
-      const cancelYear = defineYear(canceldate, isAcademicYear)
-      graphStats[indexOf(years, cancelYear)] += 1
-      tableStats[cancelYear] += 1
-    }
-  })
-
-  return { graphStats, tableStats }
-}
-
 const getTransferredAwayStats = async ({ studyprogramme, since, years, isAcademicYear }) => {
   const studyrights = await transfersAway(studyprogramme, since)
   const { graphStats, tableStats } = getStatsBasis(years)
@@ -126,34 +84,29 @@ const getTransferredToStats = async ({ studyprogramme, since, years, isAcademicY
   return { graphStats, tableStats }
 }
 
-const getBasicStatsForStudytrack = async ({ studyprogramme, yearType, specialGroups }) => {
-  const isAcademicYear = yearType === 'ACADEMIC_YEAR'
-  const includeAllSpecials = specialGroups === 'SPECIAL_INCLUDED'
+const getBasicStatsForStudytrack = async ({ studyprogramme, settings }) => {
+  const { includeAllSpecials, isAcademicYear } = settings
   const since = getStartDate(studyprogramme, isAcademicYear)
   const years = getYearsArray(since.getFullYear(), isAcademicYear)
 
   const queryParameters = { studyprogramme, since, years, isAcademicYear, includeAllSpecials }
-  const all = await getAllStats(queryParameters)
   const started = await getStartedStats(queryParameters)
   const graduated = await getGraduatedStats(queryParameters)
-  const cancelled = await getCancelledStats(queryParameters)
   const transferredAway = await getTransferredAwayStats(queryParameters)
   const transferredTo = await getTransferredToStats(queryParameters)
 
   const reversedYears = getYearsArray(since.getFullYear(), isAcademicYear).reverse()
-  const titles = tableTitles['basics'][specialGroups]
+  const titles = tableTitles['basics'][includeAllSpecials ? 'SPECIAL_INCLUDED' : 'SPECIAL_EXCLUDED']
   const tableStats = reversedYears.map(year =>
     includeAllSpecials
       ? [
           year,
-          all.tableStats[year],
           started.tableStats[year],
           graduated.tableStats[year],
-          cancelled.tableStats[year],
           transferredAway.tableStats[year],
           transferredTo.tableStats[year],
         ]
-      : [year, all.tableStats[year], started.tableStats[year], graduated.tableStats[year]]
+      : [year, started.tableStats[year], graduated.tableStats[year]]
   )
 
   return {
@@ -169,10 +122,6 @@ const getBasicStatsForStudytrack = async ({ studyprogramme, yearType, specialGro
             name: 'Graduated',
             data: graduated.graphStats,
           },
-          {
-            name: 'Cancelled',
-            data: cancelled.graphStats,
-          },
           {
             name: 'Transferred away',
             data: transferredAway.graphStats,

services/backend/src/services/studyprogrammeCredits.js

@@ -15,7 +15,7 @@ const {
   getCreditsForStudyProgramme,
   getTransferredCredits,
   allTransfers,
-} = require('./newStudyprogramme')
+} = require('./studyprogramme')
 
 // Fetches all the credits for the studyprogramme and divides them into major-students and non-major students credits
 // Division is done on the basis that whether the student had a primary studyright to the programme on the attainment_date
@@ -69,9 +69,10 @@ const getTransferredCreditStats = async ({ studyprogramme, since, years, isAcade
   return { graphStats, tableStats }
 }
 
-const getCreditStatsForStudytrack = async ({ studyprogramme, yearType, specialGroups }) => {
-  const isAcademicYear = yearType === 'ACADEMIC_YEAR'
-  const includeAllSpecials = specialGroups === 'SPECIAL_INCLUDED'
+// Fetches all credits for the studytrack and combines them into the statistics for the table
+// and graph in the studyprogramme overview
+const getCreditStatsForStudytrack = async ({ studyprogramme, settings }) => {
+  const { isAcademicYear, includeAllSpecials } = settings
   const since = getStartDate(studyprogramme, isAcademicYear)
   const years = getYearsArray(since.getFullYear(), isAcademicYear)
 
@@ -80,7 +81,7 @@ const getCreditStatsForStudytrack = async ({ studyprogramme, yearType, specialGr
   const transferred = await getTransferredCreditStats(queryParameters)
 
   const reversedYears = getYearsArray(since.getFullYear(), isAcademicYear).reverse()
-  const titles = tableTitles['credits'][specialGroups]
+  const titles = tableTitles['credits'][includeAllSpecials ? 'SPECIAL_INCLUDED' : 'SPECIAL_EXCLUDED']
 
   const tableStats = reversedYears.map(year =>
     includeAllSpecials

services/backend/src/services/studyprogrammeGraduations.js

@@ -16,12 +16,14 @@ const {
 } = require('./studyprogrammeHelpers')
 const {
   graduatedStudyRights,
-  transfersAway,
-  transfersTo,
   getThesisCredits,
   followingStudyrights,
-} = require('./newStudyprogramme')
+  previousStudyrights,
+  allStudyrights,
+  allTransfers,
+} = require('./studyprogramme')
 const { getYearStartAndEndDates } = require('../util/semester')
+const { getAllProgrammes } = require('./studyrights')
 
 const getGraduatedStats = async ({ studyprogramme, since, years, isAcademicYear, includeAllSpecials }) => {
   const { graphStats, tableStats } = getStatsBasis(years)
@@ -76,9 +78,9 @@ const getThesisStats = async ({ studyprogramme, since, years, isAcademicYear, in
 }
 
 const getGraduationTimeStats = async ({ studyprogramme, since, years, isAcademicYear, includeAllSpecials }) => {
-  let graduationAmounts = getYearsObject(years)
-  let graduationTimes = getYearsObject(years, true)
-  let totalAmounts = isAcademicYear ? getAcademicYearsObject(years) : getYearsObject(years)
+  let graduationAmounts = getYearsObject({ years })
+  let graduationTimes = getYearsObject({ years, emptyArrays: true })
+  let totalAmounts = isAcademicYear ? getAcademicYearsObject({ years }) : getYearsObject({ years })
 
   await Promise.all(
     years.map(async year => {
@@ -104,8 +106,8 @@ const getGraduationTimeStats = async ({ studyprogramme, since, years, isAcademic
   // The maximum amount of months in the graph depends on the studyprogramme intended graduation time
   const comparisonValue = studyprogramme.includes('KH') ? 72 : 48
 
-  const medians = getYearsObject(years, true)
-  const means = getYearsObject(years, true)
+  const medians = getYearsObject({ years, emptyArrays: true })
+  const means = getYearsObject({ years, emptyArrays: true })
 
   // HighCharts graph require the data to have this format (ie. actual value, "empty value")
   years.forEach(year => {
@@ -123,43 +125,101 @@ const getGraduationTimeStats = async ({ studyprogramme, since, years, isAcademic
   return { medians, means, graduationAmounts, totalAmounts }
 }
 
-const getProgrammesAfterGraduation = async ({ studyprogramme, since, years, isAcademicYear, includeAllSpecials }) => {
-  const graduated = await graduatedStudyRights(studyprogramme, since)
-  const graduatedStudents = graduated.map(s => s.studentnumber)
-  let studyrightsAfterThisProgramme = await followingStudyrights(since, graduatedStudents)
-  const studyprogrammeCodes = uniqBy(studyrightsAfterThisProgramme, 'code').map(s => ({ code: s.code, name: s.name }))
-
-  const stats = {}
-  studyprogrammeCodes.forEach(c => (stats[c.code] = { ...c, ...getYearsObject(years) }))
-
-  if (!includeAllSpecials) {
-    const transferredAway = await transfersAway(studyprogramme, since)
-    const transferredTo = await transfersTo(studyprogramme, since)
-    const transfers = [...transferredAway, ...transferredTo].map(s => s.studyrightid)
-    studyrightsAfterThisProgramme.filter(s => !transfers.includes(s.studyrightid) && !s.canceldate)
-  }
-
-  studyrightsAfterThisProgramme.forEach(({ studystartdate, code }) => {
-    const startYear = defineYear(studystartdate, isAcademicYear)
-    if (years.includes(startYear) && code) {
-      stats[code][startYear] += 1
-    }
-  })
+// Creates (studyrightid, transfer)-map out of programmes transfers
+const getTransferStudyrightMap = async (studyprogramme, since) => {
+  const transfers = await allTransfers(studyprogramme, since)
+  const studyrightTransferMap = new Map()
+  transfers.forEach(t => studyrightTransferMap.set(t.studyrightid, t))
+  return studyrightTransferMap
+}
 
+const formatStats = (stats, years) => {
   const tableStats = Object.values(stats)
+    .filter(p => years.map(year => p[year]).find(started => started !== 0)) // Filter out programmes with no-one started between the selected years
     .map(p => [p.code, p.name['fi'], ...years.map(year => p[year])])
-    .filter(p => p[0].includes('MH'))
 
   const graphStats = Object.values(stats)
+    .filter(p => years.map(year => p[year]).find(started => started !== 0)) // Filter out programmes with no-one started between the selected years
     .map(p => ({ name: p.name['fi'], code: p.code, data: years.map(year => p[year]) }))
-    .filter(p => p.code.includes('MH'))
 
   return { tableStats, graphStats }
 }
 
-const getGraduationStatsForStudytrack = async ({ studyprogramme, yearType, specialGroups }) => {
-  const isAcademicYear = yearType === 'ACADEMIC_YEAR'
-  const includeAllSpecials = specialGroups === 'SPECIAL_INCLUDED'
+const getProgrammesBeforeStarting = async ({ studyprogramme, since, years, isAcademicYear, includeAllSpecials }) => {
+  const all = await allStudyrights(studyprogramme)
+  const allStudents = all.map(s => s.studentnumber)
+
+  // Get studyrights for bachelor studyprogrammes. This excludes studytracks.
+  const programmes = await getAllProgrammes()
+  let studyrightsBeforeMasters = await previousStudyrights(programmes, allStudents)
+  const studyprogrammeCodes = uniqBy(studyrightsBeforeMasters, 'code').map(s => ({ code: s.code, name: s.name }))
+  const stats = {}
+  studyprogrammeCodes.forEach(c => (stats[c.code] = { ...c, ...getYearsObject({ years }) }))
+
+  // Map transfers to the Master's programme
+  const transfers = await getTransferStudyrightMap(studyprogramme, since)
+
+  studyrightsBeforeMasters.forEach(({ studentnumber, code, givendate }) => {
+    const masterStudyright = all.find(s => s.studentnumber === studentnumber)
+    const transfer = transfers.get(masterStudyright.studyrightid)
+
+    // If special studyrights are excluded, transfers to the master's programme should be excluded
+    if (!includeAllSpecials && transfers.get(masterStudyright.studyrightid)) {
+      return
+    }
+
+    // If all studyrights are included, and transfer exists, define the start year in the programme, based on when the student transferred to it
+    // Otherwise, the year is defined based on when the student started in the chosen master's programme
+    const programmeStartDate = includeAllSpecials && transfer ? transfer.transferdate : masterStudyright?.studystartdate
+    const startYear = defineYear(programmeStartDate, isAcademicYear)
+
+    // The master studyright should have been given on the same date as the bachelor's
+    if (years.includes(startYear) && code && masterStudyright.givendate.getTime() === givendate.getTime()) {
+      stats[code][startYear] += 1
+    }
+  })
+
+  const graphAndTableStats = formatStats(stats, years)
+  return graphAndTableStats
+}
+
+const getProgrammesAfterGraduation = async ({ studyprogramme, since, years, isAcademicYear, includeAllSpecials }) => {
+  const graduated = await graduatedStudyRights(studyprogramme, since)
+  const graduatedStudents = graduated.map(s => s.studentnumber)
+
+  // Get studyrights for masters studyprogramme. This excludes studytracks.
+  const programmes = await getAllProgrammes()
+  let studyrightsAfterThisProgramme = await followingStudyrights(since, programmes, graduatedStudents)
+  const studyprogrammeCodes = uniqBy(studyrightsAfterThisProgramme, 'code').map(s => ({ code: s.code, name: s.name }))
+  const stats = {}
+  studyprogrammeCodes.forEach(c => (stats[c.code] = { ...c, ...getYearsObject({ years }) }))
+
+  const transfers = await getTransferStudyrightMap(studyprogramme, since)
+
+  studyrightsAfterThisProgramme.forEach(({ studentnumber, studystartdate, code, givendate }) => {
+    const bachelorStudyright = graduated.find(s => s.studentnumber === studentnumber)
+
+    // If special studyrights are excluded, transfers to the bachelor programme should be excluded
+    if (!includeAllSpecials && transfers.get(bachelorStudyright.studyrightid)) {
+      return
+    }
+
+    // If all studyrights are included, and transfer exists, define the start year in the programme, based on when the student transferred to it
+    // Otherwise, the year is defined based on when the student started in the chosen master's programme
+    const startYear = defineYear(studystartdate, isAcademicYear)
+
+    // The master studyright should have been given on the same date as the bachelor's
+    if (years.includes(startYear) && code && bachelorStudyright.givendate.getTime() === givendate.getTime()) {
+      stats[code][startYear] += 1
+    }
+  })
+
+  const graphAndTableStats = formatStats(stats, years)
+  return graphAndTableStats
+}
+
+const getGraduationStatsForStudytrack = async ({ studyprogramme, settings }) => {
+  const { isAcademicYear, includeAllSpecials } = settings
   const since = getStartDate(studyprogramme, isAcademicYear)
   const years = getYearsArray(since.getFullYear(), isAcademicYear)
 
@@ -167,12 +227,14 @@ const getGraduationStatsForStudytrack = async ({ studyprogramme, yearType, speci
   const thesis = await getThesisStats(queryParameters)
   const graduated = await getGraduatedStats(queryParameters)
   const graduationTimeStats = await getGraduationTimeStats(queryParameters)
-  const programmesAfterGraduation = await getProgrammesAfterGraduation(queryParameters)
+  const programmesBeforeOrAfter = studyprogramme.includes('KH')
+    ? await getProgrammesAfterGraduation(queryParameters)
+    : await getProgrammesBeforeStarting(queryParameters)
 
   const reversedYears = getYearsArray(since.getFullYear(), isAcademicYear).reverse()
 
   const titles = ['', 'Graduated', 'Wrote thesis']
-  const programmesAfterTitles = ['Code', 'Programme', ...years]
+  const programmesBeforeOrAfterTitles = ['Code', 'Programme', ...years]
   const tableStats = reversedYears.map(year => [year, graduated.tableStats[year], thesis.tableStats[year]])
 
   return {
@@ -194,9 +256,9 @@ const getGraduationStatsForStudytrack = async ({ studyprogramme, yearType, speci
     graduationMeanTime: graduationTimeStats.means,
     graduationAmounts: graduationTimeStats.graduationAmounts,
     totalAmounts: graduationTimeStats.totalAmounts,
-    programmesAfterTableStats: programmesAfterGraduation.tableStats,
-    programmesAfterGraphStats: programmesAfterGraduation.graphStats,
-    programmesAfterTitles,
+    programmesBeforeOrAfterTableStats: programmesBeforeOrAfter.tableStats,
+    programmesBeforeOrAfterGraphStats: programmesBeforeOrAfter.graphStats,
+    programmesBeforeOrAfterTitles,
   }
 }
 

services/backend/src/services/studyprogrammeHelpers.js

@@ -6,7 +6,7 @@ const { studentnumbersWithAllStudyrightElements } = require('./populations')
 const getCorrectStudentnumbers = async ({ codes, startDate, endDate, includeAllSpecials, includeGraduated = true }) => {
   let studentnumbers = []
   const exchangeStudents = includeAllSpecials
-  const cancelledStudents = includeAllSpecials
+  const cancelledStudents = true
   const nondegreeStudents = includeAllSpecials
   const transferredOutStudents = includeAllSpecials
   const transferredToStudents = !includeAllSpecials
@@ -28,13 +28,22 @@ const getCorrectStudentnumbers = async ({ codes, startDate, endDate, includeAllS
   return studentnumbers
 }
 
+const defineStartDate = (studyright_elements, studystartdate) => {
+  if (studyright_elements?.length && studyright_elements[0].startdate > studystartdate) {
+    return studyright_elements[0].startdate
+  }
+  return studystartdate
+}
+
 const formatStudyright = studyright => {
   const {
     studyrightid,
     studystartdate,
     enddate,
+    givendate,
     canceldate,
     graduated,
+    active,
     prioritycode,
     extentcode,
     student,
@@ -43,10 +52,12 @@ const formatStudyright = studyright => {
 
   return {
     studyrightid,
-    studystartdate,
+    studystartdate: defineStartDate(studyright_elements, studystartdate),
     enddate,
+    givendate,
     canceldate,
     graduated,
+    active,
     prioritycode,
     extentcode,
     studentnumber: student.studentnumber,
@@ -69,17 +80,19 @@ const formatStudent = student => {
 }
 
 const formatTransfer = transfer => {
-  const { sourcecode, transfercode, transferdate, studyrightid } = transfer
+  const { sourcecode, targetcode, transferdate, studyrightid } = transfer
   return {
     sourcecode,
-    transfercode,
+    targetcode,
     transferdate,
     studyrightid,
   }
 }
 
-const getYearsArray = (since, isAcademicYear) => {
+const getYearsArray = (since, isAcademicYear, yearsCombined) => {
   const years = []
+  const allYears = 'Total'
+  if (yearsCombined) years.push(allYears)
   for (let i = since; i <= new Date().getFullYear(); i++) {
     const year = isAcademicYear ? `${i} - ${i + 1}` : i
     years.push(year)
@@ -87,7 +100,7 @@ const getYearsArray = (since, isAcademicYear) => {
   return years
 }
 
-const getYearsObject = (years, emptyArrays = false) => {
+const getYearsObject = ({ years, emptyArrays = false }) => {
   let yearsObject = {}
   for (const year of years) {
     yearsObject = { ...yearsObject, [year]: emptyArrays ? [] : 0 }
@@ -95,7 +108,7 @@ const getYearsObject = (years, emptyArrays = false) => {
   return yearsObject
 }
 
-const getAcademicYearsObject = (years, emptyArrays = false) => {
+const getAcademicYearsObject = ({ years, emptyArrays = false }) => {
   let yearsObject = {}
   for (const year of years) {
     yearsObject = { ...yearsObject, [`${year} - ${year + 1}`]: emptyArrays ? [] : 0 }
@@ -106,7 +119,7 @@ const getAcademicYearsObject = (years, emptyArrays = false) => {
 const getStatsBasis = years => {
   return {
     graphStats: new Array(years.length).fill(0),
-    tableStats: getYearsObject(years),
+    tableStats: getYearsObject({ years }),
   }
 }
 
@@ -115,12 +128,10 @@ const isMajorStudentCredit = (studyright, attainment_date) =>
   (studyright.prioritycode === 1 || studyright.prioritycode === 30) && // Is studyright state = MAIN or state = GRADUATED
   studyright.studystartdate && // The student has started studying in the programme
   studyright.studystartdate <= attainment_date && // Has the credit been attained after studying in the programme started
-  studyright.enddate >= attainment_date && // Has the credit been attained before the studyright ended
-  (!studyright.canceldate || studyright.canceldate >= attainment_date) // If the studyright was cancelled, was the credit attained before it was cancelled
+  studyright.enddate >= attainment_date // Has the credit been attained before the studyright ended
 
 const isSpecialGroupCredit = (studyright, attainment_date, transfers) => {
   if (!studyright) return true // If there is no studyright matching the credit, is not a major student credit
-  if (studyright.canceldate) return true // Cancelled studyrights are in the special groups
   if (studyright.studystartdate > attainment_date) return true // Credits before the studyright started are not major student credits
   if (studyright.enddate && attainment_date > studyright.enddate) return true // Credits after studyright are not major student credits
   if ([7, 9, 16, 34, 33, 99, 14, 13].includes(studyright.extentcode)) return true // Excludes non-degree studyrights and exchange students
@@ -208,8 +219,12 @@ const getBachelorCreditGraphStats = years => ({
     name: '120-149 credits',
     data: getEmptyArray(years.length),
   },
-  mte150: {
-    name: 'More than 150 credits',
+  lte180: {
+    name: '150-179 credits',
+    data: getEmptyArray(years.length),
+  },
+  mte180: {
+    name: 'More than 180 credits',
     data: getEmptyArray(years.length),
   },
 })
@@ -235,8 +250,12 @@ const getMasterCreditGraphStats = years => ({
     name: '260-279 credits',
     data: getEmptyArray(years.length),
   },
-  mte280: {
-    name: 'More than 280 credits',
+  lte300: {
+    name: '280-299 credits',
+    data: getEmptyArray(years.length),
+  },
+  mte300: {
+    name: 'More than 300 credits',
     data: getEmptyArray(years.length),
   },
 })
@@ -244,10 +263,10 @@ const getMasterCreditGraphStats = years => ({
 const getCreditGraphStats = (studyprogramme, years) =>
   studyprogramme.includes('KH') ? getBachelorCreditGraphStats(years) : getMasterCreditGraphStats(years)
 
-const bachelorCreditThresholds = ['lte30', 'lte60', 'lte90', 'lte120', 'lte150', 'mte150']
-const masterCreditThresholds = ['lte200', 'lte220', 'lte240', 'lte260', 'lte280', 'mte280']
-const bachelorCreditAmounts = [30, 60, 90, 120, 150, 150]
-const masterCreditAmounts = [200, 220, 240, 260, 280, 280]
+const bachelorCreditThresholds = ['lte30', 'lte60', 'lte90', 'lte120', 'lte150', 'lte180', 'mte180']
+const masterCreditThresholds = ['lte200', 'lte220', 'lte240', 'lte260', 'lte280', 'lte300', 'mte300']
+const bachelorCreditAmounts = [30, 60, 90, 120, 150, 180, 180]
+const masterCreditAmounts = [200, 220, 240, 260, 280, 300, 300]
 
 const getCreditThresholds = studyprogramme => {
   if (studyprogramme.includes('KH')) {
@@ -258,8 +277,8 @@ const getCreditThresholds = studyprogramme => {
 
 const tableTitles = {
   basics: {
-    SPECIAL_EXCLUDED: ['', 'All', 'Started studying', 'Graduated'],
-    SPECIAL_INCLUDED: ['', 'All', 'Started studying', 'Graduated', 'Cancelled', 'Transferred away', 'Transferred to'],
+    SPECIAL_EXCLUDED: ['', 'Started studying', 'Graduated'],
+    SPECIAL_INCLUDED: ['', 'Started studying', 'Graduated', 'Transferred away', 'Transferred to'],
   },
   credits: {
     SPECIAL_EXCLUDED: ['', 'Total', 'Major students credits', 'Transferred credits'],
@@ -274,7 +293,8 @@ const tableTitles = {
       '60-89 credits',
       '90-119 credits',
       '120-149 credits',
-      '> 150 credits',
+      '150-179 credits',
+      '> 180 credits',
     ],
     master: [
       '',
@@ -284,7 +304,8 @@ const tableTitles = {
       '220-239 credits',
       '240-259 credits',
       '260-279 credits',
-      '> 280 credits',
+      '280-299 credits',
+      '> 300 credits',
     ],
   },
   studytracks: [
@@ -293,7 +314,7 @@ const tableTitles = {
     'Started studying',
     'Currently enrolled',
     'Absent',
-    'Cancelled',
+    'Inactive',
     'Graduated',
     'Men',
     'Women',

services/backend/src/services/studyprogrammeUpdates.js

@@ -8,72 +8,103 @@ const {
   setGraduationStats,
   setStudytrackStats,
 } = require('../services/analyticsService')
+const logger = require('../util/logger')
 
 const updateBasicView = async code => {
-  const yearTypes = ['ACADEMIC_YEAR', 'CALENDAR_YEAR']
-  const special = ['SPECIAL_INCLUDED', 'SPECIAL_EXCLUDED']
+  const specialCalendar = {
+    yearType: 'CALENDAR_YEAR',
+    specialGroups: 'SPECIAL_INCLUDED',
+  }
+  const specialAcademic = {
+    yearType: 'ACADEMIC_YEAR',
+    specialGroups: 'SPECIAL_INCLUDED',
+  }
+  const specialExcludedCalendar = {
+    yearType: 'CALENDAR_YEAR',
+    specialGroups: 'SPECIAL_EXCLUDED',
+  }
 
-  yearTypes.forEach(async yearType => {
-    special.forEach(async specialGroups => {
+  const specialExcludedAcademic = {
+    yearType: 'ACADEMIC_YEAR',
+    specialGroups: 'SPECIAL_EXCLUDED',
+  }
+
+  const options = [specialCalendar, specialAcademic, specialExcludedCalendar, specialExcludedAcademic]
+
+  for (const option of options) {
+    try {
       const basicStats = await getBasicStatsForStudytrack({
         studyprogramme: code,
-        yearType,
-        specialGroups,
+        settings: {
+          isAcademicYear: option.yearType === 'ACADEMIC_YEAR',
+          includeAllSpecials: option.specialGroups === 'SPECIAL_INCLUDED',
+        },
       })
-      await setBasicStats(basicStats, yearType, specialGroups)
+      await setBasicStats(basicStats, option.yearType, option.specialGroups)
 
       const creditStats = await getCreditStatsForStudytrack({
         studyprogramme: code,
-        yearType,
-        specialGroups,
+        settings: {
+          isAcademicYear: option.yearType === 'ACADEMIC_YEAR',
+          includeAllSpecials: option.specialGroups === 'SPECIAL_INCLUDED',
+        },
       })
-      await setCreditStats(creditStats, yearType, specialGroups)
+      await setCreditStats(creditStats, option.yearType, option.specialGroups)
 
       const graduationStats = await getGraduationStatsForStudytrack({
         studyprogramme: code,
-        yearType,
-        specialGroups,
+        settings: {
+          isAcademicYear: option.yearType === 'ACADEMIC_YEAR',
+          includeAllSpecials: option.specialGroups === 'SPECIAL_INCLUDED',
+        },
       })
-      await setGraduationStats(graduationStats, yearType, specialGroups)
-    })
-  })
-
-  return 'OK'
+      await setGraduationStats(graduationStats, option.yearType, option.specialGroups)
+    } catch (e) {
+      logger.error(e)
+    }
+    return 'OK'
+  }
 }
 
 const updateStudytrackView = async code => {
-  const specialIncluded = 'SPECIAL_INCLUDED'
-  const specialExcluded = 'SPECIAL_EXCLUDED'
-  const graduatedIncluded = 'GRADUATED_INCLUDED'
-  const graduatedExcluded = 'GRADUATED_EXCLUDED'
+  const specialGraduated = {
+    graduated: 'GRADUATED_INCLUDED',
+    specialGroups: 'SPECIAL_INCLUDED',
+  }
+  const specialExcludedGraduated = {
+    graduated: 'GRADUATED_INCLUDED',
+    specialGroups: 'SPECIAL_EXCLUDED',
+  }
+  const specialGraduatedExcluded = {
+    graduated: 'GRADUATED_EXCLUDED',
+    specialGroups: 'SPECIAL_INCLUDED',
+  }
+  const specialExcludedGraduatedExcluded = {
+    graduated: 'GRADUATED_EXCLUDED',
+    specialGroups: 'SPECIAL_EXCLUDED',
+  }
 
-  const statsSpecialAndGraduated = await getStudytrackStatsForStudyprogramme({
-    studyprogramme: code,
-    specialGroups: specialIncluded,
-    graduated: graduatedIncluded,
-  })
-  await setStudytrackStats(statsSpecialAndGraduated, graduatedIncluded, specialIncluded)
+  const options = [
+    specialGraduated,
+    specialExcludedGraduated,
+    specialGraduatedExcluded,
+    specialExcludedGraduatedExcluded,
+  ]
 
-  const statsSpecialNotGraduated = await getStudytrackStatsForStudyprogramme({
-    studyprogramme: code,
-    specialGroups: specialIncluded,
-    graduated: graduatedExcluded,
-  })
-  await setStudytrackStats(statsSpecialNotGraduated, graduatedExcluded, specialIncluded)
-
-  const statsNotSpecialAndGraduated = await getStudytrackStatsForStudyprogramme({
-    studyprogramme: code,
-    specialGroups: specialExcluded,
-    graduated: graduatedIncluded,
-  })
-  await setStudytrackStats(statsNotSpecialAndGraduated, graduatedIncluded, specialExcluded)
-
-  const statsNotSpecialNotGraduated = await getStudytrackStatsForStudyprogramme({
-    studyprogramme: code,
-    specialGroups: specialExcluded,
-    graduated: graduatedExcluded,
-  })
-  await setStudytrackStats(statsNotSpecialNotGraduated, graduatedExcluded, specialExcluded)
+  for (const option of options) {
+    try {
+      const stats = await getStudytrackStatsForStudyprogramme({
+        studyprogramme: code,
+        settings: {
+          specialGroups: option.specialGroups === 'SPECIAL_INCLUDED',
+          graduated: option.graduated === 'GRADUATED_INCLUDED',
+        },
+      })
+      await setStudytrackStats(stats, option.graduated, option.specialGroups)
+    } catch (e) {
+      logger.error(e)
+    }
+  }
 
   return 'OK'
 }

services/backend/src/services/studytrackStats.js

@@ -9,7 +9,6 @@ const {
   getYearsArray,
   getPercentage,
   getYearsObject,
-  getAcademicYearsObject,
   getCorrectStudentnumbers,
   getCreditThresholds,
   getCreditGraphStats,
@@ -19,10 +18,11 @@ const {
   studytrackStudents,
   allStudyrights,
   startedStudyrights,
+  inactiveStudyrights,
   enrolledStudents,
   absentStudents,
   graduatedStudyRights,
-} = require('./newStudyprogramme')
+} = require('./studyprogramme')
 const { getAcademicYearDates } = require('../util/semester')
 
 const getStudentData = (students, thresholdKeys, thresholdAmounts) => {
@@ -38,7 +38,8 @@ const getStudentData = (students, thresholdKeys, thresholdAmounts) => {
     data[thresholdKeys[2]] += creditcount >= thresholdAmounts[1] && creditcount < thresholdAmounts[2] ? 1 : 0
     data[thresholdKeys[3]] += creditcount >= thresholdAmounts[2] && creditcount < thresholdAmounts[3] ? 1 : 0
     data[thresholdKeys[4]] += creditcount >= thresholdAmounts[3] && creditcount < thresholdAmounts[4] ? 1 : 0
-    data[thresholdKeys[5]] += creditcount >= thresholdAmounts[5] ? 1 : 0
+    data[thresholdKeys[5]] += creditcount >= thresholdAmounts[4] && creditcount < thresholdAmounts[5] ? 1 : 0
+    data[thresholdKeys[6]] += creditcount >= thresholdAmounts[6] ? 1 : 0
   })
   return data
 }
@@ -79,8 +80,8 @@ const getGraduationTimeStats = async ({
 // Goes through the programme and all its studytracks for the said year and adds the wanted stats to the data objects
 const getStudytrackDataForTheYear = async ({
   studyprogramme,
-  special,
-  includeGraduated,
+  since,
+  settings,
   studytracks,
   studytrackNames,
   year,
@@ -89,6 +90,9 @@ const getStudytrackDataForTheYear = async ({
   creditThresholdKeys,
   creditThresholdAmounts,
 }) => {
+  const { specialGroups: includeAllSpecials, graduated: includeGraduated } = settings
+  const { startDate, endDate } = getAcademicYearDates(year, since)
+
   const {
     mainStatsByYear,
     mainStatsByTrack,
@@ -100,7 +104,6 @@ const getStudytrackDataForTheYear = async ({
     totalAmounts,
     emptyTracks,
   } = data
-  const { startDate, endDate } = getAcademicYearDates(year)
 
   await Promise.all(
     studytracks.map(async track => {
@@ -110,19 +113,19 @@ const getStudytrackDataForTheYear = async ({
         codes,
         startDate,
         endDate,
-        includeAllSpecials: special,
+        includeAllSpecials,
         includeGraduated,
       })
 
       // Get all the studyrights and students for the calculations
-      const all = await allStudyrights(track, null, studentnumbers)
+      const all = await allStudyrights(track, studentnumbers)
       const students = await studytrackStudents(studentnumbers)
       const studentData = getStudentData(students, creditThresholdKeys, creditThresholdAmounts)
       const started = await startedStudyrights(track, startDate, studentnumbers)
       const enrolled = await enrolledStudents(track, startDate, studentnumbers)
       const absent = await absentStudents(track, studentnumbers)
-      const cancelled = all.filter(s => s.canceldate !== null && s.canceldate !== undefined)
-      const graduated = await graduatedStudyRights(track, null, studentnumbers)
+      const inactive = await inactiveStudyrights(track, studentnumbers)
+      const graduated = await graduatedStudyRights(track, startDate, studentnumbers)
 
       // If the track has no stats for that year, it should be removed from the table and dropdown options
       if (all.length === 0) {
@@ -137,14 +140,14 @@ const getStudytrackDataForTheYear = async ({
       // Count stats for the credit progress table for the year per track
       creditTableStats[track] = [
         ...creditTableStats[track],
-        [`${year} - ${year + 1}`, all.length, ...creditThresholdKeys.map(threshold => studentData[threshold])],
+        [year, all.length, ...creditThresholdKeys.map(threshold => studentData[threshold])],
       ]
 
       // Count stats for the main studytrack table grouped by tracks
       mainStatsByTrack[track] = [
         ...mainStatsByTrack[track],
         [
-          `${year} - ${year + 1}`,
+          year,
           all.length,
           getPercentage(all.length, all.length),
           started.length,
@@ -153,8 +156,8 @@ const getStudytrackDataForTheYear = async ({
           getPercentage(enrolled.length, all.length),
           absent.length,
           getPercentage(absent.length, all.length),
-          cancelled.length,
-          getPercentage(cancelled.length, all.length),
+          inactive.length,
+          getPercentage(inactive.length, all.length),
           graduated.length,
           getPercentage(graduated.length, all.length),
           studentData.male,
@@ -170,9 +173,7 @@ const getStudytrackDataForTheYear = async ({
       mainStatsByYear[year] = [
         ...mainStatsByYear[year],
         [
-          studytrackNames[track]?.name['fi']
-            ? `${studytrackNames[track]?.name['fi']}, ${track}`
-            : `${year} - ${year + 1}`,
+          studytrackNames[track]?.name['fi'] ? `${studytrackNames[track]?.name['fi']}, ${track}` : year,
           all.length,
           getPercentage(all.length, all.length),
           started.length,
@@ -181,8 +182,8 @@ const getStudytrackDataForTheYear = async ({
           getPercentage(enrolled.length, all.length),
           absent.length,
           getPercentage(absent.length, all.length),
-          cancelled.length,
-          getPercentage(cancelled.length, all.length),
+          inactive.length,
+          getPercentage(inactive.length, all.length),
           graduated.length,
           getPercentage(graduated.length, all.length),
           studentData.male,
@@ -195,9 +196,9 @@ const getStudytrackDataForTheYear = async ({
       ]
 
       // Count stats for the graduation time charts grouped by year
-      totalAmounts[track][`${year} - ${year + 1}`] = await all.length
+      totalAmounts[track][year] = await all.length
       await getGraduationTimeStats({
-        year: `${year} - ${year + 1}`,
+        year,
         graduated,
         studyprogramme,
         track,
@@ -224,7 +225,7 @@ const getStudytrackOptions = (studyprogramme, studytrackNames, studytracks, empt
 
 // Creates empty objects for each statistic type, which are then updated with the studytrack data
 const getEmptyStatsObjects = (years, studytracks, studyprogramme) => {
-  const mainStatsByYear = getYearsObject(years, true)
+  const mainStatsByYear = getYearsObject({ years, emptyArrays: true })
   const mainStatsByTrack = {}
   const creditGraphStats = {}
   const creditTableStats = {}
@@ -238,10 +239,10 @@ const getEmptyStatsObjects = (years, studytracks, studyprogramme) => {
     mainStatsByTrack[track] = []
     creditGraphStats[track] = getCreditGraphStats(studyprogramme, years)
     creditTableStats[track] = []
-    graduationMedianTime[track] = getAcademicYearsObject(years, true)
-    graduationMeanTime[track] = getAcademicYearsObject(years, true)
-    graduationAmounts[track] = getAcademicYearsObject(years)
-    totalAmounts[track] = getAcademicYearsObject(years)
+    graduationMedianTime[track] = getYearsObject({ years, emptyArrays: true })
+    graduationMeanTime[track] = getYearsObject({ years, emptyArrays: true })
+    graduationAmounts[track] = getYearsObject({ years })
+    totalAmounts[track] = getYearsObject({ years })
   })
 
   return {
@@ -258,12 +259,11 @@ const getEmptyStatsObjects = (years, studytracks, studyprogramme) => {
 }
 
 // Combines all the data for the Populations and Studytracks -view
-const getStudytrackStatsForStudyprogramme = async ({ studyprogramme, graduated, specialGroups }) => {
+const getStudytrackStatsForStudyprogramme = async ({ studyprogramme, settings }) => {
   const isAcademicYear = true
-  const special = specialGroups === 'SPECIAL_INCLUDED'
-  const includeGraduated = graduated === 'GRADUATED_INCLUDED'
+  const includeYearsCombined = true
   const since = getStartDate(studyprogramme, isAcademicYear)
-  const years = getYearsArray(since.getFullYear())
+  const years = getYearsArray(since.getFullYear(), isAcademicYear, includeYearsCombined)
 
   const associations = await getAssociations()
   const studytracks = associations.programmes[studyprogramme]
@@ -279,8 +279,8 @@ const getStudytrackStatsForStudyprogramme = async ({ studyprogramme, graduated,
     years.map(async year => {
       return await getStudytrackDataForTheYear({
         studyprogramme,
-        special,
-        includeGraduated,
+        since,
+        settings,
         studytracks,
         studytrackNames,
         year,
@@ -296,7 +296,7 @@ const getStudytrackStatsForStudyprogramme = async ({ studyprogramme, graduated,
 
   return {
     id: studyprogramme,
-    years: getYearsArray(since.getFullYear(), isAcademicYear),
+    years: getYearsArray(since.getFullYear(), isAcademicYear, includeYearsCombined),
     mainStatsByTrack: data.mainStatsByTrack,
     mainStatsByYear: data.mainStatsByYear,
     creditTableStats: data.creditTableStats,
@@ -306,7 +306,7 @@ const getStudytrackStatsForStudyprogramme = async ({ studyprogramme, graduated,
     graduationAmounts: data.graduationAmounts,
     totalAmounts: data.totalAmounts,
     studytrackOptions,
-    includeGraduated,
+    includeGraduated: settings.graduated,
     populationTitles: tableTitles['studytracks'],
     creditTableTitles: tableTitles['creditProgress'][studyprogramme.includes('KH') ? 'bachelor' : 'master'],
   }

services/backend/src/services/thesis.js

@@ -1,29 +0,0 @@
-const { ThesisCourse } = require('../models/models_kone')
-
-const createThesisCourse = (programme, course, type) =>
-  ThesisCourse.create({
-    programmeCode: programme,
-    courseCode: course,
-    thesisType: type,
-  })
-
-const deleteThesisCourse = (programme, course) =>
-  ThesisCourse.destroy({
-    where: {
-      programmeCode: programme,
-      courseCode: course,
-    },
-  })
-
-const findProgrammeTheses = programme =>
-  ThesisCourse.findAll({
-    where: {
-      programmeCode: programme,
-    },
-  })
-
-module.exports = {
-  createThesisCourse,
-  deleteThesisCourse,
-  findProgrammeTheses,
-}

services/backend/src/services/topteachers.js

@@ -107,7 +107,9 @@ const findTopTeachers = async yearcode => {
     .filter(isRegularCourse)
     .map(credit => {
       const { credits, course, credittypecode } = credit
-      const teachers = credit.teachers.map(({ id, name }) => ({ id, name }))
+      const teachers = credit.teachers
+        .filter(({ id }) => !id.includes('hy-hlo-org')) // Remove faculties from the leaderboards
+        .map(({ id, name }) => ({ id, name }))
       const passed = Credit.passed(credit) || Credit.improved(credit)
       const failed = Credit.failed(credit)
       const transferred = credittypecode === 9

services/backend/src/services/trends/shared.js

@@ -84,7 +84,7 @@ const getTargetStudentCounts = async ({ codes, includeOldAttainments, excludeNon
                 studyright.student_studentnumber studentnumber,
                 credit.credits credits,
                 CASE
-                    WHEN studyright.canceldate IS NOT NULL AND studyright.graduated != 1 THEN 1
+                    WHEN studyright.graduated = 0 AND (studyright.active = 0 OR studyright.enddate < NOW()) THEN 1
                     ELSE 0
                 END currently_cancelled
             FROM

services/backend/src/services/trends/statusGraduated.js

@@ -93,7 +93,9 @@ const calculateStatusGraduated = async (unixMillis, showByYear) => {
       // init faculty
       if (!acc[curr.faculty_code]) {
         const org = orgs.find(o => o.code === curr.faculty_code)
-        acc[curr.faculty_code] = { name: org.name, yearly: {}, drill: {} }
+        if (org) {
+          acc[curr.faculty_code] = { name: org.name, yearly: {}, drill: {} }
+        }
       }
       if (!acc[curr.faculty_code]['yearly'][data.year])
         acc[curr.faculty_code]['yearly'][data.year] = { acc: 0, total: 0 }

services/backend/src/util/semester.js

@@ -29,10 +29,19 @@ const getPassingSemester = (startYear, date) => {
   return yearCount < 6 ? `${yearCount}-${semester}` : 'LATER'
 }
 
-const getAcademicYearDates = year => {
+const getAcademicYearDates = (year, since) => {
+  if (year === 'Total') {
+    return {
+      startDate: `${since.getFullYear()}-${semesterStart['FALL']}`,
+      endDate: `${moment(new Date()).add(1, 'years').format('YYYY')}-${semesterEnd['SPRING']}`,
+    }
+  }
+  const startYear = typeof year === 'number' ? year : Number(year.slice(0, 4))
+  const endYear =
+    typeof year === 'number' ? moment(year, 'YYYY').add(1, 'years').format('YYYY') : Number(year.slice(7, 11))
   return {
-    startDate: `${year}-${semesterStart['FALL']}`,
-    endDate: `${moment(year, 'YYYY').add(1, 'years').format('YYYY')}-${semesterEnd['SPRING']}`,
+    startDate: `${startYear}-${semesterStart['FALL']}`,
+    endDate: `${endYear}-${semesterEnd['SPRING']}`,
   }
 }
 

services/frontend/package-lock.json

@@ -1908,26 +1908,19 @@
       }
     },
     "@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
+      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA=="
     },
     "@reduxjs/toolkit": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.6.2.tgz",
-      "integrity": "sha512-HbfI/hOVrAcMGAYsMWxw3UJyIoAS9JTdwddsjlr5w3S50tXhWb+EMyhIw+IAvCVCLETkzdjgH91RjDSYZekVBA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.0.tgz",
+      "integrity": "sha512-cdfHWfcvLyhBUDicoFwG1u32JqvwKDxLxDd7zSmSoFw/RhYLOygIRtmaMjPRUUHmVmmAGAvquLLsKKU/677kSQ==",
       "requires": {
-        "immer": "^9.0.6",
-        "redux": "^4.1.0",
-        "redux-thunk": "^2.3.0",
-        "reselect": "^4.0.0"
-      },
-      "dependencies": {
-        "immer": {
-          "version": "9.0.6",
-          "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.6.tgz",
-          "integrity": "sha512-G95ivKpy+EvVAnAab4fVa4YGYn24J1SpEktnJX7JJ45Bd7xqME/SCplFzYFmTbrkwZbQ4xJK1xMTUYBkN6pWsQ=="
-        }
+        "immer": "^9.0.7",
+        "redux": "^4.1.2",
+        "redux-thunk": "^2.4.1",
+        "reselect": "^4.1.5"
       }
     },
     "@rollup/plugin-node-resolve": {
@@ -1978,13 +1971,13 @@
       }
     },
     "@sentry/browser": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.9.0.tgz",
-      "integrity": "sha512-4JnEPcwoNs6JqeEd4wscBq+hxpotEJ0DJ4eOIsaNZIMyqEHXBHTXCk/gfrSsiZFrkHM4PgvUHOxaC0HcZ92oBA==",
+      "version": "6.18.2",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.18.2.tgz",
+      "integrity": "sha512-EsqKSNboi2gOiMuEwQranLucxrARi00y2vgUnaPXcqTKTlVlHDetoWHvq8/r29idA1JHGka5tDrwrmWccWIkrg==",
       "requires": {
-        "@sentry/core": "6.9.0",
-        "@sentry/types": "6.9.0",
-        "@sentry/utils": "6.9.0",
+        "@sentry/core": "6.18.2",
+        "@sentry/types": "6.18.2",
+        "@sentry/utils": "6.18.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -1996,14 +1989,14 @@
       }
     },
     "@sentry/core": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.9.0.tgz",
-      "integrity": "sha512-oFX2qQcMLujCeIuCQGlhpTUIOXiU5n6V2lqDnvMXUV8gKpplBPalwdlR9bgbSi+VO8u7LjHR1IKM0RAPWgNHWw==",
+      "version": "6.18.2",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.18.2.tgz",
+      "integrity": "sha512-r5ad/gq5S/JHc9sd5CUhZQT9ojQ+f+thk/AoGeGawX/8HURZYAgIqD565d6FK0VsZEDkdRMl58z1Qon20h3y1g==",
       "requires": {
-        "@sentry/hub": "6.9.0",
-        "@sentry/minimal": "6.9.0",
-        "@sentry/types": "6.9.0",
-        "@sentry/utils": "6.9.0",
+        "@sentry/hub": "6.18.2",
+        "@sentry/minimal": "6.18.2",
+        "@sentry/types": "6.18.2",
+        "@sentry/utils": "6.18.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -2015,12 +2008,12 @@
       }
     },
     "@sentry/hub": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.9.0.tgz",
-      "integrity": "sha512-5mors7ojbo7G85ZmoVPQBgFBMONAJwyZfV0LNLy14GenoaVNuxTPyvAQiJb1FYq+x6YZ3CvqGX6r74KRKQU87w==",
+      "version": "6.18.2",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.18.2.tgz",
+      "integrity": "sha512-d0AugekMkbnN12b4EXMjseJxtLPc9S20DGobCPUb4oAQT6S2oDQEj1jwP6PQ5vtgyy+GMYWxBMgqAQ4pjVYISQ==",
       "requires": {
-        "@sentry/types": "6.9.0",
-        "@sentry/utils": "6.9.0",
+        "@sentry/types": "6.18.2",
+        "@sentry/utils": "6.18.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -2032,12 +2025,12 @@
       }
     },
     "@sentry/minimal": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.9.0.tgz",
-      "integrity": "sha512-GBZ6wG2Rc1wInYEl2BZTZc/t57O1Da876ifLsSPpEQAEnGWbqZWb8RLjZskH09ZIL/K4XCIDDi5ySzN8kFUWJw==",
+      "version": "6.18.2",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.18.2.tgz",
+      "integrity": "sha512-n7KYuo34W2LxE+3dnZ47of7XHuORINCnXq66XH72eoj67tf0XeWbIhEJrYGmoLRyRfoCYYrBLWiDl/uTjLzrzQ==",
       "requires": {
-        "@sentry/hub": "6.9.0",
-        "@sentry/types": "6.9.0",
+        "@sentry/hub": "6.18.2",
+        "@sentry/types": "6.18.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -2049,51 +2042,17 @@
       }
     },
     "@sentry/tracing": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.11.0.tgz",
-      "integrity": "sha512-9VA1/SY++WeoMQI4K6n/sYgIdRtCu9NLWqmGqu/5kbOtESYFgAt1DqSyqGCr00ZjQiC2s7tkDkTNZb38K6KytQ==",
+      "version": "6.18.2",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.18.2.tgz",
+      "integrity": "sha512-hg6NLqrqJ5sUPTyWEQ2RqdnhQVnyLtx8II0IyWxQLDWD8UCe3Mu6G7mroDtakPWcP+lWz6OnKfMEfuhMcxR8fw==",
       "requires": {
-        "@sentry/hub": "6.11.0",
-        "@sentry/minimal": "6.11.0",
-        "@sentry/types": "6.11.0",
-        "@sentry/utils": "6.11.0",
+        "@sentry/hub": "6.18.2",
+        "@sentry/minimal": "6.18.2",
+        "@sentry/types": "6.18.2",
+        "@sentry/utils": "6.18.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
-        "@sentry/hub": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.11.0.tgz",
-          "integrity": "sha512-pT9hf+ZJfVFpoZopoC+yJmFNclr4NPqPcl2cgguqCHb69DklD1NxgBNWK8D6X05qjnNFDF991U6t1mxP9HrGuw==",
-          "requires": {
-            "@sentry/types": "6.11.0",
-            "@sentry/utils": "6.11.0",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/minimal": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.11.0.tgz",
-          "integrity": "sha512-XkZ7qrdlGp4IM/gjGxf1Q575yIbl5RvPbg+WFeekpo16Ufvzx37Mr8c2xsZaWosISVyE6eyFpooORjUlzy8EDw==",
-          "requires": {
-            "@sentry/hub": "6.11.0",
-            "@sentry/types": "6.11.0",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/types": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.11.0.tgz",
-          "integrity": "sha512-gm5H9eZhL6bsIy/h3T+/Fzzz2vINhHhqd92CjHle3w7uXdTdFV98i2pDpErBGNTSNzbntqOMifYEB5ENtZAvcg=="
-        },
-        "@sentry/utils": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.11.0.tgz",
-          "integrity": "sha512-IOvyFHcnbRQxa++jO+ZUzRvFHEJ1cZjrBIQaNVc0IYF0twUOB5PTP6joTcix38ldaLeapaPZ9LGfudbvYvxkdg==",
-          "requires": {
-            "@sentry/types": "6.11.0",
-            "tslib": "^1.9.3"
-          }
-        },
         "tslib": {
           "version": "1.14.1",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -2102,16 +2061,16 @@
       }
     },
     "@sentry/types": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.9.0.tgz",
-      "integrity": "sha512-v52HJqLoLapEnqS2NdVtUXPvT+aezQgNXQkp8hiQ3RUdTm5cffwBVG7wlbpE6OsOOIZxd6p1zKylFkwCypiIIA=="
+      "version": "6.18.2",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.18.2.tgz",
+      "integrity": "sha512-WzpJf/Q5aORTzrSwer/As1NlO90dBAQpaHV2ikDDKqOyMWEgjKb5/4gh59p9gH8JMMnLetP1AvQel0fOj5UnUw=="
     },
     "@sentry/utils": {
-      "version": "6.9.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.9.0.tgz",
-      "integrity": "sha512-PimDr6KAi4cCp5hQZ8Az2/pDcdfhTu7WAU30Dd9MZwknpHSTmD4G6QvkdrB5er6kMMnNQOC7rMo6w/Do3m6X3w==",
+      "version": "6.18.2",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.18.2.tgz",
+      "integrity": "sha512-EC619jesknyu4xpwud5WC/5odYLz6JUy7OSFy5405PpdGeh/m8XUvuJAx4zDx0Iz/Mlk0S1Md+ZcQwqkv39dkw==",
       "requires": {
-        "@sentry/types": "6.9.0",
+        "@sentry/types": "6.18.2",
         "tslib": "^1.9.3"
       },
       "dependencies": {
@@ -2330,9 +2289,9 @@
       }
     },
     "@types/hast": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.2.tgz",
-      "integrity": "sha512-Op5W7jYgZI7AWKY5wQ0/QNMzQM7dGQPyW1rXKNiymVCy5iTfdPuGu4HhYNOM2sIv8gUfIuIdcYlXmAepwaowow==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz",
+      "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==",
       "requires": {
         "@types/unist": "*"
       }
@@ -2378,9 +2337,9 @@
       "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="
     },
     "@types/mdast": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.4.tgz",
-      "integrity": "sha512-gIdhbLDFlspL53xzol2hVzrXAbzt71erJHoOwQZWssjaiouOotf03lNtMmFm9VfFkvnLWccSVjUAZGQ5Kqw+jA==",
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
+      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
       "requires": {
         "@types/unist": "*"
       }
@@ -2485,9 +2444,9 @@
       }
     },
     "@types/unist": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.5.tgz",
-      "integrity": "sha512-wnra4Vw9dopnuybR6HBywJ/URYpYrKLoepBTEtgfJup8Ahoi2zJECPP2cwiXp7btTvOT2CULv87aQRA4eZSP6g=="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
+      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="
     },
     "@types/webpack": {
       "version": "4.41.30",
@@ -3160,9 +3119,9 @@
       "integrity": "sha512-99FZt8qS/xukgxU/8daV8WT7wAakqBzt6lF3XCweO6pwcf50/NgxxBj6ZC7/ejR+F4PWeFpkb9lAMH3y2quBXA=="
     },
     "axios": {
-      "version": "0.21.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz",
-      "integrity": "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==",
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "requires": {
         "follow-redirects": "^1.14.0"
       }
@@ -4087,13 +4046,35 @@
       "integrity": "sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ=="
     },
     "cfb": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.0.tgz",
-      "integrity": "sha512-sXMvHsKCICVR3Naq+J556K+ExBo9n50iKl6LGarlnvuA2035uMlGA/qVrc0wQtow5P1vJEw9UyrKLCbtIKz+TQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.1.tgz",
+      "integrity": "sha512-wT2ScPAFGSVy7CY+aauMezZBnNrfnaLSrxHUHdea+Td/86vrk6ZquggV+ssBR88zNs0OnBkL2+lf9q0K+zVGzQ==",
       "requires": {
-        "adler-32": "~1.2.0",
+        "adler-32": "~1.3.0",
         "crc-32": "~1.2.0",
-        "printj": "~1.1.2"
+        "printj": "~1.3.0"
+      },
+      "dependencies": {
+        "adler-32": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz",
+          "integrity": "sha512-f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==",
+          "requires": {
+            "printj": "~1.2.2"
+          },
+          "dependencies": {
+            "printj": {
+              "version": "1.2.3",
+              "resolved": "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz",
+              "integrity": "sha512-sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="
+            }
+          }
+        },
+        "printj": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz",
+          "integrity": "sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="
+        }
       }
     },
     "chalk": {
@@ -4299,20 +4280,9 @@
       }
     },
     "codepage": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz",
-      "integrity": "sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k=",
-      "requires": {
-        "commander": "~2.14.1",
-        "exit-on-epipe": "~1.0.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.14.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-          "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
-        }
-      }
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
+      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="
     },
     "collect-v8-coverage": {
       "version": "1.0.1",
@@ -4617,12 +4587,19 @@
       }
     },
     "crc-32": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz",
-      "integrity": "sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz",
+      "integrity": "sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==",
       "requires": {
         "exit-on-epipe": "~1.0.1",
-        "printj": "~1.1.0"
+        "printj": "~1.3.1"
+      },
+      "dependencies": {
+        "printj": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz",
+          "integrity": "sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="
+        }
       }
     },
     "create-ecdh": {
@@ -6657,11 +6634,6 @@
         "bser": "2.1.1"
       }
     },
-    "fflate": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.3.11.tgz",
-      "integrity": "sha512-Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A=="
-    },
     "figgy-pudding": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
@@ -6837,9 +6809,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -7355,9 +7327,9 @@
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
     },
     "highcharts": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-9.1.2.tgz",
-      "integrity": "sha512-RwCnJnxAUCGG4R/WDG+QP/4VJNtOpkQTkXcuf58DjDvm9ZILplSMdZvrbMRC9Y9ecuJQCjjZsiifvyS5E2IBvQ=="
+      "version": "9.3.3",
+      "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-9.3.3.tgz",
+      "integrity": "sha512-QeOvm6cifeZYYdTLm4IxZsXcOE9c4xqfs0z0OJJ0z7hhA9WG0rmcVAyuIp5HBl/znjA/ayYHmpYjBYD/9PG4Fg=="
     },
     "highcharts-custom-events": {
       "version": "3.0.10",
@@ -7741,9 +7713,9 @@
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
     },
     "immer": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.7.tgz",
-      "integrity": "sha512-KGllzpbamZDvOIxnmJ0jI840g7Oikx58lBPWV0hUh7dtAyZpFqqrBZdKka5GlTwMTZ1Tjc/bKKW4VSFAt6BqMA=="
+      "version": "9.0.12",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz",
+      "integrity": "sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA=="
     },
     "import-cwd": {
       "version": "2.1.0",
@@ -10412,9 +10384,9 @@
       "optional": true
     },
     "nanoid": {
-      "version": "3.1.23",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-      "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
+      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -12351,13 +12323,13 @@
       }
     },
     "prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "requires": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
+        "react-is": "^16.13.1"
       },
       "dependencies": {
         "react-is": {
@@ -12455,9 +12427,9 @@
       "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
     },
     "qs": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
-      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
       "requires": {
         "side-channel": "^1.0.4"
       }
@@ -12565,9 +12537,9 @@
       }
     },
     "react-datetime": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-datetime/-/react-datetime-3.0.4.tgz",
-      "integrity": "sha512-v6MVwCve+DRaLN2f22LTO5TlrPpkUXumPkp1zfrbhaFtSYGl2grZ2JtwJfLxRj/T4ACyePAV4srCR6cMSiQ/Iw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/react-datetime/-/react-datetime-3.1.1.tgz",
+      "integrity": "sha512-gHCTjAniCcMb6jdXpz+MpVe/uCeaHNDOofg+l41nLlJI3uBLBMV40CQbGB2TCTUpCzGT1mCs4vQzKGMjXO/WWQ==",
       "requires": {
         "prop-types": "^15.5.7"
       }
@@ -12734,15 +12706,15 @@
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
     "react-markdown": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-6.0.2.tgz",
-      "integrity": "sha512-Et2AjXAsbmPP1nLQQRqmVgcqzfwcz8uQJ8VAdADs8Nk/aaUA0YeU9RDLuCtD+GwajCnm/+Iiu2KPmXzmD/M3vA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-6.0.3.tgz",
+      "integrity": "sha512-kQbpWiMoBHnj9myLlmZG9T1JdoT/OEyHK7hqM6CqFT14MAkgWiWBUYijLyBmxbntaN6dCDicPcUhWhci1QYodg==",
       "requires": {
         "@types/hast": "^2.0.0",
         "@types/unist": "^2.0.3",
         "comma-separated-tokens": "^1.0.0",
         "prop-types": "^15.7.2",
-        "property-information": "^5.0.0",
+        "property-information": "^5.3.0",
         "react-is": "^17.0.0",
         "remark-parse": "^9.0.0",
         "remark-rehype": "^8.0.0",
@@ -12772,6 +12744,11 @@
         }
       }
     },
+    "react-range": {
+      "version": "1.8.12",
+      "resolved": "https://registry.npmjs.org/react-range/-/react-range-1.8.12.tgz",
+      "integrity": "sha512-vY2eCNDvKlXtEpl8xx5AQVIBeE4ZZ46dLVL+82f4FcS9XrPqz4+XagPHmq3IPqYuVQ2H4b8UArXzvVAsd/B03Q=="
+    },
     "react-redux": {
       "version": "7.2.6",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz",
@@ -12800,12 +12777,17 @@
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
       "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="
     },
+    "react-reverse-portal": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/react-reverse-portal/-/react-reverse-portal-2.1.0.tgz",
+      "integrity": "sha512-ck1igNI4tUFozJ89X7qqFtWy1wSL7WEd/5iZbjBjyf+6vjZ3leg4JJxdVPbFt9+zwMLcQSPsIkw9xGu9E+VqCQ=="
+    },
     "react-router": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
-      "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.1.tgz",
+      "integrity": "sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==",
       "requires": {
-        "@babel/runtime": "^7.1.2",
+        "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
         "hoist-non-react-statics": "^3.1.0",
         "loose-envify": "^1.3.1",
@@ -12817,6 +12799,14 @@
         "tiny-warning": "^1.0.0"
       },
       "dependencies": {
+        "@babel/runtime": {
+          "version": "7.17.2",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz",
+          "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -12838,17 +12828,27 @@
       }
     },
     "react-router-dom": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
-      "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.0.tgz",
+      "integrity": "sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==",
       "requires": {
-        "@babel/runtime": "^7.1.2",
+        "@babel/runtime": "^7.12.13",
         "history": "^4.9.0",
         "loose-envify": "^1.3.1",
         "prop-types": "^15.6.2",
-        "react-router": "5.2.0",
+        "react-router": "5.2.1",
         "tiny-invariant": "^1.0.2",
         "tiny-warning": "^1.0.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.17.2",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz",
+          "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
       }
     },
     "react-scripts": {
@@ -13086,9 +13086,9 @@
       }
     },
     "redux-thunk": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.0.tgz",
-      "integrity": "sha512-/y6ZKQNU/0u8Bm7ROLq9Pt/7lU93cT0IucYMrubo89ENjxPa7i8pqLKu6V4X7/TvYovQ6x01unTeyeZ9lgXiTA=="
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
+      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q=="
     },
     "regenerate": {
       "version": "1.4.2",
@@ -13261,9 +13261,9 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "reselect": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.2.tgz",
-      "integrity": "sha512-wg60ebcPOtxcptIUfrr7Jt3h4BR86cCW3R7y4qt65lnNb4yz4QgrXcbSioVsIOYguyz42+XTHIyJ5TEruzkFgQ=="
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.5.tgz",
+      "integrity": "sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ=="
     },
     "resolve": {
       "version": "1.18.1",
@@ -13837,9 +13837,9 @@
       }
     },
     "semantic-ui-react": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-2.0.3.tgz",
-      "integrity": "sha512-a0hGN6XXw64sRSKwWqMCKSI/AGLohxNeWuErS39eswvBbUnLjBij8ZoEdiqDiz/PuWpwYIRjgmQVrut+7h3b2g==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-2.1.2.tgz",
+      "integrity": "sha512-NG7qMUi2Ab2gPWzOnGyBO9Ao2tjf9MZjjMMPbmg8uEUcEFm+z1QPqCKhW+eYMiZekH8L9azw9M+hzoTIB1lZgQ==",
       "requires": {
         "@babel/runtime": "^7.10.5",
         "@fluentui/react-component-event-listener": "~0.51.6",
@@ -13848,8 +13848,8 @@
         "@semantic-ui-react/event-stack": "^3.1.2",
         "clsx": "^1.1.1",
         "keyboard-key": "^1.1.0",
-        "lodash": "^4.17.19",
-        "lodash-es": "^4.17.15",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
         "prop-types": "^15.7.2",
         "react-is": "^16.8.6 || ^17.0.0",
         "react-popper": "^2.2.4",
@@ -15343,9 +15343,9 @@
       }
     },
     "unfuck-spa-shibboleth-session": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/unfuck-spa-shibboleth-session/-/unfuck-spa-shibboleth-session-3.1.3.tgz",
-      "integrity": "sha512-ZchOl94XvUz0eTLfZtx1iuqoKcNFN7WePB9Qz+6vPAkHO+F+H1zBatJo0lLgEdZGm1wqCl7gArrRuilcnsUp/A==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/unfuck-spa-shibboleth-session/-/unfuck-spa-shibboleth-session-3.1.4.tgz",
+      "integrity": "sha512-eh20O3yTDRlRYmV8DQhELvnwFS78I8mdMUjetdvvIpO/tGSO5mzDooCrF9ssOUxGtCA6VtlcoVBs3FjFSm1Wng==",
       "requires": {
         "axios": "^0.21.1"
       }
@@ -15375,9 +15375,9 @@
       "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="
     },
     "unified": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
-      "integrity": "sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==",
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz",
+      "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
       "requires": {
         "bail": "^1.0.0",
         "extend": "^3.0.0",
@@ -15616,9 +15616,9 @@
       }
     },
     "url-parse": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
-      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -15629,6 +15629,11 @@
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
+    "use-context-selector": {
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/use-context-selector/-/use-context-selector-1.3.9.tgz",
+      "integrity": "sha512-YgzRyeFjoJXwFn2qLVAuIbV6EQ8DOuzu3SS/eiCxyAyvBhcn02jYSz8c5v22QQU3LW6Ez/Iyo62kKvS7Kdqt3A=="
+    },
     "util": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
@@ -17189,27 +17194,17 @@
       "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="
     },
     "xlsx": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.17.0.tgz",
-      "integrity": "sha512-bZ36FSACiAyjoldey1+7it50PMlDp1pcAJrZKcVZHzKd8BC/z6TQ/QAN8onuqcepifqSznR6uKnjPhaGt6ig9A==",
+      "version": "0.17.5",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.17.5.tgz",
+      "integrity": "sha512-lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g==",
       "requires": {
         "adler-32": "~1.2.0",
         "cfb": "^1.1.4",
-        "codepage": "~1.14.0",
-        "commander": "~2.17.1",
+        "codepage": "~1.15.0",
         "crc-32": "~1.2.0",
-        "exit-on-epipe": "~1.0.1",
-        "fflate": "^0.3.8",
         "ssf": "~0.11.2",
         "wmf": "~1.0.1",
         "word": "~0.3.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
-        }
       }
     },
     "xml-name-validator": {

services/frontend/package.json

@@ -6,37 +6,40 @@
     "build": "DISABLE_ESLINT_PLUGIN=true react-scripts build"
   },
   "dependencies": {
-    "@reduxjs/toolkit": "^1.6.2",
-    "@sentry/browser": "^6.9.0",
-    "@sentry/tracing": "^6.11.0",
-    "axios": "^0.21.2",
+    "@reduxjs/toolkit": "^1.8.0",
+    "@sentry/browser": "^6.18.2",
+    "@sentry/tracing": "^6.18.2",
+    "axios": "^0.21.4",
     "formik": "^2.2.9",
-    "highcharts": "^9.1.2",
+    "highcharts": "^9.3.3",
     "highcharts-custom-events": "^3.0.10",
     "highcharts-exporting": "^0.1.7",
     "history": "^4.10.1",
-    "immer": "^9.0.7",
+    "immer": "^9.0.12",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "path-to-regexp": "^0.1.7",
     "piwik-react-router": "^0.12.1",
-    "prop-types": "^15.7.2",
-    "qs": "^6.10.1",
+    "prop-types": "^15.8.1",
+    "qs": "^6.10.3",
     "query-string": "^6.14.1",
     "react": "^16.14.0",
-    "react-datetime": "^3.0.4",
+    "react-datetime": "^3.1.1",
     "react-dom": "^16.14.0",
     "react-highcharts": "^16.1.0",
-    "react-markdown": "^6.0.2",
+    "react-markdown": "^6.0.3",
+    "react-range": "^1.8.12",
     "react-redux": "^7.2.6",
-    "react-router-dom": "^5.2.0",
+    "react-reverse-portal": "^2.1.0",
+    "react-router-dom": "^5.3.0",
     "react-scripts": "4.0.3",
     "react-scroll-to-component": "^1.0.2",
     "semantic-ui-css": "^2.4.1",
-    "semantic-ui-react": "^2.0.3",
-    "unfuck-spa-shibboleth-session": "^3.1.3",
+    "semantic-ui-react": "^2.1.2",
+    "unfuck-spa-shibboleth-session": "^3.1.4",
+    "use-context-selector": "^1.3.9",
     "uuid": "^3.4.0",
-    "xlsx": "^0.17.0"
+    "xlsx": "^0.17.5"
   },
   "proxy": "http://backend:8080",
   "browserslist": {

services/frontend/src/apiConnection/index.js

@@ -107,7 +107,7 @@ export const handleRequest = store => next => async action => {
 // All tags used for invalidating cache must be defined here
 export const RTKApi = createApi({
   reducerPath: 'api',
-  tagTypes: ['StudyGuidanceGroups'],
+  tagTypes: ['StudyGuidanceGroups', 'Semester'],
   baseQuery: fetchBaseQuery({
     baseUrl: apiBasePath,
     prepareHeaders: headers => {

services/frontend/src/common/InfoToolTips/coolDataScience.js

@@ -6,9 +6,9 @@ export default {
   
   **4 vuoden tahdissa** olevat opiskelijat 45op × ((tämä päivä - aloituspäivä) / 365) ≤ opiskelijan opintopisteet,
   
-  **ei tahdissa** = (kaikki opiskelijat - 3v - 4v - peruutettu).
+  **ei tahdissa** = (kaikki opiskelijat - 3v - 4v - passiivinen).
 
-  **peruutettu**, jos opinto-oikeus merkattu perutuksi
+  **passiivinen**, jos opinto-oikeus on päättynyt tai opiskelija on laiminlyönyt ilmoittautumisen tälle lukukaudelle, eikä opiskelija ole vielä valmistunut. 
     
   **Include only at least once enrolled students** suodattaa pois opiskelijat jotka eivät ole ollenkaan ilmoittautunut. 
   Vakiona opiskelijat jotka eivät ole ilmoittautunut millekkään lukuvuodelle (läsnä tai poissa olevaksi)
@@ -24,9 +24,9 @@ export default {
   
   **4 vuoden tahdissa** olevat opiskelijat 45op × ((tämä päivä - aloituspäivä) / 365) ≤ opiskelijan opintopisteet,
   
-  **ei tahdissa** = (kaikki opiskelijat - 3v - 4v - peruutettu).
+  **ei tahdissa** = (kaikki opiskelijat - 3v - 4v - passiivinen).
 
-  **peruutettu**, jos opinto-oikeus merkattu perutuksi
+  **passiivinen**, jos opinto-oikeus on päättynyt tai opiskelija on laiminlyönyt ilmoittautumisen tälle lukukaudelle, eikä opiskelija ole vielä valmistunut. 
   
   **Include only at least once enrolled students** suodattaa pois opiskelijat,
   jotka eivät ole ollenkaan ilmoittautunut. Vakiona opiskelijat, jotka eivät ole ilmoittautunut millekkään lukuvuodelle (läsnä tai poissa olevaksi) on sisällytetty laskuihin.
@@ -41,11 +41,11 @@ export default {
   
   **4 vuoden tahdissa** olevat opiskelijat 45op × ((tarkastuspäivä - aloituspäivä) / 365) ≤ opiskelijan opintopisteet,
 
-  **ei tahdissa** = (kaikki opiskelijat - 3v - 4v - peruutettu). 
+  **ei tahdissa** = (kaikki opiskelijat - 3v - 4v - passiivinen). 
   
   **Tarkastuspäivät** ovat 31.7, 30.11 ja 1.4 joka vuodelle.
 
-  **peruutettu**, jos opinto-oikeus merkattu perutuksi
+  **passiivinen**, jos opinto-oikeus on päättynyt tai opiskelija on laiminlyönyt ilmoittautumisen tälle lukukaudelle, eikä opiskelija ole vielä valmistunut. 
 
   **Include attainments attained before the studyright start** laskee mukaan opiskelijan ennen opinto-oikeuden alkua saadut opintopisteet.
   Vakiona opintopisteet ennen opinto-oikeutta suodatetaan pois.

services/frontend/src/common/InfoToolTips/index.jsx

@@ -1,5 +1,4 @@
 import PopulationStatistics from './populationStatistics'
-import PopulationOverview from './populationOverview'
 import CoolDataScience from './coolDataScience'
 import CourseStatistics from './courseStatistics'
 import CoursePopulation from './coursePopulation'
@@ -7,7 +6,6 @@ import Studyprogramme from './studyprogramme'
 
 export default {
   PopulationStatistics,
-  PopulationOverview,
   CoolDataScience,
   CourseStatistics,
   CoursePopulation,

services/frontend/src/common/InfoToolTips/populationOverview.js

@@ -1,24 +0,0 @@
-export default {
-  PopulationProgress: `Tämä koontisivu sisältää koulutusohjelman kaikkien opiskelijoiden perustiedot lukuvuosittain. Luvut perustuvat opinto-oikeuksiin kyseisessä ohjelmassa.
-
-  Population progress:
-  Vuosittain ohjelmassa aloittaneet, ohjelman keskeyttäneet / peruneet sekä ohjelmaan siirtyneet opiskelijat. 
-  Huomattavaa on, että sama opiskelija voi olla kahdessa luokassa, jos hän on esimerkiksi aloittanut opinnot jo, mutta keskeyttänyt ne lukuvuoden aikana.
-  Tarkemmat tiedot saat esille klikkaamalla nuolta kunkin lukuvuoden kohdalla.`,
-  YearlyProductivity: `
-  Yearly productivity:
-  Koulutusohjelman kunakin kalenterivuonna tuottamat opintopisteet, valmistuneiden määrän, ohjelman pääaineopiskelijoiden
-  opintopisteet sekä muiden kuin pääaineopiskelijoiden opintopisteet. Mukana on myös kuhunkin koulutusohjelmaan hyväksiluetut opintopisteet.
-  
-  Vanhojen koulutusohjelmien lakkauttaminen ja opiskelijoiden siirtäminen uusiin ohjelmiin voi aiheuttaa tavallista suuremmat opintopistemäärät lukuvuodelle 2020-2021.`,
-  Year: `Lukuvuosi`,
-  Students: `Opiskelijat, jotka ovat koulutusohjelmassa aloittaneet, opinto-oikeutensa peruneet sekä koulutusohjelmaan tai siitä pois siirtyneet.`,
-  Started: `Koulutusohjelmassa kunakin lukuvuonna aloittaneet opiskelijat. EI sisällä ohjelmaan siirtyneitä opiskelijoita.`,
-  Cancelled: `Koulutusohjelmaan oikeuttavan opinto-oikeutensa kunakin lukuvuonna peruttaneet`,
-  Graduated: `Tiettynä lukuvuonna aloittaneista opiskelijoista on valmistunut`,
-  Transferred: `Koulutusohjelmaan kyseisenä lukuvuonna siirtyneet opiskelijat. 
-  
-  Vanhojen koulutusohjelmien lakkauttaminen aiheuttaa tavallista suuremmat siirtoluvut lukuvuodelle 2020-2021.`,
-  Credits: `Kunakin vuonna aloittaneista opiskelijoista ne, jotka ovat ylittäneet tietyn opintopisterajapyykin`,
-  Thesis: `Loppututkielman kirjoittaneiden määrä`,
-}

services/frontend/src/common/InfoToolTips/populationStatistics.js

@@ -1,7 +1,7 @@
 export default {
   Advanced: `**Semesters:**  Jos haluaa tarkastella vain syyslukukaudella tai kevätlukukaudella ilmoittautuneita, haluttu ajanjakso valitaan tästä.
 
-  **Include:** Koulutusohjelmapopulaatiosta on oletusarvoisesti suodatettu pois vaihto-opiskelijat, tutkinnonsuoritusoikeudesta luopuneet ja erillisopinto-oikeudella opiskelevat. Näitä ryhmiä voi sisällyttää mukaan lisäämällä ruksin haluamaansa kohtaan.`,
+  **Include:** Koulutusohjelmapopulaatiosta on oletusarvoisesti suodatettu pois vaihto-opiskelijat ja erillisopinto-oikeudella opiskelevat. Näitä ryhmiä voi sisällyttää mukaan lisäämällä ruksin haluamaansa kohtaan.`,
   QueryCard: `**Valitun koulutusohjelmavuosikurssin perustiedot.**
   
   **Sample size** luku sisältää läsnä- ja poissaolevaksi ilmoittautuneet opiskelijat, muttei "excludes"-ryhmiä, jotka voi määritellä "advanced settings" -kohdasta.

services/frontend/src/common/InfoToolTips/studyprogramme.js

@@ -4,11 +4,11 @@ export default {
   Calendar year: Näyttää tilastot kalenterivuosille jaoteltuna, esimerkiksi 1.1.2019-31.12.2019 
   `,
   StudentToggle: `
-  All studyrights included: Valinnassa ovat mukana vaihto-opiskelijat, erillisoikeudella opiskelevat, opintonsa keskeyttäneet opiskelijat, ohjelmaan siirtyneet opiskelijat sekä ohjelmasta pois siirtyneet opiskelijat.
+  All studyrights: Valinnassa ovat mukana vaihto-opiskelijat, erillisoikeudella opiskelevat ja ohjelmaan siirtyneet opiskelijat sekä ohjelmasta pois siirtyneet opiskelijat.
   
   Special studyrights excluded: Valinnasta ja kaikista luvuista on poissuljettu kaikki edellä mainitut erikoisryhmät.
   `,
-  GradToggle: `
+  GraduatedToggle: `
   Graduated included: Valinnassa ovat mukana ohjelmasta jo valmistuneet opiskelijat.
   
   Graduated excluded: Valinnasta on poistettu ohjelmasta jo valmistuneet opiskelijat.
@@ -18,9 +18,7 @@ export default {
 
   **Started studying**: Sisältää kyseisenä vuonna aloittaneet opiskelijat (aloitetut opinto-oikeudet) riippumatta siitä, minä vuonna kyseinen opiskeluoikeus on myönnetty. Opiskelija on myös voinut myöhemmin keskeyttää opintonsa tai siirtyä pois ohjelmasta.\n
   **Graduated**: Sisältää kyseisenä vuonna valmistuneet opiskelijat riippumatta siitä, minä vuonna opiskeluoikeus ohjelmaan on myönnetty. Jaottelu on tehty opinto-oikeuden päättymispäivän (=valmistumispäivän) perusteella.
-  
-  **Cancelled**: Sisältää kyseisenä vuonna perutut opiskeluoikeudet riippumatta siitä, onko kyseinen opiskelija ikinä edes alkanut opiskelemaan ohjelmassa tai opiskelun aloitusvuodesta.
-  
+    
   **Transferred away**: Sisältää kyseisenä vuonna pois ohjelmasta siirtyneet opiskelijat (opinto-oikeudet). Sama opiskelija voi esiintyä tilastoissa useana vuonna, mikäli hän on siirtynyt ohjelmaan ja siitä pois useasti.
   
   **Transferred to**: Sisältää kyseisenä vuonna ohjelmaan siirtyneet opiskelijat (opinto-oikeudet).
@@ -48,10 +46,12 @@ export default {
   **Mean time**: Näyttää kyseisenä vuonna valmistuneiden opiskelijoiden opintojen keston **keskiarvon** kuukausina. Luku sisältää mahdolliset poissaolokuukaudet.
   
   n = **valmistuneet opiskelijat / kaikki ohjelmassa kyseisenä vuonna alkaneet opinto-oikeudet**. Kandiohjelmissa tavoiteaika on 36 kk, maisteriohjelmissa 24 kk`,
-  ProgrammesAfterGraduation: `
-  Sisältää maisteriohjelmat, joissa tämän kandiohjelman opiskelijat ovat aloittaneet valmistuttuaan kandeiksi. Vuosijaottelu on tehty maisteriohjelmassa aloittamisen perusteella.
+  ProgrammesBeforeOrAfter: `
+  **Mikäli valittuna on kandiohjelma:** Sisältää maisteriohjelmat, joissa tämän kandiohjelman opiskelijat ovat aloittaneet valmistuttuaan kandeiksi. Vuosijaottelu on tehty maisteriohjelmassa aloittamisen perusteella.
 
-  Mukana ovat **vain valmistuneet opiskelijat ja vain maisteriohjelmat**.
+  Mukana ovat **vain valmistuneet opiskelijat ja vain maisteriohjelmat.**
+
+  **Mikäli valittuna on maisteriohjelma:** Sisältää kandiohjelmat, joissa tämän ohjelman opiskelijat ovat opiskelleet ennen tuloaan maisteriohjelmaan. Vuosijaottelu on tehty maisteriohjelmassa aloittamisen perusteella.
   `,
   StudytrackOverview: `  
   Kuvaa koulutusohjelman kyseiseen ohjelmaan opinto-oikeudella varustettujen opiskelijoiden etenemistä opintopisteissä mitattuna. Esimerkiksi 2020-2021 aloittaneiden opintopistejakaumaa.
@@ -59,8 +59,10 @@ export default {
   HUOM!
   **All** Sisältää kaikki opiskelijat, joiden opinto-oikeudella on aloituspäivä kyseisenä vuonna, riippumatta siitä, onko opiskelija aloittanut opiskelemaan ko. vuonna.
   **Started studying** Sisältää kaikki opiskelijat, jotka ovat aloittaneet opiskelemaan koulutusohjelmassa kyseisenä lukuvuonna.
+  **Inactive** Sisältää kaikki opinto-oikeudet, jotka ovat alkaneet kyseisenä vuonna, mutta jotka ovat sittemmin vanhentuneet ilman, että opiskelija on valmistunut ohjelmasta. Sisältää myös opinto-oikeudet,
+  joissa opiskelija on laiminlyönyt ilmoittautumisen tälle lukukaudelle.
   
-  Mukana ovat oletusarvoisesti myös vaihto-opiskelijat, tutkinnonsuoritusoikeudesta luopuneet ja erillisopinto-oikeudella opiskelevat.
+  Mukana ovat oletusarvoisesti myös vaihto-opiskelijat, ohjelmaan ja siitä pois siirtyneet opiskelijat sekä erillisopinto-oikeudella opiskelevat.
   Taulukko näyttää myös näistä opiskelijoista miesten, naisten ja suomalaisten osuudet sekä valmistuneiden määrän. 
 
   Yläosan valikosta on mahdollista valita tarkasteluun yhden opintosuunnan opiskelijat. Sekä opiskelijoiden yleistiedot että edistyminen opintopisteittäin
@@ -68,7 +70,10 @@ export default {
   `,
   StudytrackProgress: `
   Kuvaa koulutusohjelman kyseiseen ohjelmaan opinto-oikeudella varustettujen opiskelijoiden etenemistä opintopisteissä mitattuna. Esimerkiksi 2020-2021 aloittaneiden opintopistejakaumaa.
-  Mukana ovat oletusarvoisesti myös vaihto-opiskelijat, tutkinnonsuoritusoikeudesta luopuneet ja erillisopinto-oikeudella opiskelevat.   
+  
+  HUOM! Mukana ovat myös muuhun kuin valittuun koulutusohjelmaan tai opintosuuntaan tehdyt opintopisteet.
+
+  Mukana ovat oletusarvoisesti myös vaihto-opiskelijat, erillisopinto-oikeudella opiskelevat ja ohjelmaan siirtyneet.   
 
   Mikäli yläosan valikosta valittuna on jokin tietty opintosuunta, myös nämä graafit ja taulukot kuvaavat kyseisen opintosuunnan opiskelijoita.    
   `,

services/frontend/src/common/hooks.js

@@ -271,6 +271,55 @@ export const useLanguage = () => {
   return language
 }
 
+export const useDebounce = (value, timeout, onChange) => {
+  const [innerValue, setInnerValue] = useState(value)
+  const [dirty, setDirty] = useState(false)
+
+  const timeoutRef = useRef(null)
+
+  useEffect(() => {
+    if (!isEqual(value, innerValue)) {
+      setInnerValue(value)
+      setDirty(false)
+
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current)
+        timeoutRef.current = null
+      }
+    }
+  }, [value])
+
+  const setValue = useCallback(
+    value => {
+      setInnerValue(value)
+      setDirty(true)
+
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current)
+        timeoutRef.current = null
+      }
+
+      timeoutRef.current = setTimeout(() => {
+        onChange(value)
+        setDirty(false)
+      }, timeout)
+    },
+    [innerValue, setInnerValue, timeoutRef, onChange, timeout]
+  )
+
+  const flush = useCallback(() => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current)
+      timeoutRef.current = null
+    }
+
+    onChange(innerValue)
+    setDirty(false)
+  }, [timeoutRef, onChange, innerValue])
+
+  return [innerValue, setValue, flush, dirty]
+}
+
 // From: https://www.joshwcomeau.com/snippets/react-hooks/use-toggle/
 export const useToggle = (initialValue = false) => {
   const [value, setValue] = useState(initialValue)

services/frontend/src/common/index.js

@@ -101,6 +101,22 @@ export const getTextIn = (texts, language) => {
   return null
 }
 
+export const getUnifyTextIn = unifyCourses => {
+  switch (unifyCourses) {
+    case 'reqularStats':
+      return '(normal)'
+
+    case 'openStats':
+      return '(open)'
+
+    case 'unifyStats':
+      return '(open and normal)'
+
+    default:
+      return ''
+  }
+}
+
 export const cancelablePromise = promise => {
   let hasCanceled = false
 

services/frontend/src/components/CoolDataScience/ProtoC.jsx

@@ -124,7 +124,7 @@ const makeClickableChartConfig = (sortedData, onPointClicked, org) => {
   const series = [
     {
       color: '#7f8c8d',
-      name: 'tällä hetkellä peruutettu',
+      name: 'tällä hetkellä passiivinen',
       data: sortedData.map(data => ({
         y: data.currentlyCancelled,
         // pass % of total as z so we can display it in the tooltip
@@ -311,7 +311,7 @@ const makeNonClickableChartConfig = programme => {
   const series = [
     {
       color: '#7f8c8d',
-      name: 'tällä hetkellä peruutettu',
+      name: 'tällä hetkellä passiivinen',
       data: programme.studytracks.map(p => ({
         y: p.currentlyCancelled,
         // pass % of total as z so we can display it in the tooltip
@@ -450,7 +450,7 @@ const sorters = {
   'ei tahdissa': (a, b) =>
     (countNotInTarget(a) + a.currentlyCancelled) / a.totalStudents -
     (countNotInTarget(b) + b.currentlyCancelled) / b.totalStudents,
-  peruutettu: (a, b) => a.currentlyCancelled / a.totalStudents - b.currentlyCancelled / b.totalStudents
+  passiivinen: (a, b) => a.currentlyCancelled / a.totalStudents - b.currentlyCancelled / b.totalStudents
 }
 
 const OrgChart = React.memo(({ orgs, onOrgClicked }) => {
@@ -606,7 +606,7 @@ const ProtoC = ({
           <Icon style={{ marginLeft: '10px', color: '#6ab04c' }} name="circle" size="small" /> 3v tahdissa
           <Icon style={{ marginLeft: '10px', color: '#f9ca24' }} name="circle" size="small" /> 4v tahdissa
           <Icon style={{ marginLeft: '10px', color: '#ff7979' }} name="circle" size="small" /> ei tahdissa
-          <Icon style={{ marginLeft: '10px', color: '#7f8c8d' }} name="circle" size="small" /> tällä hetkellä peruutettu
+          <Icon style={{ marginLeft: '10px', color: '#7f8c8d' }} name="circle" size="small" /> tällä hetkellä passiivinen
         </span>
       </div>
       <div align="center">

services/frontend/src/components/CoolDataScience/ProtoC2.jsx

@@ -111,7 +111,7 @@ const makeConfig = (data, sorter, type = 'column', clickHandler) => {
   const orgSeries = [
     {
       color: '#7f8c8d',
-      name: 'tällä hetkellä peruutettu',
+      name: 'tällä hetkellä passiivinen',
       data: data.map(entry => ({
         y: entry.currentlyCancelled,
         // pass % of total as z so we can display it in the tooltip
@@ -264,7 +264,7 @@ const sorters = {
   '4v tahti': (a, b) => a.students4y - b.students4y,
   '3v tahti': (a, b) => a.students3y - b.students3y,
   'ei tahdissa': (a, b) => countNotInTarget(a) + a.currentlyCancelled - (countNotInTarget(b) + b.currentlyCancelled),
-  peruutettu: (a, b) => a.currentlyCancelled - b.currentlyCancelled,
+  passiivinen: (a, b) => a.currentlyCancelled - b.currentlyCancelled,
 }
 
 const ClickableChart = React.memo(({ data, sorter, isSideways, clickHandler }) => {

services/frontend/src/components/CoursePopulation/CoursePopulationGradeDist/index.jsx

@@ -10,7 +10,7 @@ const CoursePopulationCreditDist = ({ singleCourseStats, pending, selectedStuden
   const [courseGrades, setCourseGrades] = useState([])
 
   useEffect(() => {
-    if (samples && singleCourseStats.alternatives) {
+    if (samples && singleCourseStats?.unifyStats?.alternatives) {
       const filteredGradeArray = []
       const grades = {}
 

services/frontend/src/components/CoursePopulation/index.jsx

@@ -10,7 +10,7 @@ import { getCoursePopulation } from '../../redux/populations'
 import { getSingleCourseStats } from '../../redux/singleCourseStats'
 import { useGetStudentListCourseStatisticsQuery } from '../../redux/populationCourses'
 import { getFaculties } from '../../redux/faculties'
-import { getSemesters } from '../../redux/semesters'
+import { useGetSemestersQuery } from '../../redux/semesters'
 import { getElementDetails } from '../../redux/elementdetails'
 import PopulationStudents from '../PopulationStudents'
 import CoursePopulationGradeDist from './CoursePopulationGradeDist'
@@ -19,7 +19,7 @@ import CoursePopulationCreditGainTable from './CoursePopulationCreditGainTable'
 import CustomPopulationProgrammeDist from '../CustomPopulation/CustomPopulationProgrammeDist'
 import CustomPopulationCourses from '../CustomPopulation/CustomPopulationCourses'
 import ProgressBar from '../ProgressBar'
-import { getStudentToTargetCourseDateMap, getTextIn } from '../../common'
+import { getStudentToTargetCourseDateMap, getTextIn, getUnifyTextIn } from '../../common'
 import { useProgress, useTitle } from '../../common/hooks'
 import infotooltips from '../../common/InfoToolTips'
 import {
@@ -44,12 +44,10 @@ const CoursePopulation = ({
   pending,
   history,
   courseData,
-  getSemestersDispatch,
-  semesters,
   getFacultiesDispatch,
+  unifyCourses,
 }) => {
   const { language } = useLanguage()
-
   const [codes, setCodes] = useState([])
   const [headerYears, setYears] = useState('')
   const [dateFrom, setDateFrom] = useState(null)
@@ -75,9 +73,10 @@ const CoursePopulation = ({
     studentNumbers: studentData.students ? studentData.students.map(student => student.studentNumber) : [],
   })
 
+  const { data: semesters = {} } = useGetSemestersQuery()
+
   useEffect(() => {
     getElementDetails()
-    getSemestersDispatch()
   }, [])
 
   useEffect(() => {
@@ -100,9 +99,9 @@ const CoursePopulation = ({
 
   useEffect(() => {
     if (semesters.years && semesters.semesters) {
-      const { coursecodes, from, to, years, years2, separate } = queryParamsFromUrl(history.location)
+      const { coursecodes, from, to, years, years2, separate, unifyCourses } = queryParamsFromUrl(history.location)
       const parsedCourseCodes = JSON.parse(coursecodes)
-      getCoursePopulationDispatch({ coursecodes, from, to, onProgress, separate })
+      getCoursePopulationDispatch({ coursecodes, from, to, onProgress, separate, unifyCourses })
       getSingleCourseStatsDispatch({
         fromYear: from,
         toYear: to,
@@ -124,7 +123,8 @@ const CoursePopulation = ({
     }
   }, [semesters])
 
-  const header = courseData ? `${getTextIn(courseData.name, language)} ${headerYears}` : null
+  const avoin = getUnifyTextIn(unifyCourses)
+  const header = courseData ? `${getTextIn(courseData.name, language)} ${headerYears} ${avoin}` : null
 
   const subHeader = codes.join(', ')
 
@@ -364,12 +364,12 @@ const CustomPopulationCoursesWrapper = props => {
   return <CustomPopulationCourses {...props} courses={courseStatistics} />
 }
 
-const mapStateToProps = ({ singleCourseStats, populations, semesters }) => {
+const mapStateToProps = ({ singleCourseStats, populations, courseSearch }) => {
   return {
     studentData: populations.data,
     pending: populations.pending,
-    courseData: singleCourseStats.stats || {},
-    semesters: semesters.data,
+    courseData: singleCourseStats.stats?.[courseSearch.openOrReqular],
+    unifyCourses: courseSearch.openOrReqular,
     elementDetails: populations?.data?.elementdetails?.data,
   }
 }
@@ -378,7 +378,6 @@ export default withRouter(
   connect(mapStateToProps, {
     getCoursePopulationDispatch: getCoursePopulation,
     getSingleCourseStatsDispatch: getSingleCourseStats,
-    getSemestersDispatch: getSemesters,
     getFacultiesDispatch: getFaculties,
     getElementDetails,
   })(CoursePopulation)

services/frontend/src/components/CourseStatistics/FacultyLevelStatistics/index.jsx

@@ -84,11 +84,13 @@ const CourseTable = ({ course, courseInstance, language, selectedYear }) => {
 
 const FacultyLevelStatistics = () => {
   const { language: activeLanguage } = useLanguage()
+  const openOrReqular = useSelector(state => state.courseSearch.openOrReqular)
   const { courseStats, language } = useSelector(({ courseStats }) => ({
     courseStats: courseStats.data,
     language: activeLanguage,
   }))
-  const yearcodes = uniq(flatten(Object.values(courseStats).map(c => Object.keys(c.facultyStats))))
+
+  const yearcodes = uniq(flatten(Object.values(courseStats).map(c => Object.keys(c[openOrReqular].facultyStats))))
     .sort()
     .reverse()
 
@@ -103,13 +105,13 @@ const FacultyLevelStatistics = () => {
   const yearsCourseStats = Object.values(courseStats)
     .map(course => ({
       course,
-      courseInstance: course.facultyStats[selectedYear],
+      courseInstance: course[openOrReqular].facultyStats[selectedYear],
     }))
     .sort((a, b) => (a.courseInstance === undefined) - (b.courseInstance === undefined))
 
   const courseTables = yearsCourseStats.map(({ course, courseInstance }) => (
     <CourseTable
-      course={course}
+      course={course[openOrReqular]}
       courseInstance={courseInstance}
       language={language}
       key={course.coursecode}

services/frontend/src/components/CourseStatistics/ResultTabs/Panes/Tables/attempts.jsx

@@ -1,22 +1,25 @@
 import React from 'react'
 import qs from 'query-string'
-import _, { uniq } from 'lodash'
+import _, { uniq, flatten } from 'lodash'
 import { Link } from 'react-router-dom'
 import { connect } from 'react-redux'
 import { Header, Icon, Item } from 'semantic-ui-react'
 
 import SortableTable from '../../../../SortableTable'
-import { defineCellColor, getGradeSpread, getThesisGradeSpread, isThesisGrades, THESIS_GRADE_KEYS } from '../util'
+import { getGradeSpread, getThesisGradeSpread, isThesisGrades, sortGrades } from '../util'
 
-const getSortableColumn = (key, title, getRowVal, getRowContent) => ({
-  key,
-  title,
-  getRowVal,
-  getRowContent,
-  getCellProps: s => defineCellColor(s),
+const getSortableColumn = opts => ({
+  filterType: 'range',
+  cellProps: s => ({
+    style: {
+      textAlign: 'right',
+      color: s.rowObfuscated ? 'gray' : 'inherit',
+    },
+  }),
+  ...opts,
 })
 
-const getTableData = (stats, notThesisGrades, isRelative) =>
+const getTableData = (stats, useThesisGrades, isRelative) =>
   stats.map(stat => {
     const {
       name,
@@ -27,9 +30,9 @@ const getTableData = (stats, notThesisGrades, isRelative) =>
     } = stat
 
     const attempts = Object.values(grades).reduce((cur, acc) => acc + cur, 0)
-    const gradeSpread = notThesisGrades
-      ? getGradeSpread([grades], isRelative)
-      : getThesisGradeSpread([grades], isRelative)
+    const gradeSpread = useThesisGrades
+      ? getThesisGradeSpread([grades], isRelative)
+      : getGradeSpread([grades], isRelative)
 
     return {
       name,
@@ -37,6 +40,8 @@ const getTableData = (stats, notThesisGrades, isRelative) =>
       coursecode,
       passed: stat.attempts.categories.passed,
       failed: stat.attempts.categories.failed,
+      enrollmentsByState: stat.attempts.enrollmentsByState,
+      totalEnrollments: stat.attempts.totalEnrollments,
       passRate: stat.attempts.passRate,
       attempts,
       rowObfuscated,
@@ -44,35 +49,49 @@ const getTableData = (stats, notThesisGrades, isRelative) =>
     }
   })
 
-const includesHTOrTT = stats =>
-  stats.some(({ attempts }) => ['HT', 'TT'].some(grade => Object.keys(attempts.grades).includes(grade)))
+const resolveGrades = stats => {
+  const failedGrades = ['eisa', 'hyl.', 'hyl', '0', 'luop']
+  const otherPassedGrades = ['hyv.', 'hyv']
 
-const getGradeColumns = (notThesisGrades, addHTAndTT) => {
-  if (!notThesisGrades) return THESIS_GRADE_KEYS.map(k => getSortableColumn(k, k, s => (s.rowObfuscated ? 'NA' : s[k])))
-  const columns = [
-    getSortableColumn('0', '0', s => (s.rowObfuscated ? 'NA' : s['0'])),
-    getSortableColumn('1', '1', s => (s.rowObfuscated ? 'NA' : s['1'])),
-    getSortableColumn('2', '2', s => (s.rowObfuscated ? 'NA' : s['2'])),
-    getSortableColumn('3', '3', s => (s.rowObfuscated ? 'NA' : s['3'])),
-    getSortableColumn('4', '4', s => (s.rowObfuscated ? 'NA' : s['4'])),
-    getSortableColumn('5', '5', s => (s.rowObfuscated ? 'NA' : s['5'])),
-    getSortableColumn('OTHER_PASSED', 'Other passed', s => (s.rowObfuscated ? 'NA' : s['Hyv.'])),
+  const allGrades = [
+    '0',
+    ...flatten(
+      stats.map(({ attempts }) =>
+        [...Object.keys(attempts.grades)].map(grade => {
+          const parsedGrade = Number(grade) ? Math.round(Number(grade)).toString() : grade
+          if (failedGrades.includes(parsedGrade.toLowerCase())) return '0'
+          if (parsedGrade === 'LA') return 'LUB' // merge LA and LUB grades
+          return parsedGrade
+        })
+      )
+    ),
   ]
-  if (addHTAndTT)
-    columns.splice(
-      6,
-      0,
-      getSortableColumn('HT', 'HT', s => (s.rowObfuscated ? 'NA' : s.HT)),
-      getSortableColumn('TT', 'TT', s => (s.rowObfuscated ? 'NA' : s.TT))
-    )
-  return columns
+
+  // If any of grades 1-5 is present, make sure that full the grade scale is present
+  if (allGrades.filter(grade => ['1', '2', '3', '4', '5'].includes(grade)).length)
+    allGrades.push(...['1', '2', '3', '4', '5'])
+  const grades = [...new Set(allGrades)]
+
+  return grades.sort(sortGrades).map(grade => {
+    if (grade === '0') return { key: grade, title: 'Failed' }
+    if (otherPassedGrades.includes(grade.toLowerCase())) return { key: grade, title: 'Other passed' }
+    return { key: grade, title: grade.charAt(0).toUpperCase() + grade.slice(1) }
+  })
 }
 
+const getGradeColumns = grades =>
+  grades.map(({ key, title }) =>
+    getSortableColumn({
+      key,
+      title,
+      getRowVal: s => (s.rowObfuscated ? 'NA' : s[key] || 0),
+    })
+  )
+
 const AttemptsTable = ({
   data: { stats, name },
-  settings: { showGrades },
+  settings: { showGrades, showEnrollments, separate },
   alternatives,
-  separate,
   isRelative,
   userHasAccessToAllStats,
   headerVisible = false,
@@ -80,7 +99,7 @@ const AttemptsTable = ({
   const {
     attempts: { grades },
   } = stats[0]
-  const notThesisGrades = !isThesisGrades(grades)
+  const useThesisGrades = isThesisGrades(grades)
 
   const showPopulation = (yearcode, years) => {
     const queryObject = {
@@ -95,46 +114,104 @@ const AttemptsTable = ({
   }
 
   const timeColumn = {
-    ...getSortableColumn(
-      'TIME',
-      'Time',
-      s => s.code,
-      s => (
-        <div>
-          {s.name}
-          {s.name === 'Total' && !userHasAccessToAllStats && <strong>*</strong>}
-          {s.name !== 'Total' && userHasAccessToAllStats && (
+    key: 'TIME-PARENT',
+    merge: true,
+    mergeHeader: true,
+    children: [
+      getSortableColumn({
+        key: 'TIME',
+        title: 'Time',
+        filterType: 'default',
+        cellProps: {},
+        getRowVal: s => s.code,
+        getRowContent: s => (
+          <div>
+            {s.name}
+            {s.name === 'Total' && !userHasAccessToAllStats && <strong>*</strong>}
+          </div>
+        ),
+      }),
+      {
+        key: 'TIME-ICON',
+        export: false,
+        getRowContent: s =>
+          s.name !== 'Total' &&
+          userHasAccessToAllStats && (
             <Item as={Link} to={showPopulation(s.code, s.name, s)}>
               <Icon name="level up alternate" />
             </Item>
-          )}
-        </div>
-      )
-    ),
+          ),
+      },
+    ],
   }
 
   let columns = [
     timeColumn,
-    getSortableColumn('ATTEMPTS', 'Total attempts', s => (s.rowObfuscated ? '5 or less students' : s.attempts)),
-    getSortableColumn('PASSED', 'Passed', s => (s.rowObfuscated ? 'NA' : s.passed)),
-    getSortableColumn('FAILED', 'Failed', s => (s.rowObfuscated ? 'NA' : s.failed)),
-    getSortableColumn(
-      'PASSRATE',
-      'Pass rate',
-      s => (s.rowObfuscated ? 'NA' : s.passRate),
-      s => (s.rowObfuscated ? 'NA' : `${Number(s.passRate || 0).toFixed(2)} %`)
-    ),
+    getSortableColumn({
+      key: 'ATTEMPTS',
+      title: 'Total attempts',
+      getRowVal: s => (s.rowObfuscated ? '5 or less students' : s.attempts),
+    }),
+    getSortableColumn({
+      key: 'PASSED',
+      title: 'Passed',
+      getRowVal: s => (s.rowObfuscated ? 'NA' : s.passed),
+    }),
+    getSortableColumn({
+      key: 'FAILED',
+      title: 'Failed',
+      getRowVal: s => (s.rowObfuscated ? 'NA' : s.failed),
+    }),
+    getSortableColumn({
+      key: 'PASSRATE',
+      title: 'Pass rate',
+      getRowVal: s => (s.rowObfuscated ? 'NA' : s.passRate),
+      getRowContent: s => (s.rowObfuscated ? 'NA' : `${Number(s.passRate || 0).toFixed(2)} %`),
+    }),
   ]
 
-  if (showGrades) {
+  if (showGrades)
     columns = [
       timeColumn,
-      getSortableColumn('ATTEMPTS', 'Total attempts', s => (s.rowObfuscated ? '5 or less students' : s.attempts)),
-      ...getGradeColumns(notThesisGrades, includesHTOrTT(stats)),
+      getSortableColumn({
+        key: 'ATTEMPTS',
+        title: 'Total attempts',
+        getRowVal: s => (s.rowObfuscated ? '5 or less students' : s.attempts),
+      }),
+      ...getGradeColumns(resolveGrades(stats)),
+    ]
+
+  if (showEnrollments) {
+    columns = [
+      ...columns,
+      getSortableColumn({
+        key: 'TOTAL_ENROLLMENTS',
+        title: 'Total enrollments',
+        helpText: 'All enrollments, including all rejected and aborted states.',
+        getRowVal: s => (s.rowObfuscated ? 'NA' : s.totalEnrollments),
+      }),
+      getSortableColumn({
+        key: 'ENROLLMENTS_ENROLLED',
+        title: 'Enrolled',
+        helpText: 'All enrollments with enrolled or confirmed state.',
+        getRowVal: s => (s.rowObfuscated ? 'NA' : s.enrollmentsByState.ENROLLED),
+      }),
+      getSortableColumn({
+        key: 'ENROLLMENTS_REJECTED',
+        title: 'Rejected',
+        helpText: 'All enrollments with rejected state.',
+        getRowVal: s => (s.rowObfuscated ? 'NA' : s.enrollmentsByState.REJECTED),
+      }),
+      getSortableColumn({
+        key: 'ENROLLMENTS_ABORTED',
+        title: 'Aborted',
+        helpText: 'All enrollments with aborted by student or teacher state.',
+        getRowVal: s => (s.rowObfuscated ? 'NA' : s.enrollmentsByState.ABORTED),
+      }),
     ]
   }
 
-  const data = getTableData(stats, notThesisGrades, isRelative)
+  const data = getTableData(stats, useThesisGrades, isRelative)
 
   return (
     <div>
@@ -144,9 +221,8 @@ const AttemptsTable = ({
         </Header>
       )}
       <SortableTable
-        defaultdescending
-        getRowKey={s => s.code}
-        tableProps={{ celled: true, style: { width: 'auto' } }}
+        title={`Yearly attempt statistics for group ${name}`}
+        defaultSort={['TIME', 'desc']}
         columns={columns}
         data={data}
       />

services/frontend/src/components/CourseStatistics/ResultTabs/Panes/Tables/student.jsx

@@ -4,13 +4,13 @@ import { Link } from 'react-router-dom'
 import { Header, Icon, Item } from 'semantic-ui-react'
 import { connect } from 'react-redux'
 import { uniq } from 'lodash'
-import { shape, string, number, oneOfType, arrayOf, bool } from 'prop-types'
+import { string, object, arrayOf, bool } from 'prop-types'
 import SortableTable from '../../../../SortableTable'
 import { defineCellColor } from '../util'
 
 const formatPercentage = p => `${(p * 100).toFixed(2)} %`
 
-const getColumns = (showDetails, userHasAccessToAllStats, alternatives, separate) => {
+const getColumns = (showDetails, showEnrollments, userHasAccessToAllStats, alternatives, separate, unifyCourses) => {
   const showPopulation = (yearcode, years) => {
     const queryObject = {
       from: yearcode,
@@ -18,6 +18,7 @@ const getColumns = (showDetails, userHasAccessToAllStats, alternatives, separate
       coursecodes: JSON.stringify(uniq(alternatives)),
       years,
       separate,
+      unifyCourses,
     }
     const searchString = qs.stringify(queryObject)
     return `/coursepopulation?${searchString}`
@@ -25,82 +26,181 @@ const getColumns = (showDetails, userHasAccessToAllStats, alternatives, separate
 
   const columns = [
     {
-      key: 'TIME',
-      title: 'Time',
-      getRowVal: s => s.code,
-      getRowContent: s => (
-        <div style={{ whiteSpace: 'nowrap' }}>
-          {s.name}
-          {s.name === 'Total' && !userHasAccessToAllStats && <strong>*</strong>}
-          {s.name !== 'Total' && userHasAccessToAllStats && (
-            <Item as={Link} to={showPopulation(s.code, s.name, s)}>
-              <Icon name="level up alternate" />
-            </Item>
-          )}
-        </div>
-      ),
-      getCellProps: s => defineCellColor(s),
+      key: 'TIME-PARENT',
+      merge: true,
+      mergeHeader: true,
+      children: [
+        {
+          key: 'TIME',
+          title: 'Time',
+          getRowVal: s => (s.name === 'Total' ? -1 : s.name),
+          formatValue: v => (v === -1 ? 'Total' : v),
+          getRowExportVal: s => s.name,
+          getRowContent: s => (
+            <div style={{ whiteSpace: 'nowrap' }}>
+              {s.name}
+              {s.name === 'Total' && !userHasAccessToAllStats && <strong>*</strong>}
+            </div>
+          ),
+        },
+        {
+          key: 'TIME-ICON',
+          export: false,
+          getRowContent: s => (
+            <>
+              {s.name !== 'Total' && userHasAccessToAllStats && (
+                <Item as={Link} to={showPopulation(s.code, s.name, s)}>
+                  <Icon name="level up alternate" />
+                </Item>
+              )}
+            </>
+          ),
+        },
+      ],
     },
     {
       key: 'TOTAL',
-      title: 'Total Students',
-      getRowVal: s => (s.rowObfuscated ? '5 or less students' : s.students.total),
+      title: showEnrollments ? 'Total Students' : 'Graded students',
+      helpText: showEnrollments ? 'Total count of students, including enrolled students with no grade.' : null,
+      cellProps: s => ({
+        style: {
+          textAlign: 'right',
+          color: s.rowObfuscated ? 'gray' : 'inherit',
+        },
+      }),
+      filterType: 'range',
+      getRowVal: s => {
+        if (s.rowObfuscated) return 5
+        if (showEnrollments) return s.students.withEnrollments.total
+        return s.students.total
+      },
+      getRowContent: s => {
+        if (s.rowObfuscated) return '5 or less students'
+        if (showEnrollments) return s.students.withEnrollments.total
+        return s.students.total
+      },
       getCellProps: s => defineCellColor(s),
     },
+    {
+      key: 'TOTAL_PASSED',
+      title: 'Passed',
+      filterType: 'range',
+      getRowVal: s => (s.rowObfuscated ? 'NA' : s.students.totalPassed || 0),
+      cellProps: s => ({
+        style: {
+          textAlign: 'right',
+          color: s.rowObfuscated ? 'gray' : 'inherit',
+        },
+      }),
+    },
+    {
+      key: 'TOTAL_FAILED',
+      title: 'Failed',
+      filterType: 'range',
+      getRowVal: s => (s.rowObfuscated ? 'NA' : s.students.totalFailed || 0),
+      cellProps: s => ({
+        style: {
+          textAlign: 'right',
+          color: s.rowObfuscated ? 'gray' : 'inherit',
+        },
+      }),
+    },
+    {
+      key: 'ENROLLMENTS_MISSING_GRADE',
+      title: 'Enrolled no grade',
+      filterType: 'range',
+      helpText: 'Total count of students with a valid enrollment and no passing or failing grade.',
+      getRowVal: s => (s.rowObfuscated ? 5 : s.students.enrolledStudentsWithNoGrade),
+      getRowContent: s => (s.rowObfuscated ? '5 or less students' : s.students.enrolledStudentsWithNoGrade),
+      cellProps: s => ({
+        style: {
+          textAlign: 'right',
+          color: s.rowObfuscated ? 'gray' : 'inherit',
+        },
+      }),
+      onlyInEnrollmentView: true,
+    },
     {
       key: 'PASS_RATE',
       title: 'Pass-%',
-      getRowVal: s => (s.rowObfuscated ? 'NA' : s.students.passRate),
-      getRowContent: s => (s.rowObfuscated ? 'NA' : formatPercentage(s.students.passRate || 0)),
-      getCellProps: s => defineCellColor(s),
+      getRowVal: s => {
+        if (s.rowObfuscated) return 0
+        if (showEnrollments) return s.students.withEnrollments.passRate * 100
+        return s.students.passRate * 100
+      },
+      getRowContent: s => {
+        if (s.rowObfuscated) return '5 or less students'
+        if (showEnrollments) return formatPercentage(s.students.withEnrollments.passRate)
+        return formatPercentage(s.students.passRate)
+      },
+      filterType: 'range',
+      cellProps: s => ({
+        style: {
+          textAlign: 'right',
+          color: s.rowObfuscated ? 'gray' : 'inherit',
+        },
+      }),
     },
     {
       key: 'PASS_FIRST',
       title: 'On First Attempt',
-      getRowVal: s => (s.rowObfuscated ? 'NA' : s.students.categories.passedFirst || 0),
-      getCellProps: s => defineCellColor(s),
-      headerProps: { style: { borderLeft: '0' } },
+      filterType: 'range',
+      getRowVal: s => (s.rowObfuscated ? 'NA' : (s.students.categories.passedFirst || 0) * 100),
+      cellProps: s => ({
+        style: {
+          textAlign: 'right',
+          color: s.rowObfuscated ? 'gray' : 'inherit',
+        },
+      }),
       onlyInDetailedView: true,
     },
     {
       key: 'PASS_EVENTUALLY',
       title: 'Eventually',
-      getRowVal: s => (s.rowObfuscated ? 'NA' : s.students.categories.passedEventually || 0),
-      getCellProps: s => defineCellColor(s),
-      headerProps: { style: { borderLeft: '0' } },
+      filterType: 'range',
+      getRowVal: s => (s.rowObfuscated ? 'NA' : (s.students.categories.passedEventually || 0) * 100),
+      cellProps: s => ({
+        style: {
+          textAlign: 'right',
+          color: s.rowObfuscated ? 'gray' : 'inherit',
+        },
+      }),
       onlyInDetailedView: true,
     },
     {
       key: 'FAIL_RATE',
       title: 'Fail-%',
-      getRowVal: s => (s.rowObfuscated ? 'NA' : s.students.failRate),
+      filterType: 'range',
+      getRowVal: s => (s.rowObfuscated ? 'NA' : (s.students.failRate || 0) * 100),
       getRowContent: s => (s.rowObfuscated ? 'NA' : formatPercentage(s.students.failRate || 0)),
-      getCellProps: s => defineCellColor(s),
-    },
-    {
-      key: 'NEVER PASSED',
-      title: 'Yet to Pass',
-      getRowVal: s => (s.rowObfuscated ? 'NA' : s.students.categories.neverPassed || 0),
-      getCellProps: s => defineCellColor(s),
-      headerProps: { style: { borderLeft: '0' } },
+      cellProps: s => ({
+        style: {
+          textAlign: 'right',
+          color: s.rowObfuscated ? 'gray' : 'inherit',
+        },
+      }),
       onlyInDetailedView: true,
     },
   ]
 
-  return columns.filter(column => showDetails || !column.onlyInDetailedView)
+  return columns.filter(column => {
+    if (showDetails && column.onlyInDetailedView) return true
+    if (showEnrollments && column.onlyInEnrollmentView) return true
+    return !column.onlyInDetailedView && !column.onlyInEnrollmentView
+  })
 }
 
 const StudentTable = ({
   data: { name, stats },
-  settings: { showDetails },
+  settings: { showDetails, showEnrollments, separate },
   alternatives,
-  separate,
+  unifyCourses,
   userHasAccessToAllStats,
   headerVisible = false,
 }) => {
   const columns = useMemo(
-    () => getColumns(showDetails, userHasAccessToAllStats, alternatives, separate),
-    [showDetails, userHasAccessToAllStats, alternatives, separate]
+    () => getColumns(showDetails, showEnrollments, userHasAccessToAllStats, alternatives, separate, unifyCourses),
+    [showDetails, showEnrollments, userHasAccessToAllStats, alternatives, separate, unifyCourses]
   )
 
   return (
@@ -111,9 +211,11 @@ const StudentTable = ({
         </Header>
       )}
       <SortableTable
+        title={`Student statistics for group ${name}`}
+        defaultSort={['TIME', 'desc']}
         defaultdescending
         getRowKey={s => s.code}
-        tableProps={{ celled: true, fixed: true, style: { width: 'auto' } }}
+        tableProps={{ celled: true, fixed: true }}
         columns={columns}
         data={stats}
       />
@@ -125,12 +227,10 @@ const StudentTable = ({
 }
 
 StudentTable.propTypes = {
-  stats: arrayOf(shape({})).isRequired,
-  name: oneOfType([number, string]).isRequired,
+  data: object.isRequired,
   alternatives: arrayOf(string).isRequired,
   separate: bool,
   userHasAccessToAllStats: bool.isRequired,
-  headerVisible: bool.isRequired,
 }
 
 StudentTable.defaultProps = {

services/frontend/src/components/CourseStatistics/ResultTabs/Panes/tables.jsx

@@ -5,57 +5,72 @@ import { viewModeNames } from './util'
 import HelpButton from '../HelpButton'
 import StudentTable from './Tables/student'
 import AttemptsTable from './Tables/attempts'
+import selectors from '../../../../selectors/courseStats'
+import UnifyRadioButtons from '../UnifyRadioButtons'
 
-export const TablesSettings = ({ value, onChange }) => {
-  const { viewMode, showDetails, showGrades } = value
+export const TablesSettings = ({ value, onChange, availableStats }) => {
+  const { viewMode, showDetails, showGrades, showEnrollments } = value
 
   return (
-    <Menu secondary style={{ marginBottom: 0 }}>
-      {Object.entries(viewModeNames).map(([key, name]) => (
-        <Menu.Item
-          active={viewMode === key}
-          data-cy={`viewMode-${name}`}
-          name={name}
-          onClick={() =>
-            onChange({
-              ...value,
-              viewMode: key,
-            })
-          }
-        />
-      ))}
-      <Menu.Item>
-        <Radio
-          toggle
-          label="Show details"
-          disabled={viewMode !== 'STUDENT'}
-          checked={showDetails}
-          onChange={() => onChange({ ...value, showDetails: !showDetails })}
-        />
-      </Menu.Item>
-      <Menu.Item>
-        <Radio
-          toggle
-          label="Show grades"
-          data-cy="gradeToggle"
-          disabled={viewMode !== 'ATTEMPTS'}
-          checked={showGrades}
-          onChange={() => onChange({ ...value, showGrades: !showGrades })}
-        />
-      </Menu.Item>
-      <Menu.Item>
-        <HelpButton tab="Tables" viewMode={viewMode} />
-      </Menu.Item>
-    </Menu>
+    <div>
+      <Menu secondary>
+        {Object.entries(viewModeNames).map(([key, name]) => (
+          <Menu.Item
+            key={key}
+            active={viewMode === key}
+            data-cy={`viewMode-${name}`}
+            name={name}
+            onClick={() =>
+              onChange({
+                ...value,
+                viewMode: key,
+              })
+            }
+          />
+        ))}
+        <Menu.Item>
+          <Radio
+            toggle
+            label="Show details"
+            disabled={viewMode !== 'STUDENT'}
+            checked={showDetails}
+            onChange={() => onChange({ ...value, showDetails: !showDetails })}
+          />
+        </Menu.Item>
+        <Menu.Item>
+          <Radio
+            toggle
+            label="Show grades"
+            data-cy="gradeToggle"
+            disabled={viewMode !== 'ATTEMPTS'}
+            checked={showGrades}
+            onChange={() => onChange({ ...value, showGrades: !showGrades })}
+          />
+        </Menu.Item>
+        <Menu.Item>
+          <Radio
+            toggle
+            label="Show enrollments"
+            data-cy="enrollmentToggle"
+            checked={showEnrollments}
+            onChange={() => onChange({ ...value, showEnrollments: !showEnrollments })}
+          />
+        </Menu.Item>
+
+        <Menu.Item>
+          <HelpButton tab="Tables" viewMode={viewMode} />
+        </Menu.Item>
+      </Menu>
+      <UnifyRadioButtons availableStats={availableStats} />
+    </div>
   )
 }
 
 export const Tables = props => {
-  const alternatives = useSelector(state => state.courseStats.data[state.singleCourseStats.selectedCourse].alternatives)
-
+  const alternatives = useSelector(selectors.getCourseAlternatives)
   const viewModes = { ATTEMPTS: AttemptsTable, STUDENT: StudentTable }
-
   const Content = viewModes[props.settings.viewMode]
+  const openOrReqular = useSelector(state => state.courseSearch.openOrReqular)
 
-  return <Content {...props} alternatives={alternatives} />
+  return <Content {...props} alternatives={alternatives} unifyCourses={openOrReqular} />
 }

services/frontend/src/components/CourseStatistics/ResultTabs/Panes/util.js

@@ -1,5 +1,23 @@
 import { arrayOf, number, oneOfType, shape, string, oneOf } from 'prop-types'
 
+const gradesMap = {
+  0: 0,
+  1: 10,
+  2: 20,
+  3: 30,
+  4: 40,
+  5: 50,
+  'Hyv.': 60,
+  I: 0,
+  A: 1,
+  LUB: 2,
+  NSLA: 3,
+  CL: 4,
+  MCLA: 5,
+  ECLA: 6,
+  L: 7,
+}
+
 export const viewModeNames = {
   STUDENT: 'Students',
   ATTEMPTS: 'Attempts',
@@ -23,6 +41,8 @@ export const viewModeType = oneOf(Object.values(viewModeNames))
 
 export const THESIS_GRADE_KEYS = ['I', 'A', 'NSLA', 'LUB', 'CL', 'MCLA', 'ECLA', 'L']
 
+export const sortGrades = (a, b) => gradesMap[a] - gradesMap[b]
+
 export const isThesisGrades = grades => Object.keys(grades).some(k => THESIS_GRADE_KEYS.includes(k))
 
 export const isThesisSeries = series => series && series.some(s => isThesisGrades(s))
@@ -39,13 +59,20 @@ export const getThesisGradeSpread = (series, isRelative) => {
     NSLA: [],
     A: [],
     I: [],
+    0: [],
+    1: [],
+    2: [],
+    3: [],
+    4: [],
+    5: [],
   }
   const newSeries = series.reduce(
     (acc, cur, i) => {
       const currentEntries = Object.entries(cur)
 
       currentEntries.forEach(([k, v]) => {
-        acc[k].push(v)
+        const merged = k === 'LA' ? 'LUB' : k
+        acc[merged].push(v)
       })
 
       Object.entries(acc).forEach(([k, v]) => {
@@ -94,7 +121,8 @@ export const getGradeSpread = (series, isRelative) => {
         if (failedKeys.includes(k.toLowerCase())) {
           failed += v
         } else {
-          acc[k].push(v)
+          const parsedGrade = Number(k) ? Math.round(Number(k)) : k
+          acc[parsedGrade].push(v)
         }
       })
       acc[0].push(failed)

services/frontend/src/components/CourseStatistics/ResultTabs/UnifyRadioButtons.jsx

@@ -0,0 +1,60 @@
+import React from 'react'
+import { useSelector, useDispatch } from 'react-redux'
+import { Menu, Radio, Form } from 'semantic-ui-react'
+import { toggleOpenAndReqularCourses } from '../../../redux/coursesearch'
+
+const UnifyRadioButtons = ({ availableStats }) => {
+  const dispatch = useDispatch()
+
+  const openOrReqular = useSelector(state => state.courseSearch.openOrReqular)
+  const toggleUnifyRadioValue = (event, { value }) => {
+    dispatch(toggleOpenAndReqularCourses(value))
+  }
+
+  return (
+    <Menu secondary style={{ marginLeft: '0.5rem' }}>
+      <Form>
+        <Form.Group>
+          <Form.Field>
+            <b>Provider organization:</b>
+          </Form.Field>
+          <Form.Field>
+            <Radio
+              label={availableStats.university ? 'university' : 'university (no data)'}
+              name="radioGroup"
+              value="reqularStats"
+              checked={openOrReqular === 'reqularStats'}
+              disabled={!availableStats.university}
+              onChange={toggleUnifyRadioValue}
+              data-cy="unify_radio_reqular"
+            />
+          </Form.Field>
+          <Form.Field>
+            <Radio
+              label={availableStats.open ? 'open' : 'open (no data)'}
+              name="radioGroup"
+              value="openStats"
+              checked={openOrReqular === 'openStats'}
+              onChange={toggleUnifyRadioValue}
+              disabled={!availableStats.open}
+              data-cy="unify_radio_open"
+            />
+          </Form.Field>
+          <Form.Field>
+            <Radio
+              label={availableStats.unify ? 'both' : 'both (no data)'}
+              name="radioGroup"
+              value="unifyStats"
+              checked={openOrReqular === 'unifyStats'}
+              onChange={toggleUnifyRadioValue}
+              disabled={!availableStats.unify}
+              data-cy="unify_radio_unify"
+            />
+          </Form.Field>
+        </Form.Group>
+      </Form>
+    </Menu>
+  )
+}
+
+export default UnifyRadioButtons

services/frontend/src/components/CourseStatistics/ResultTabs/index.jsx

@@ -12,15 +12,22 @@ import TSA from '../../../common/tsa'
 const ANALYTICS_CATEGORY = 'Course Statistics'
 const sendAnalytics = (action, name, value) => TSA.Matomo.sendEvent(ANALYTICS_CATEGORY, action, name, value)
 
-const PaneContent = ({ component: Component, settings: SettingsComponent, initialSettings, datasets, ...rest }) => {
+const PaneContent = ({
+  component: Component,
+  settings: SettingsComponent,
+  initialSettings,
+  datasets,
+  availableStats,
+  ...rest
+}) => {
   const [settings, setSettings] = useState(initialSettings)
-  const [splitDirection, setSplitDirection] = useState('column')
+  const [splitDirection, setSplitDirection] = useState('row')
 
   return (
     <Tab.Pane>
       <Segment basic>
         <div style={{ display: 'flex', marginBottom: '2em' }}>
-          <SettingsComponent value={settings} onChange={setSettings} />
+          <SettingsComponent value={settings} onChange={setSettings} availableStats={availableStats} />
           <div style={{ flexGrow: 1 }} />
           {datasets.filter(i => i).length > 1 && (
             <div style={{ display: 'flex', alignItems: 'center', gap: '1em' }}>
@@ -40,7 +47,7 @@ const PaneContent = ({ component: Component, settings: SettingsComponent, initia
           {datasets
             .filter(i => i)
             .map(data => (
-              <div style={{ flexGrow: 1, flexBasis: 1 }}>
+              <div style={{ flexGrow: 1, flexBasis: 1, width: '100%' }}>
                 <h3>{data.name}</h3>
                 <Component data={data} settings={settings} {...rest} />
               </div>
@@ -51,137 +58,29 @@ const PaneContent = ({ component: Component, settings: SettingsComponent, initia
   )
 }
 
-const ResultTabs = ({ primary, comparison, history }) => {
+const ResultTabs = ({ primary, comparison, history, separate, availableStats }) => {
   const [tab, setTab] = useTabs('cs_tab', 0, history)
-  // const [viewMode, setViewMode] = useState(viewModeNames.STUDENT)
-  // const [selectedView, setSelectedView] = useState(false)
-  // const [isRelative, setIsRelative] = useState(false)
-  // const [showGrades, setShowGrades] = useState(false)
   const { userHasAccessToAllStats } = primary
 
-  /* const handleModeChange = newViewMode => {
-    sendAnalytics(`Current view mode '${newViewMode}'`, 'Course statistics')
-    setViewMode(newViewMode)
-  } */
-
-  /* useEffect(() => {
-    const newViewMode = selectedView ? viewModeNames.ATTEMPTS : viewModeNames.STUDENT
-    handleModeChange(newViewMode)
-  }, [selectedView]) */
-
   const handleTabChange = (...params) => {
     const { activeIndex } = params[1]
     const currentTab = params[1].panes[activeIndex]
     sendAnalytics(`Current tab '${currentTab.menuItem.content}'`, 'Course statistics')
     setTab(...params)
-    // setViewMode(resetViewMode ? viewMode : viewModeNames.ATTEMPTS)
   }
 
-  /* const getRadioButton = (firstLabel, secondLabel, value, setValue) => (
-    <div className="toggleContainer">
-      <label className="toggleLabel">{firstLabel}</label>
-      <Radio toggle data-cy="gradeToggle" checked={value} onChange={() => setValue(!value)} />
-      <label className="toggleLabel">{secondLabel}</label>
-    </div>
-  ) */
-
-  /* const renderViewModeSelector = () => {
-    const isTogglePane = tab !== 0
-    const getButtonMenu = () => (
-      <Menu secondary>
-        {Object.values(viewModeNames).map(name => (
-          <Menu.Item key={name} name={name} active={viewMode === name} onClick={() => handleModeChange(name)} />
-        ))}
-        {viewMode === 'Attempts' && getRadioButton('Totals', 'Grade distribution', showGrades, setShowGrades)}
-        {viewMode === 'Attempts' && showGrades && getRadioButton('Absolute', 'Relative', isRelative, setIsRelative)}
-      </Menu>
-    )
-
-    const getToggle = () => {
-      return (
-        <div className="chartToggleContainer">
-          {tab === 1 && getRadioButton('Student', 'Attempts', selectedView, setSelectedView)}
-          {(tab === 2 || comparison) && getRadioButton('Absolute', 'Relative', isRelative, setIsRelative)}
-        </div>
-      )
-    }
-
-    // Remove "false" and activate infoboxes when the texts for them are ready
-    return (
-      <div className="modeSelectorContainer">
-        {isTogglePane ? getToggle() : getButtonMenu()}
-        <InfoBox content={infotooltips.CourseStatistics[tab][viewMode]} />
-      </div>
-    )
-  } */
-
-  /* const getPanes = () => {
-    return [
-      {
-        menuItem: { key: 'Table', icon: 'table', content: 'Table' },
-        render: () => (
-          <Tables
-            separate={separate}
-            comparison={comparison}
-            primary={primary}
-            viewMode={viewMode}
-            isRelative={isRelative}
-            showGrades={showGrades}
-            userHasAccessToAllStats={userHasAccessToAllStats}
-          />
-        ),
-      },
-      {
-        menuItem: { key: 'pass', icon: 'balance', content: 'Pass rate chart' },
-        render: () => (
-          <PassRate
-            comparison={comparison}
-            primary={primary}
-            viewMode={viewMode}
-            isRelative={isRelative && !!comparison}
-            userHasAccessToAllStats={userHasAccessToAllStats}
-          />
-        ),
-      },
-      {
-        menuItem: { key: 'grade', icon: 'chart bar', content: 'Grade distribution chart' },
-        render: () => (
-          <Distribution
-            comparison={comparison}
-            primary={primary}
-            isRelative={isRelative}
-            userHasAccessToAllStats={userHasAccessToAllStats}
-          />
-        ),
-      },
-    ];
-
-    return paneMenuItems.map(p => {
-      const { menuItem, renderFn } = p
-      return {
-        menuItem,
-        render: () => (
-          <Grid padded="vertically" columns="equal">
-            <Grid.Row className="modeSelectorRow">{renderViewModeSelector()}</Grid.Row>
-            {renderFn()}
-          </Grid>
-        ),
-      }
-    })
-  } */
-
   const paneTypes = [
     {
       label: 'Tables',
       icon: 'table',
-      initialSettings: { showDetails: false, viewMode: 'STUDENT' },
+      initialSettings: { showDetails: false, showEnrollments: false, viewMode: 'STUDENT', separate },
       settings: TablesSettings,
       component: Tables,
     },
     {
       label: 'Pass rate chart',
       icon: 'balance',
-      initialSettings: { viewMode: 'STUDENT' },
+      initialSettings: { viewMode: 'STUDENT', separate },
       settings: PassRateSettings,
       component: PassRate,
     },
@@ -204,6 +103,7 @@ const ResultTabs = ({ primary, comparison, history }) => {
           userHasAccessToAllStats={userHasAccessToAllStats}
           initialSettings={initialSettings}
           datasets={[primary, comparison]}
+          availableStats={availableStats}
         />
       ),
     })

services/frontend/src/components/CourseStatistics/SearchForm/index.jsx

@@ -1,11 +1,11 @@
-import React, { useState, useEffect, Fragment } from 'react'
+import React, { useState, useEffect } from 'react'
 import { Segment, Header, Form } from 'semantic-ui-react'
-import { connect } from 'react-redux'
+import { useSelector, useDispatch } from 'react-redux'
 import { withRouter } from 'react-router-dom'
 import qs from 'query-string'
 import { sortBy } from 'lodash'
-import { func, arrayOf, shape, bool } from 'prop-types'
-import { clearCourses, findCoursesV2, toggleUnifyOpenUniCourses } from '../../../redux/coursesearch'
+import { func, shape } from 'prop-types'
+import { clearCourses, findCoursesV2 } from '../../../redux/coursesearch'
 import { getCourseStats, clearCourseStats } from '../../../redux/coursestats'
 import { getCourseSearchResults } from '../../../selectors/courses'
 import { useSearchHistory, usePrevious } from '../../../common/hooks'
@@ -15,7 +15,6 @@ import AutoSubmitSearchInput from '../../AutoSubmitSearchInput'
 import CourseTable from '../CourseTable'
 import SearchHistory from '../../SearchHistory'
 import useLanguage from '../../LanguagePicker/useLanguage'
-import filterCourseSearchResults from './searchFormUtils'
 
 const sendAnalytics = (action, name, value) => TSA.Matomo.sendEvent('Course statistics search', action, name, value)
 
@@ -55,13 +54,18 @@ const useTSASearchResultsHook = (coursesLoading, courseName, courseCode, matchin
 
 const SearchForm = props => {
   const { language } = useLanguage()
+  const dispatch = useDispatch()
+  const isLoading = useSelector(state => state.courseStats.pending)
+  const coursesLoading = useSelector(state => state.courseSearch.pending)
+  const matchingCourses = useSelector(getCourseSearchResults)
   const [state, setState] = useState({
     ...INITIAL,
   })
   const [searchHistory, addItemToSearchHistory, updateItemInSearchHistory] = useSearchHistory('courseSearch', 6)
 
   const { courseName, courseCode, selectedCourses, separate } = state
-  const { coursesLoading, isLoading, matchingCourses, unifyOpenUniCourses } = props
+
+  // const { coursesLoading, isLoading, matchingCourses /* unifyOpenUniCourses */ } = props
 
   const parseQueryFromUrl = () => {
     const { location } = props
@@ -71,7 +75,7 @@ const SearchForm = props => {
       ...rest,
       courseCodes: JSON.parse(courseCodes),
       separate: JSON.parse(separate),
-      unifyOpenUniCourses: JSON.parse(unifyOpenUniCourses || false),
+      // unifyOpenUniCourses: JSON.parse(unifyOpenUniCourses || false),
     }
     return query
   }
@@ -79,14 +83,14 @@ const SearchForm = props => {
   const fetchStatisticsFromUrlParams = () => {
     const query = parseQueryFromUrl()
     setState({ ...state, ...query })
-    props.getCourseStats(query, props.onProgress)
+    dispatch(getCourseStats(query, props.onProgress))
   }
 
   useEffect(() => {
     const { location } = props
     if (!location.search) {
-      props.clearCourses()
-      props.clearCourseStats()
+      dispatch(clearCourses())
+      dispatch(clearCourseStats())
     }
   }, [])
 
@@ -143,7 +147,6 @@ const SearchForm = props => {
     const params = {
       courseCodes: codes,
       separate,
-      unifyOpenUniCourses: props.unifyOpenUniCourses,
     }
     const searchHistoryText = codes.map(code => `${getTextIn(selectedCourses[code].name, language)} ${code}`)
     addItemToSearchHistory({
@@ -158,10 +161,10 @@ const SearchForm = props => {
     const isValidCode = validateInputLength(courseCode, 2)
 
     if (isValidName || isValidCode) {
-      return props.findCoursesV2({ name: courseName, code: courseCode })
+      return dispatch(findCoursesV2({ name: courseName, code: courseCode }))
     }
     if (courseName.length < 5 && courseCode.length < 2) {
-      props.clearCourses()
+      dispatch(clearCourses())
     }
     return Promise.resolve()
   }
@@ -172,14 +175,6 @@ const SearchForm = props => {
     sendAnalytics('Toggle Separate stats for spring & fall', `${newValue}`)
   }
 
-  const onToggleUnifyOpenUniCoursesCheckbox = () => {
-    const newValue = !unifyOpenUniCourses
-    sendAnalytics('Toggle Unify open university courses', `${newValue}`)
-
-    setState({ ...state, selectedCourses: {} })
-    props.toggleUnifyOpenUniCourses()
-  }
-
   const courses = matchingCourses.filter(c => !selectedCourses[c.code])
 
   const disabled = isLoading || Object.keys(selectedCourses).length === 0
@@ -235,16 +230,6 @@ const SearchForm = props => {
                   data-cy="course-code-input"
                 />
               </Form.Field>
-              <Form.Field width={4} style={{ display: 'flex', flexDirection: 'column' }}>
-                <label>Unify open university courses:</label>
-                <span style={{ flex: 1, display: 'flex', alignItems: 'center' }}>
-                  <Form.Checkbox
-                    name="unifyOpenUniCourses"
-                    onChange={onToggleUnifyOpenUniCoursesCheckbox}
-                    checked={unifyOpenUniCourses}
-                  />
-                </span>
-              </Form.Field>
             </Form.Group>
             <div style={!noSelectedCourses ? searchBoxStyle : null}>
               <CourseTable
@@ -314,38 +299,9 @@ SearchForm.defaultProps = {
 }
 
 SearchForm.propTypes = {
-  findCoursesV2: func.isRequired,
-  getCourseStats: func.isRequired,
-  clearCourses: func.isRequired,
-  clearCourseStats: func.isRequired,
-  matchingCourses: arrayOf(shape({})).isRequired,
-  isLoading: bool.isRequired,
-  coursesLoading: bool.isRequired,
   history: shape({}).isRequired,
   location: shape({}).isRequired,
-  unifyOpenUniCourses: bool.isRequired,
-  toggleUnifyOpenUniCourses: func.isRequired,
   onProgress: func,
 }
 
-const mapStateToProps = state => {
-  const { courses } = getCourseSearchResults(state)
-  const { pending: courseStatsPending } = state.courseStats
-  const { unifyOpenUniCourses } = state.courseSearch
-  return {
-    matchingCourses: filterCourseSearchResults(courses, unifyOpenUniCourses),
-    isLoading: courseStatsPending,
-    coursesLoading: state.courseSearch.pending,
-    unifyOpenUniCourses,
-  }
-}
-
-export default withRouter(
-  connect(mapStateToProps, {
-    getCourseStats,
-    clearCourses,
-    findCoursesV2,
-    clearCourseStats,
-    toggleUnifyOpenUniCourses,
-  })(SearchForm)
-)
+export default withRouter(SearchForm)

services/frontend/src/components/CourseStatistics/SearchForm/searchFormUtils.js

@@ -1,9 +1,9 @@
-import { orderBy } from 'lodash'
+// import { orderBy } from 'lodash'
 
 // handle special case where the course's actual code starts with "A" so it is mistakenly taken as Open Uni course
-const isAvoin = course => !!course.code.match(/^[A][0-9]|^AY/)
+// const isAvoin = course => !!course.code.match(/^[A][0-9]|^AY/)
 
-const sortAlternatives = alternatives => {
+/* const sortAlternatives = alternatives => {
   const result = orderBy(
     alternatives,
     [
@@ -20,17 +20,18 @@ const sortAlternatives = alternatives => {
   )
 
   return result
-}
+} */
 
 // If special case of Open Uni course that starts with A let's just sort them length, that
 // should be good enough in this case.
-const getAlternatives = course => sortAlternatives(course.alternatives)
 
-const filterCourseSearchResults = (courses, unifyOpenUniCourses) => {
+/* const getAlternatives = course => sortAlternatives(course.alternatives)
+
+const filterCourseSearchResults = courses => {
   const mergedCourses = {}
   const sortedCourses = sortAlternatives(courses)
   sortedCourses.forEach(course => {
-    const groupId = isAvoin(course) && !unifyOpenUniCourses ? course.code : course.subsId
+    const groupId = course.subsId
 
     if (!(course.max_attainment_date && course.min_attainment_date)) {
       return
@@ -64,6 +65,4 @@ const filterCourseSearchResults = (courses, unifyOpenUniCourses) => {
   }))
 
   return result
-}
-
-export default filterCourseSearchResults
+} */

services/frontend/src/components/CourseStatistics/SingleCourseStats/countTotalStats.js

@@ -10,10 +10,12 @@ const countTotalStats = (formattedStats, userHasAccessToAllStats) => {
       const cgrades = acc.attempts.grades
 
       Object.keys(curr.attempts.grades).forEach(grade => {
-        if (!cgrades[grade]) cgrades[grade] = 0
-        cgrades[grade] += curr.attempts.grades[grade]
+        let parsedGrade = Number(grade) ? Math.round(Number(grade)).toString() : grade
+        if (parsedGrade === 'LA') parsedGrade = 'LUB' // merge LA and LUB grades
+        if (!cgrades[parsedGrade]) cgrades[parsedGrade] = 0
+        cgrades[parsedGrade] += curr.attempts.grades[grade]
 
-        if (['EISA', 'Hyl.', 'HYL', '0', 'LUOP'].includes(grade)) {
+        if (['eisa', 'hyl.', 'hyl', '0', 'luop'].includes(parsedGrade.toLowerCase())) {
           failed += curr.attempts.grades[grade]
         } else {
           passed += curr.attempts.grades[grade]
@@ -34,16 +36,41 @@ const countTotalStats = (formattedStats, userHasAccessToAllStats) => {
         ? acc.students.categories.neverPassed + neverPassed
         : acc.students.categories.neverPassed
 
+      Object.keys(curr.students.enrollmentsByState).forEach(k => {
+        if (acc.students.enrollmentsByState[k] === undefined) acc.students.enrollmentsByState[k] = 0
+        acc.students.enrollmentsByState[k] += curr.students.enrollmentsByState[k] || 0
+      })
+
+      Object.keys(curr.attempts.enrollmentsByState).forEach(k => {
+        if (acc.attempts.enrollmentsByState[k] === undefined) acc.attempts.enrollmentsByState[k] = 0
+        acc.attempts.enrollmentsByState[k] += curr.attempts.enrollmentsByState[k] || 0
+      })
+
       return {
         ...acc,
         coursecode: curr.coursecode,
-        attempts: { categories: { passed, failed }, grades: cgrades },
+        attempts: {
+          categories: { passed, failed },
+          grades: cgrades,
+          enrollmentsByState: { ...acc.attempts.enrollmentsByState },
+          totalEnrollments: acc.students.totalEnrollments + (curr.students.totalEnrollments || 0),
+        },
         students: {
+          totalEnrollments: acc.students.totalEnrollments + (curr.students.totalEnrollments || 0),
+          totalPassed: acc.students.totalPassed + curr.students.totalPassed,
+          totalFailed: acc.students.totalFailed + curr.students.totalFailed,
+          enrolledStudentsWithNoGrade:
+            acc.students.enrolledStudentsWithNoGrade + (curr.students.enrolledStudentsWithNoGrade || 0),
           categories: {
             passedFirst: newPassedFirst,
             passedEventually: newPassedEventually,
             neverPassed: newNeverPassed,
           },
+          enrollmentsByState: { ...acc.students.enrollmentsByState },
+          withEnrollments: {
+            total: acc.students.withEnrollments.total + curr.students.withEnrollments.total,
+            totalFailed: acc.students.withEnrollments.totalFailed + curr.students.withEnrollments.totalFailed,
+          },
         },
       }
     },
@@ -59,6 +86,12 @@ const countTotalStats = (formattedStats, userHasAccessToAllStats) => {
         },
         passRate: 0,
         grades: {},
+        totalEnrollments: 0,
+        enrollmentsByState: {
+          ENROLLED: 0,
+          REJECTED: 0,
+          ABORTED: 0,
+        },
       },
       students: {
         categories: {
@@ -69,6 +102,19 @@ const countTotalStats = (formattedStats, userHasAccessToAllStats) => {
         passRate: 0,
         failRate: 0,
         total: 0,
+        totalPassed: 0,
+        totalFailed: 0,
+        totalEnrollments: 0,
+        enrolledStudentsWithNoGrade: 0,
+        enrollmentsByState: {
+          ENROLLED: 0,
+          REJECTED: 0,
+          ABORTED: 0,
+        },
+        withEnrollments: {
+          total: 0,
+          totalFailed: 0,
+        },
       },
       studentnumbers: [],
     }
@@ -76,11 +122,16 @@ const countTotalStats = (formattedStats, userHasAccessToAllStats) => {
 
   // Count pass- and failrates also for "Total"-lines
   const { passedFirst = 0, passedEventually = 0, neverPassed = 0 } = totals.students.categories
+  const { enrolledStudentsWithNoGrade = 0 } = totals.students
   const total = passedFirst + passedEventually + neverPassed
   totals.students.total = total
   totals.students.passRate = (passedFirst + passedEventually) / total
   totals.students.failRate = neverPassed / total
 
+  totals.students.withEnrollments.passRate = (passedFirst + passedEventually) / (total + enrolledStudentsWithNoGrade)
+  totals.students.withEnrollments.failRate =
+    (neverPassed + enrolledStudentsWithNoGrade) / (total + enrolledStudentsWithNoGrade)
+
   const { failed, passed } = totals.attempts.categories
   totals.attempts.passRate = (100 * passed) / (passed + failed)
 

services/frontend/src/components/CourseStatistics/SingleCourseStats/index.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useMemo, useEffect } from 'react'
 import { Segment, Header, Form, Grid, Button, Popup } from 'semantic-ui-react'
 import { shape, string, arrayOf, objectOf, oneOfType, number, func, bool } from 'prop-types'
 import { connect } from 'react-redux'
@@ -15,7 +15,7 @@ import ProgrammeDropdown from '../ProgrammeDropdown'
 import selectors, { ALL } from '../../../selectors/courseStats'
 import YearFilter from '../SearchForm/YearFilter'
 import { getTextIn } from '../../../common'
-import { getSemesters } from '../../../redux/semesters'
+import { useGetSemestersQuery } from '../../../redux/semesters'
 import TSA from '../../../common/tsa'
 import useLanguage from '../../LanguagePicker/useLanguage'
 import countTotalStats from './countTotalStats'
@@ -34,14 +34,12 @@ const countFilteredStudents = (stat, filter) =>
 
 const SingleCourseStats = ({
   stats,
+  availableStats,
   setSelectedCourse,
   clearSelectedCourse,
   history,
   location,
   stats: { coursecode },
-  getSemesters,
-  years,
-  semesters,
   programmes,
   maxYearsToCreatePopulationFrom,
   getMaxYearsToCreatePopulationFrom,
@@ -54,6 +52,28 @@ const SingleCourseStats = ({
   const [toYear, setToYear] = useState(0)
   const [separate, setSeparate] = useState(null)
 
+  const { data: semesterData } = useGetSemestersQuery()
+
+  const { semesters, years } = useMemo(() => {
+    const semesters = Object.values(semesterData?.semesters ?? [])
+      .map(({ semestercode, name, yearcode }) => ({
+        key: semestercode,
+        texts: Object.values(name),
+        value: yearcode,
+      }))
+      .reverse()
+
+    const years = Object.values(semesterData?.years ?? [])
+      .map(({ yearcode, yearname }) => ({
+        key: yearcode,
+        text: yearname,
+        value: yearcode,
+      }))
+      .reverse()
+
+    return { semesters, years }
+  }, [semesterData])
+
   const parseQueryFromUrl = () => {
     const { separate } = qs.parse(location.search)
     return {
@@ -62,7 +82,6 @@ const SingleCourseStats = ({
   }
 
   useEffect(() => {
-    if (years.length === 0 || semesters.length === 0) getSemesters()
     if (location.search) {
       const { separate } = parseQueryFromUrl()
       setSeparate(separate)
@@ -170,19 +189,75 @@ const SingleCourseStats = ({
     }
   }
 
-  const countStudentStats = (allstudents, filter) => {
+  const countStudentStats = (allstudents, enrolledNoGrade = 0, filter) => {
     const categories = countFilteredStudents(allstudents.categories, filter)
 
     const { passedFirst = 0, passedEventually = 0, neverPassed = 0 } = categories
     const total = passedFirst + passedEventually + neverPassed
     const passRate = (passedFirst + passedEventually) / total
     const failRate = neverPassed / total
+    const withEnrollments = {
+      total: total + enrolledNoGrade,
+      passRate: (passedFirst + passedEventually) / (total + enrolledNoGrade),
+      failRate: (neverPassed + enrolledNoGrade) / (total + enrolledNoGrade),
+    }
 
     return {
+      totalPassed: passedFirst + passedEventually,
+      totalFailed: neverPassed,
       categories,
       passRate,
       failRate,
       total,
+      withEnrollments,
+    }
+  }
+
+  const countEnrollmentStates = filteredEnrollments => {
+    const combined = { CONFIRMED: 'ENROLLED', ABORTED_BY_TEACHER: 'ABORTED', ABORTED_BY_STUDENT: 'ABORTED' }
+    return filteredEnrollments.reduce(
+      (acc, enrollment) => {
+        const state = combined[enrollment.state] || enrollment.state
+        if (acc[state] === undefined) acc[state] = 0
+        acc[state] += 1
+        return acc
+      },
+      {
+        ENROLLED: 0,
+        REJECTED: 0,
+        ABORTED: 0,
+      }
+    )
+  }
+
+  const countAttemptEnrollmentStats = (filteredEnrollments, displayEnrollments) => {
+    const enrollmentsByState = countEnrollmentStates(filteredEnrollments)
+    const totalEnrollments = displayEnrollments ? filteredEnrollments.length : undefined
+    if (!displayEnrollments)
+      Object.keys(enrollmentsByState).forEach(k => {
+        enrollmentsByState[k] = undefined
+      })
+    return { enrollmentsByState, totalEnrollments }
+  }
+
+  const countStudentEnrollmentStats = (allAttempts, filteredEnrollments, displayEnrollments) => {
+    const enrolledStudentsWithNoGrade = filteredEnrollments.filter(({ studentnumber, state }) => {
+      if (state !== 'ENROLLED') return false
+      const hasFailed = allAttempts.categories.failed ? allAttempts.categories.failed.includes(studentnumber) : false
+      const hasPassed = allAttempts.categories.passed ? allAttempts.categories.passed.includes(studentnumber) : false
+      return !hasFailed && !hasPassed
+    })
+    const enrollmentsByState = countEnrollmentStates(filteredEnrollments)
+    if (!displayEnrollments) {
+      Object.keys(enrollmentsByState).forEach(k => {
+        enrollmentsByState[k] = undefined
+      })
+      return { enrolledStudentsWithNoGrade: undefined, enrollmentsByState, totalEnrollments: undefined }
+    }
+    return {
+      enrolledStudentsWithNoGrade: enrolledStudentsWithNoGrade.length,
+      enrollmentsByState,
+      totalEnrollments: filteredEnrollments.length,
     }
   }
 
@@ -191,20 +266,40 @@ const SingleCourseStats = ({
     const filter = belongsToAtLeastOneProgramme(progCodes)
     const formattedStats = statistics
       .filter(isStatInYearRange)
-      .map(({ code, name, students: allStudents, attempts: allAttempts, coursecode, obfuscated }) => {
-        const attempts = countAttemptStats(allAttempts, filter)
-        const students = countStudentStats(allStudents, filter)
-        const parsedName = separate ? getTextIn(name, language) : name
-        return {
+      .map(
+        ({
           code,
-          name: parsedName,
-          attempts,
-          students,
+          name,
+          students: allStudents,
+          attempts: allAttempts,
           coursecode,
-          rowObfuscated: obfuscated,
-          userHasAccessToAllStats,
+          obfuscated,
+          enrollments = [],
+          allEnrollments = [],
+          yearcode,
+        }) => {
+          const displayEnrollments = yearcode >= 72 // Display enrollments only for Sisu era
+          const filteredEnrollments = enrollments.filter(({ studentnumber }) => filter(studentnumber))
+          const filteredAllEnrollments = allEnrollments.filter(({ studentnumber }) => filter(studentnumber))
+
+          const attempts = countAttemptStats(allAttempts, filter)
+          const attemptsEnrollments = countAttemptEnrollmentStats(filteredAllEnrollments, displayEnrollments)
+          const studentsEnrollments = countStudentEnrollmentStats(allAttempts, filteredEnrollments, displayEnrollments)
+          const students = countStudentStats(allStudents, studentsEnrollments.enrolledStudentsWithNoGrade, filter)
+          const parsedName = separate ? getTextIn(name, language) : name
+
+          return {
+            name: parsedName,
+            students: { ...students, ...studentsEnrollments },
+            attempts: { ...attempts, ...attemptsEnrollments },
+            enrollments: filteredEnrollments,
+            code,
+            coursecode,
+            rowObfuscated: obfuscated,
+            userHasAccessToAllStats,
+          }
         }
-      })
+      )
 
     const totals = countTotalStats(formattedStats, userHasAccessToAllStats)
 
@@ -247,7 +342,6 @@ const SingleCourseStats = ({
 
   const filteredProgrammeStatistics = () => {
     const filter = p => validProgCode(p)
-
     const excludedProgrammes = getExcluded()
 
     const primaryProgrammes = primary
@@ -266,6 +360,7 @@ const SingleCourseStats = ({
           comparisonProgrammes.length === 1 ? getProgrammeName(comparisonProgrammes[0]) : 'Comparison'
         )
       : undefined
+
     return {
       primary: pstats || undefined,
       comparison: cstats || undefined,
@@ -324,6 +419,7 @@ const SingleCourseStats = ({
       return { ...e, students: [...students], size: students.size }
     })
     .filter(e => e.size > 0)
+
   if (stats.statistics.length < 1) return <Segment>No data for selected course</Segment>
 
   const options = filteredProgrammes
@@ -389,7 +485,12 @@ const SingleCourseStats = ({
           </Form>
         </Segment>
       )}
-      <ResultTabs separate={separate} primary={statistics.primary} comparison={statistics.comparison} />
+      <ResultTabs
+        separate={separate}
+        primary={statistics.primary}
+        comparison={statistics.comparison}
+        availableStats={availableStats}
+      />
     </div>
   )
 }
@@ -419,46 +520,27 @@ SingleCourseStats.propTypes = {
     coursecode: string,
   }).isRequired,
   programmes: arrayOf(shape({})).isRequired,
-  years: arrayOf(shape({})).isRequired,
-  semesters: arrayOf(shape({})).isRequired,
   location: shape({}).isRequired,
   setSelectedCourse: func.isRequired,
   clearSelectedCourse: func.isRequired,
-  getSemesters: func.isRequired,
   history: shape({
     push: func,
   }).isRequired,
-  getMaxYearsToCreatePopulationFrom: func.isRequired,
+  getMaxYearsToCreatePopulationFrom: Number.isRequired,
   maxYearsToCreatePopulationFrom: number.isRequired,
   userHasAccessToAllStats: bool.isRequired,
 }
 
 const mapStateToProps = state => {
-  const { semesters = [], years = [] } = state.semesters.data
   return {
     programmes: selectors.getAllStudyProgrammes(state),
-    years: Object.values(years)
-      .map(({ yearcode, yearname }) => ({
-        key: yearcode,
-        text: yearname,
-        value: yearcode,
-      }))
-      .reverse(),
-    semesters: Object.values(semesters)
-      .map(({ semestercode, name, yearcode }) => ({
-        key: semestercode,
-        texts: Object.values(name),
-        value: yearcode,
-      }))
-      .reverse(),
-    maxYearsToCreatePopulationFrom: state.singleCourseStats.maxYearsToCreatePopulationFrom,
+    maxYearsToCreatePopulationFrom: selectors.getMaxYearsToCreatePopulationFrom(state),
   }
 }
 
 const mapDispatchToProps = {
   setSelectedCourse,
   clearSelectedCourse,
-  getSemesters,
   getMaxYearsToCreatePopulationFrom,
 }
 

services/frontend/src/components/CourseStatistics/SingleCourseTab/index.jsx

@@ -1,21 +1,30 @@
 import React, { useState, useEffect } from 'react'
-import { connect } from 'react-redux'
+import { useSelector } from 'react-redux'
 import { Segment, Label, Header, Divider, Form } from 'semantic-ui-react'
-import { shape, arrayOf, oneOfType, number, string, bool } from 'prop-types'
+import { oneOfType, number, string, bool } from 'prop-types'
 import SingleCourseStats from '../SingleCourseStats'
 import useLanguage from '../../LanguagePicker/useLanguage'
 import selectors from '../../../selectors/courseStats'
 import { getTextIn } from '../../../common'
 
-const SingleCourseTab = ({ selected, stats, courses, userHasAccessToAllStats }) => {
+const SingleCourseTab = ({ selected, userHasAccessToAllStats }) => {
   const [selection, setSelection] = useState(selected)
   const { language } = useLanguage()
+  const stats = useSelector(selectors.getCourseStats)
+  const availableStats = useSelector(selectors.getAvailableStats)
+  const courses = useSelector(selectors.getCourses).map(({ code, name }) => ({
+    key: code,
+    value: code,
+    text: <Header content={<>{name}</>} />,
+    content: name,
+  }))
 
   useEffect(() => {
     setSelection(selected)
   }, [selected])
 
   if (!stats[selection]) return null
+
   return (
     <div>
       <Segment>
@@ -44,26 +53,20 @@ const SingleCourseTab = ({ selected, stats, courses, userHasAccessToAllStats })
           </Label.Group>
         </Form>
       </Segment>
-      {selection && <SingleCourseStats stats={stats[selection]} userHasAccessToAllStats={userHasAccessToAllStats} />}
+      {selection && (
+        <SingleCourseStats
+          stats={stats[selection]}
+          userHasAccessToAllStats={userHasAccessToAllStats}
+          availableStats={availableStats[selected]}
+        />
+      )}
     </div>
   )
 }
 
 SingleCourseTab.propTypes = {
-  stats: shape({}).isRequired,
-  courses: arrayOf(shape({})).isRequired,
   selected: oneOfType([number, string]).isRequired,
   userHasAccessToAllStats: bool.isRequired,
 }
 
-const mapStateToProps = state => ({
-  stats: selectors.getCourseStats(state),
-  courses: selectors.getCourses(state).map(({ code, name }) => ({
-    key: code,
-    value: code,
-    text: <Header content={<>{name}</>} />,
-    content: name,
-  })),
-})
-
-export default connect(mapStateToProps, {})(SingleCourseTab)
+export default SingleCourseTab

services/frontend/src/components/CustomPopulation/index.jsx

@@ -4,11 +4,11 @@ import { useSelector, useDispatch } from 'react-redux'
 import { Segment, Header, Accordion, Message } from 'semantic-ui-react'
 import _ from 'lodash'
 import scrollToComponent from 'react-scroll-to-component'
+import semestersApi from 'redux/semesters'
 import { useProgress, useTitle } from '../../common/hooks'
 import infotooltips from '../../common/InfoToolTips'
 import { getCustomPopulationSearches } from '../../redux/customPopulationSearch'
 import { useGetStudentListCourseStatisticsQuery } from '../../redux/populationCourses'
-import { getSemesters } from '../../redux/semesters'
 import CreditAccumulationGraphHighCharts from '../CreditAccumulationGraphHighCharts'
 import PopulationStudents from '../PopulationStudents'
 import CustomPopulationCourses from './CustomPopulationCourses'
@@ -34,10 +34,10 @@ import CustomPopulationSearch from './CustomPopulationSearch'
 import UnihowDataExport from './UnihowDataExport'
 
 const selectCustomPopulationData = createSelector(
-  state => state.semesters.data,
+  semestersApi.endpoints.getSemesters.select(),
   state => state.populations.data,
   (semesters, populations) => ({
-    allSemesters: semesters?.semesters ?? [],
+    allSemesters: semesters?.data?.semesters ?? [],
     custompop: populations?.students ?? [],
   })
 )
@@ -55,7 +55,6 @@ const CustomPopulation = () => {
   useTitle('Custom population')
 
   useEffect(() => {
-    dispatch(getSemesters())
     dispatch(getCustomPopulationSearches())
   }, [])
 

services/frontend/src/components/DateRangeSelector.jsx

@@ -0,0 +1,30 @@
+import React from 'react'
+import { Form } from 'semantic-ui-react'
+import DateTimeSelector from 'components/DateTimeSelector'
+
+const DateRangeSelector = ({ value, onChange, ...rest }) => {
+  return (
+    <Form style={{}}>
+      <Form.Field>
+        <label>Beginning:</label>
+        <DateTimeSelector
+          value={value?.[0]}
+          before={value?.[1]}
+          onChange={date => onChange([date, value?.[1]])}
+          {...rest}
+        />
+      </Form.Field>
+      <Form.Field>
+        <label>Ending:</label>
+        <DateTimeSelector
+          value={value?.[1]}
+          after={value?.[0]}
+          onChange={date => onChange([value?.[0], date])}
+          {...rest}
+        />
+      </Form.Field>
+    </Form>
+  )
+}
+
+export default DateRangeSelector

services/frontend/src/components/DateTimeSelector/index.jsx

@@ -0,0 +1,121 @@
+import React, { useRef } from 'react'
+import Datetime from 'react-datetime'
+import 'moment/locale/fi'
+import { Icon, Button } from 'semantic-ui-react'
+import moment from 'moment'
+import { useGetSemestersQuery } from 'redux/semesters'
+import { getTextIn } from '../../common'
+
+import './style.css'
+
+const semesterListStyles = {
+  maxHeight: '10em',
+  overflowY: 'auto',
+  padding: 0,
+  margin: '0 -4px -4px -4px',
+  borderTop: '1px solid #f9f9f9',
+}
+
+const DateTime = ({ value, onChange, before, after, showSemesters }) => {
+  const datetimeRef = useRef()
+  const semesterRequest = useGetSemestersQuery()
+  const allSemesters = semesterRequest.data?.semesters ?? []
+
+  return (
+    <Datetime
+      ref={datetimeRef}
+      value={value}
+      onChange={onChange}
+      timeFormat={false}
+      locale="fi"
+      closeOnSelect
+      isValidDate={date => (!before || date.isBefore(before)) && (!after || date.isAfter(after))}
+      renderView={(mode, renderDefault) => {
+        const createDateButton = (date, label) => (
+          <button
+            type="button"
+            onClick={() => {
+              datetimeRef.current.setViewDate(moment(date))
+              onChange(moment(date))
+            }}
+            style={{
+              height: '1.75em',
+              background: value && value.isSame(date, 'day') ? '#428bca' : undefined,
+              color: value && value.isSame(date, 'day') ? 'white' : 'inherit',
+            }}
+            className="date-picker-semester-button"
+          >
+            {label}
+          </button>
+        )
+
+        return (
+          <>
+            {renderDefault()}
+            {showSemesters && (
+              <>
+                <div
+                  style={{
+                    ...semesterListStyles,
+                    height: '1.75em',
+                    lineHeight: '1.75em',
+                    marginBottom: 0,
+                    paddingLeft: '0.3em',
+                    fontWeight: 'bold',
+                  }}
+                >
+                  Semesters:
+                </div>
+                <ul style={semesterListStyles}>
+                  {allSemesters &&
+                    Object.values(allSemesters)
+                      .filter(({ startdate, enddate }) => {
+                        const start = moment(startdate)
+                        const end = moment(enddate)
+
+                        return start.isBefore() && (!before || start.isBefore(before)) && (!after || end.isAfter(after))
+                      })
+                      .sort((a, b) => new Date(b.startdate) - new Date(a.startdate))
+                      .map(({ name, startdate, enddate }) => (
+                        <li style={{ padding: '0.2em 0.3em', display: 'flex', alignItems: 'center' }}>
+                          <span style={{ flexGrow: 1 }}>{getTextIn(name)}</span>
+                          {createDateButton(startdate, 'Start')}
+                          {createDateButton(moment(enddate).subtract(1, 'days'), 'End')}
+                        </li>
+                      ))}
+                </ul>
+              </>
+            )}
+          </>
+        )
+      }}
+      renderInput={(_, open) => (
+        <Button
+          icon={value !== null}
+          labelPosition={value !== null && 'right'}
+          onClick={open}
+          className="credit-date-filter-input"
+          size="mini"
+          style={{
+            whiteSpace: 'nowrap',
+            paddingRight: value ? '3.5em !important' : undefined,
+            paddingLeft: value ? '1em !important' : undefined,
+          }}
+        >
+          {value === null ? 'Select Date' : moment(value).format('DD.MM.YYYY')}
+          {value !== null && (
+            <Icon
+              name="x"
+              onClick={evt => {
+                evt.stopPropagation()
+                onChange(null)
+              }}
+            />
+          )}
+        </Button>
+      )}
+    />
+  )
+}
+
+export default DateTime

services/frontend/src/components/DateTimeSelector/style.css

@@ -0,0 +1,3 @@
+.date-picker-semester-button:hover {
+  background-color: red;
+}

services/frontend/src/components/FigureContainer/index.jsx

@@ -0,0 +1,122 @@
+import React, { createContext, useContext, useState, useEffect, useMemo } from 'react'
+import { Icon, Card, Dropdown, Portal, Popup } from 'semantic-ui-react'
+import { createHtmlPortalNode, InPortal, OutPortal } from 'react-reverse-portal'
+
+import './styles.css'
+
+const FigureContext = createContext(null)
+
+const Header = ({ children, actions, contextItems }) => {
+  const { isFullscreen, setFullscreen } = useContext(FigureContext)
+
+  return (
+    <Card.Content style={{ flexGrow: 0, display: 'flex', alignItems: 'center', padding: '1em', height: '3.25em' }}>
+      <div style={{ fontWeight: 'bold', fontSize: '1.1rem' }}>{children}</div>
+      <div style={{ flexGrow: 1 }} />
+      <div style={{ marginRight: '1em' }}>{actions}</div>
+      <Popup
+        trigger={
+          <Icon
+            name={isFullscreen ? 'compress' : 'expand'}
+            onClick={() => setFullscreen(!isFullscreen)}
+            style={{ cursor: 'pointer', fontSize: '1.1rem', marginRight: '0.5em', position: 'relative', top: '-1px' }}
+          />
+        }
+        on="hover"
+        position="bottom"
+      >
+        Toggle Fullscreen
+      </Popup>
+      {contextItems && (
+        <div>
+          <Dropdown position="bottom center" direction="left" icon="ellipsis vertical">
+            <Dropdown.Menu>
+              {contextItems.map(({ label, onClick }) => (
+                <Dropdown.Item onClick={onClick}>{label}</Dropdown.Item>
+              ))}
+            </Dropdown.Menu>
+          </Dropdown>
+        </div>
+      )}
+    </Card.Content>
+  )
+}
+
+const Content = ({ children, ...rest }) => {
+  const { isFullscreen } = useContext(FigureContext)
+
+  const style = {
+    ...rest.style,
+    overflow: 'auto',
+  }
+
+  if (isFullscreen) {
+    style.maxHeight = 'initial'
+  }
+
+  return (
+    <Card.Content {...rest} style={style}>
+      {children}
+    </Card.Content>
+  )
+}
+
+const FigureContainer = ({ children, style }) => {
+  const [isFullscreen, setFullscreen] = useState(false)
+
+  const portalNode = useMemo(
+    () =>
+      createHtmlPortalNode({
+        attributes: {
+          class: 'ui card fluid',
+        },
+      }),
+    []
+  )
+
+  useEffect(() => {
+    if (isFullscreen) {
+      document.body.classList.add('figure-fullscreen')
+      portalNode.element.style = `
+        position: sticky;
+        margin: 0;
+        inset: 0;
+        height: 100vh;
+        border: none;
+        border-radius: 0;
+      `
+    } else {
+      document.body.classList.remove('figure-fullscreen')
+      portalNode.element.style = `
+        overflow: hidden;
+        maxHeight: 100%;
+      `
+      Object.assign(portalNode.element.style, style)
+    }
+
+    return () => document.body.classList.remove('figure-fullscreen')
+  }, [isFullscreen, portalNode])
+
+  return (
+    <FigureContext.Provider value={{ isFullscreen, setFullscreen }}>
+      <InPortal node={portalNode}>{children}</InPortal>
+      {!isFullscreen && <OutPortal node={portalNode} />}
+      <Portal
+        open={isFullscreen}
+        style={{
+          width: '100% !important',
+          height: '100% !important',
+        }}
+      >
+        <div style={{ inset: 0, position: 'absolute', zIndex: 9004, height: '100000vh' }}>
+          {isFullscreen && <OutPortal node={portalNode} />}
+        </div>
+      </Portal>
+    </FigureContext.Provider>
+  )
+}
+
+FigureContainer.Header = Header
+FigureContainer.Content = Content
+
+export default FigureContainer

services/frontend/src/components/FigureContainer/styles.css

@@ -0,0 +1,3 @@
+body.figure-fullscreen {
+  overflow: hidden;
+}

services/frontend/src/components/FilterToggleIcon/index.jsx

@@ -4,7 +4,7 @@ import { Icon } from 'semantic-ui-react'
 import './filterToggleIcon.css'
 
 const FilterToggleIcon = ({ onClick, isActive }) => (
-  <span className={`flexIcon ${isActive ? 'active' : ''}`}>
+  <span className={`flexIcon ${isActive ? 'active' : ''}`} style={{ cursor: 'pointer' }}>
     <Icon onClick={onClick} name="filter" />
     <Icon onClick={onClick} name={isActive ? 'remove' : 'add'} size="tiny" />
   </span>

services/frontend/src/components/FilterView/filters/age.jsx

@@ -1,5 +1,7 @@
-import React, { useState, useEffect } from 'react'
-import { Form, Label, Input } from 'semantic-ui-react'
+import React, { useMemo, useCallback } from 'react'
+import RangeSelector from 'components/RangeSelector'
+import { useDebounce } from 'common/hooks'
+import _ from 'lodash'
 import createFilter from './createFilter'
 
 export const contextKey = 'ageFilter'
@@ -15,79 +17,27 @@ const getAge = toDate => {
   return age
 }
 
-const AgeFilterCard = ({ options, onOptionsChange }) => {
-  const [currentValue, setCurrentValue] = useState(options)
-  const [updatedAt, setUpdatedAt] = useState(null)
+const AgeFilterCard = ({ options, onOptionsChange, bounds }) => {
+  const { min, max } = bounds
 
-  // const { currentValue, setCurrentValue } = useAgeFilter()
-  // const { addFilter, removeFilter, activeFilters } = useFilters()
+  const onChange = useCallback(
+    ([min, max]) => {
+      onOptionsChange({ min, max })
+    },
+    [onOptionsChange]
+  )
 
-  const labels = { min: 'At Least', max: 'Less Than' }
+  const value = useMemo(() => [options.min ?? min, options.max ?? max], [options.min, options.max, min, max])
 
-  const now = () => new Date().getTime()
-
-  const updateFilters = () => {
-    const { min, max } = currentValue
-
-    onOptionsChange({
-      min: min === '' ? null : parseInt(min, 10),
-      max: max === '' ? null : parseInt(max, 10),
-    })
-  }
-
-  useEffect(() => {
-    const { min, max } = options
-
-    setCurrentValue({
-      min: min !== null ? min : currentValue.min,
-      max: max !== null ? max : currentValue.max,
-    })
-  }, [options.min, options.max])
-
-  // Update filters automatically 2 sec after value change.
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      if (updatedAt !== null && now() - updatedAt > 1900) {
-        updateFilters()
-        setUpdatedAt(null)
-      }
-    }, 2000)
-    return () => clearTimeout(timer)
-  }, [updatedAt])
-
-  const onChange =
-    key =>
-    (_, { value }) => {
-      setCurrentValue(prev => ({ ...prev, [key]: value }))
-      setUpdatedAt(now())
-    }
-
-  const onKeyDown = event => {
-    if (event.keyCode === 13) {
-      event.preventDefault()
-      setUpdatedAt(null)
-      updateFilters()
-    }
-  }
+  const [range, setRange] = useDebounce(value, 1000, onChange)
 
   return (
-    <Form>
+    <div>
+      <p>Valitse ikähaitari, jolle asettuvat opiskelijat näytetään:</p>
       <div className="card-content">
-        {Object.keys(currentValue).map(key => (
-          <Form.Field key={`total-age-filter-${key}`}>
-            <Label style={{ marginBottom: '0.5rem' }}>{labels[key]}</Label>
-            <Input
-              size="mini"
-              onChange={onChange(key)}
-              value={currentValue[key] ?? ''}
-              onKeyDown={onKeyDown}
-              data-cy={`ageFilter-${key}`}
-              style={{ width: '100px' }}
-            />
-          </Form.Field>
-        ))}
+        {min < max && <RangeSelector min={min} max={max} onChange={setRange} value={range} />}
       </div>
-    </Form>
+    </div>
   )
 }
 
@@ -101,6 +51,15 @@ export default createFilter({
 
   isActive: ({ min, max }) => min !== null || max !== null,
 
+  precompute: ({ students }) => {
+    const ages = students.map(s => getAge(s.birthdate)).filter(age => !Number.isNaN(age))
+
+    return {
+      min: _.min(ages),
+      max: _.max(ages),
+    }
+  },
+
   filter: (student, { min, max }) => {
     const age = getAge(student.birthdate)
 
@@ -108,12 +67,12 @@ export default createFilter({
       return false
     }
 
-    if (max !== null && max <= age) {
+    if (max !== null && max < age) {
       return false
     }
 
     return true
   },
 
-  component: AgeFilterCard,
+  render: (props, { precomputed }) => <AgeFilterCard {...props} bounds={precomputed} />,
 })

services/frontend/src/components/FilterView/filters/creditsEarned.jsx

@@ -1,86 +1,30 @@
-import React, { useState, useEffect } from 'react'
-import { Form, Input, Label } from 'semantic-ui-react'
+import RangeSelector from 'components/RangeSelector'
+import React, { useMemo } from 'react'
+import _ from 'lodash'
+import { useDebounce } from 'common/hooks'
 import { getStudentTotalCredits } from '../../../common'
 import createFilter from './createFilter'
 
 export const contextKey = 'creditFilter'
-const labels = { min: 'At Least', max: 'Less Than' }
 
-const CreditsEarnedFilterCard = ({ options, onOptionsChange }) => {
-  const [localOptions, setLocalOptions] = useState(options)
-  const { min, max } = localOptions
-  const [updatedAt, setUpdatedAt] = useState(null)
+const CreditsEarnedFilterCard = ({ options, onOptionsChange, bounds }) => {
+  const { min, max } = bounds
 
-  const now = () => new Date().getTime()
-
-  const updateFilters = () => {
-    onOptionsChange({
-      min: min === '' ? null : min,
-      max: max === '' ? null : max,
-    })
+  const onChange = ([min, max]) => {
+    onOptionsChange({ min, max })
   }
 
-  // Update filters automatically 2 sec after value change.
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      if (updatedAt && now() - updatedAt > 1900) {
-        updateFilters()
-        setUpdatedAt(null)
-      }
-    }, 2000)
+  const value = useMemo(() => [options.min ?? min, options.max ?? max], [options.min, options.max, min, max])
 
-    return () => clearTimeout(timer)
-  }, [updatedAt])
-
-  // Listen for external filtering requests (from credit stats table rows).
-  // TODO: Reimplement using something else
-  /* useEffect(() => {
-    Object.keys(currentValue).forEach(key => {
-      const newValue = requestedValue[key] === null ? '' : requestedValue[key]
-      const name = names[key]
-      setCurrentValue({ [key]: String(newValue) })
-
-      if (newValue === '') {
-        removeFilter(name)
-      } else {
-        addFilter(name, filterFunctions(newValue)[key])
-      }
-    })
-  }, [requestedValue]) */
-
-  const onChange =
-    key =>
-    (_, { value }) => {
-      setLocalOptions({ ...localOptions, [key]: value })
-      setUpdatedAt(now())
-    }
-
-  const onKeyDown = event => {
-    if (event.keyCode === 13) {
-      event.preventDefault()
-      setUpdatedAt(null)
-      updateFilters()
-    }
-  }
+  const [range, setRange] = useDebounce(value, 1000, onChange)
 
   return (
-    <Form>
+    <div>
+      <p>Valitse opintopistehaitari, jolle asettuvat opiskelijat näytetään:</p>
       <div className="card-content">
-        {['min', 'max'].map(key => (
-          <Form.Field key={`total-credits-filter-${key}`}>
-            <Label style={{ marginBottom: '0.5rem' }}>{labels[key]}</Label>
-            <Input
-              size="mini"
-              onChange={onChange(key)}
-              value={localOptions[key]}
-              onKeyDown={onKeyDown}
-              data-cy={`credit-filter-${key}`}
-              style={{ width: '100px' }}
-            />
-          </Form.Field>
-        ))}
+        {min < max && <RangeSelector min={min} max={max} onChange={setRange} value={range} />}
       </div>
-    </Form>
+    </div>
   )
 }
 
@@ -96,6 +40,15 @@ export default createFilter({
 
   isActive: ({ min, max }) => min !== null || max !== null,
 
+  precompute: ({ students }) => {
+    const credits = students.map(getStudentTotalCredits).filter(n => !Number.isNaN(n))
+
+    return {
+      max: _.max(credits),
+      min: _.min(credits),
+    }
+  },
+
   filter(student, { min, max }) {
     const credits = getStudentTotalCredits(student)
 
@@ -103,12 +56,12 @@ export default createFilter({
       return false
     }
 
-    if (max !== null && credits >= max) {
+    if (max !== null && credits > max) {
       return false
     }
 
     return true
   },
 
-  component: CreditsEarnedFilterCard,
+  render: (props, { precomputed }) => <CreditsEarnedFilterCard {...props} bounds={precomputed} />,
 })

services/frontend/src/components/FilterView/filters/date/DateTime.jsx

@@ -1,45 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import Datetime from 'react-datetime'
-import 'moment/locale/fi'
-import { Icon, Button } from 'semantic-ui-react'
-import moment from 'moment'
-
-const DateTime = ({ value, onChange }) => {
-  return (
-    <Datetime
-      value={value}
-      onChange={onChange}
-      timeFormat={false}
-      locale="fi"
-      closeOnSelect
-      renderInput={(_, open) => (
-        <Button
-          icon={value !== null}
-          labelPosition={value !== null && 'right'}
-          onClick={open}
-          className="credit-date-filter-input"
-          style={{ whiteSpace: 'nowrap' }}
-        >
-          {value === null ? 'Select Date' : moment(value).format('DD.MM.YYYY')}
-          {value !== null && (
-            <Icon
-              name="x"
-              onClick={evt => {
-                evt.stopPropagation()
-                onChange(null)
-              }}
-            />
-          )}
-        </Button>
-      )}
-    />
-  )
-}
-
-DateTime.propTypes = {
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.shape({})]).isRequired,
-  onChange: PropTypes.func.isRequired,
-}
-
-export default DateTime

services/frontend/src/components/FilterView/filters/date/index.jsx

@@ -1,7 +1,6 @@
 import React from 'react'
-import { Form } from 'semantic-ui-react'
 import 'moment/locale/fi'
-import DateTime from './DateTime'
+import DateRangeSelector from 'components/DateRangeSelector'
 import createFilter from '../createFilter'
 import filterInfo from '../../../../common/InfoToolTips/filters'
 
@@ -16,32 +15,16 @@ const CreditDateFilterCard = ({ options, onOptionsChange }) => {
   return (
     <>
       <div className="card-content" style={{ marginTop: '0.5rem' }}>
-        <Form>
-          <Form.Field>
-            <label>Start Date:</label>
-            <DateTime
-              value={startDate}
-              onChange={date =>
-                onOptionsChange({
-                  ...options,
-                  startDate: date,
-                })
-              }
-            />
-          </Form.Field>
-          <Form.Field>
-            <label>End Date:</label>
-            <DateTime
-              value={endDate}
-              onChange={date =>
-                onOptionsChange({
-                  ...options,
-                  endDate: date,
-                })
-              }
-            />
-          </Form.Field>
-        </Form>
+        <DateRangeSelector
+          showSemesters
+          value={[startDate, endDate]}
+          onChange={([startDate, endDate]) =>
+            onOptionsChange({
+              startDate,
+              endDate,
+            })
+          }
+        />
       </div>
     </>
   )

services/frontend/src/components/FilterView/filters/studyTrack.jsx

@@ -5,15 +5,21 @@ import moment from 'moment'
 import _ from 'lodash'
 import createFilter from './createFilter'
 
-const StudyTrackFilterCard = ({ options, onOptionsChange, withoutSelf, activeAt }) => {
+const StudyTrackFilterCard = ({ options, onOptionsChange, withoutSelf, activeAt, code }) => {
   const { selected } = options
 
-  const activeAtMoment = activeAt ? moment(activeAt) : moment()
+  const activeAtMoment = activeAt && moment(activeAt)
 
   const dropdownOptions = _.chain(withoutSelf())
     .flatMap(student => student.studyrights)
-    .flatMap(sr => sr.studyright_elements)
-    .filter(sre => sre.element_detail.type === 30 && activeAtMoment.isBetween(sre.startdate, sre.enddate, 'day', '[]'))
+    .map(sr => sr.studyright_elements)
+    .filter(sre => sre.some(e => e.code === code))
+    .flatMap()
+    .filter(
+      sre =>
+        sre.element_detail?.type === 30 &&
+        (activeAtMoment ? activeAtMoment.isBetween(sre.startdate, sre.enddate, 'day', '[]') : true)
+    )
     .map(sre => sre.element_detail)
     .keyBy('code')
     .values()
@@ -81,5 +87,7 @@ export default createFilter({
       .some(code => selected.includes(code))
   },
 
-  render: (props, { args }) => <StudyTrackFilterCard {...props} activeAt={_.get(args, 'activeAt')} />,
+  render: (props, { args }) => (
+    <StudyTrackFilterCard {...props} code={_.get(args, 'code')} activeAt={_.get(args, 'activeAt')} />
+  ),
 })

services/frontend/src/components/LanguagePicker/useLanguage.jsx

@@ -1,6 +1,7 @@
-import React, { createContext, useState, useContext, useEffect } from 'react'
+import React, { createContext, useState, useCallback, useContext, useEffect } from 'react'
 import { useGetAuthorizedUserQuery } from 'redux/auth'
 import { LANGUAGE_CODES } from '../../constants'
+import { getTextIn } from '../../common'
 import { callApi } from '../../apiConnection'
 
 const LanguageContext = createContext([[], () => {}])
@@ -26,6 +27,9 @@ export const LanguageProvider = ({ children }) => {
 
 export default () => {
   const [state, setState] = useContext(LanguageContext)
+
+  const getTextInWrapped = useCallback(text => getTextIn(text, state), [state])
+
   const setLanguage = newLanguage => {
     if (!LANGUAGE_CODES.includes(newLanguage)) {
       throw new Error('Illegal language code passed to useLanguage hook!')
@@ -35,5 +39,9 @@ export default () => {
     callApi('/language', 'post', { language: newLanguage })
   }
 
-  return { language: state, setLanguage }
+  return {
+    language: state,
+    setLanguage,
+    getTextIn: getTextInWrapped,
+  }
 }

services/frontend/src/components/PopulationCourseStats/CourseFilterToggle.jsx

@@ -0,0 +1,40 @@
+import React from 'react'
+import { Popup } from 'semantic-ui-react'
+import { useSelector } from 'react-redux'
+import { isCourseSelected, toggleCourseSelection } from 'components/FilterView/filters/courses'
+import FilterToggleIcon from 'components/FilterToggleIcon'
+import useFilters from 'components/FilterView/useFilters'
+import { getTextIn } from '../../common'
+
+const CourseFilterToggle = ({ course }) => {
+  const { language } = useSelector(({ settings }) => settings)
+  const { useFilterSelector, filterDispatch } = useFilters()
+
+  const isActive = useFilterSelector(isCourseSelected(course.code))
+
+  return (
+    <Popup
+      trigger={
+        <FilterToggleIcon
+          style={{ cursor: 'pointer' }}
+          isActive={isActive}
+          onClick={() => filterDispatch(toggleCourseSelection(course.code))}
+        />
+      }
+      content={
+        isActive ? (
+          <span>
+            Poista rajaus kurssin <b>{getTextIn(course.name, language)}</b> perusteella
+          </span>
+        ) : (
+          <span>
+            Rajaa opiskelijat kurssin <b>{getTextIn(course.name, language)}</b> perusteella
+          </span>
+        )
+      }
+      position="top right"
+    />
+  )
+}
+
+export default CourseFilterToggle

services/frontend/src/components/PopulationCourseStats/GradeDistribution/GradeDistributionFlat.jsx

@@ -1,24 +0,0 @@
-import React from 'react'
-import { Table } from 'semantic-ui-react'
-import { UsePopulationCourseContext } from '../PopulationCourseContext'
-import GradeDistributionHeader from './GradeDistributionHeader'
-import GradeDistributionRow from './GradeDistributionRow'
-
-const gradeTypes = [1, 2, 3, 4, 5]
-
-const GradeDistributionFlat = () => {
-  const { courseStatistics } = UsePopulationCourseContext()
-
-  return (
-    <Table celled sortable className="fixed-header">
-      <GradeDistributionHeader gradeTypes={gradeTypes} />
-      <Table.Body>
-        {courseStatistics.map(stats => (
-          <GradeDistributionRow key={stats.course.code} courseStatistics={stats} gradeTypes={gradeTypes} />
-        ))}
-      </Table.Body>
-    </Table>
-  )
-}
-
-export default GradeDistributionFlat

services/frontend/src/components/PopulationCourseStats/GradeDistribution/GradeDistributionHeader.jsx

@@ -1,39 +0,0 @@
-import React from 'react'
-import { arrayOf, number } from 'prop-types'
-import { Table } from 'semantic-ui-react'
-import { UsePopulationCourseContext } from '../PopulationCourseContext'
-import SortableHeaderCell from '../SortableHeaderCell'
-
-const GradeDistributionHeader = ({ gradeTypes }) => {
-  const { onSortableColumnHeaderClick, filterInput, reversed, sortCriteria, tableColumnNames } =
-    UsePopulationCourseContext()
-
-  return (
-    <Table.Header>
-      <Table.Row>
-        {filterInput('nameFilter', 'Name', '3')}
-        {filterInput('codeFilter', 'Code')}
-
-        <SortableHeaderCell
-          content="Attempts"
-          columnName={tableColumnNames.STUDENTS}
-          onClickFn={onSortableColumnHeaderClick}
-          activeSortColumn={sortCriteria}
-          reversed={reversed}
-        />
-
-        <Table.HeaderCell>0</Table.HeaderCell>
-        {gradeTypes.map(g => (
-          <Table.HeaderCell content={g} key={g} />
-        ))}
-        <Table.HeaderCell content="Other passed" />
-      </Table.Row>
-    </Table.Header>
-  )
-}
-
-GradeDistributionHeader.propTypes = {
-  gradeTypes: arrayOf(number).isRequired,
-}
-
-export default GradeDistributionHeader

services/frontend/src/components/PopulationCourseStats/GradeDistribution/GradeDistributionRow.jsx

@@ -1,122 +0,0 @@
-import React from 'react'
-import { Table, Popup, Item, Icon } from 'semantic-ui-react'
-import { replace, sortBy, omit } from 'lodash'
-import { Link } from 'react-router-dom'
-import { shape, string, number, arrayOf } from 'prop-types'
-import { getTextIn } from '../../../common'
-import FilterToggleIcon from '../../FilterToggleIcon'
-import useFilters from '../../FilterView/useFilters'
-import { isCourseSelected, toggleCourseSelection } from '../../FilterView/filters/courses'
-import { UsePopulationCourseContext } from '../PopulationCourseContext'
-import { useLanguage } from '../../../common/hooks'
-
-const formatGradeDistribution = grades =>
-  replace(
-    JSON.stringify(
-      sortBy(
-        Object.entries(grades).map(([key, value]) => ({ [key]: value.count })),
-        o => -Object.keys(o)
-      ),
-      null,
-      1
-    ),
-    /\[\n|{\n*|{\s|}|\s*}|]|"|,/g,
-    ''
-  )
-
-const CourseRow = ({ courseStatistics, gradeTypes }) => {
-  const language = useLanguage()
-  const { useFilterSelector, filterDispatch } = useFilters()
-
-  const { onGoToCourseStatisticsClick } = UsePopulationCourseContext()
-
-  const { course, grades } = courseStatistics
-  const { name, code } = course
-
-  const isActive = useFilterSelector(isCourseSelected(course.code))
-  let attempts = 0
-  let failedGrades = 0
-  let otherPassed = 0
-
-  if (grades) {
-    const countSumReducer = (acc, cur) => acc + cur.count
-    const gradeValues = grades ? Object.values(grades) : null
-    attempts = gradeValues.reduce(countSumReducer, 0)
-    failedGrades = gradeValues.filter(g => g.status.failingGrade).reduce(countSumReducer, 0)
-    otherPassed = Object.values(omit(grades, gradeTypes))
-      .filter(g => g.status.passingGrade || g.status.improvedGrade)
-      .reduce(countSumReducer, 0)
-  }
-  return (
-    <Table.Row active={isActive}>
-      <Popup
-        trigger={
-          <Table.Cell className="filterCell clickableCell">
-            <FilterToggleIcon isActive={isActive} onClick={() => filterDispatch(toggleCourseSelection(course.code))} />
-          </Table.Cell>
-        }
-        content={
-          isActive ? (
-            <span>
-              Poista rajaus kurssin <b>{getTextIn(name, language)}</b> perusteella
-            </span>
-          ) : (
-            <span>
-              Rajaa opiskelijat kurssin <b>{getTextIn(name, language)}</b> perusteella
-            </span>
-          )
-        }
-        position="top right"
-      />
-      <Table.Cell content={getTextIn(name, language)} className="nameCell" />
-      <Table.Cell className="iconCell">
-        <p>
-          <Item
-            as={Link}
-            to={`/coursestatistics?courseCodes=["${encodeURIComponent(
-              code
-            )}"]&separate=false&unifyOpenUniCourses=false`}
-          >
-            <Icon name="level up alternate" onClick={() => onGoToCourseStatisticsClick(code)} />
-          </Item>
-        </p>
-      </Table.Cell>
-      <Table.Cell content={code} />
-      <Table.Cell content={attempts} />
-      <Table.Cell content={failedGrades} />
-      {gradeTypes.map(g => (
-        <Table.Cell content={grades[g] ? grades[g].count || 0 : 0} key={code + g} />
-      ))}
-      <Table.Cell content={otherPassed} />
-    </Table.Row>
-  )
-}
-
-const GradeDistributionRow = ({ courseStatistics, gradeTypes }) => {
-  const { course, grades } = courseStatistics
-  const { code } = course
-  return (
-    <Popup
-      key={code}
-      flowing
-      hoverable
-      inverted
-      position="top right"
-      hideOnScroll
-      content={grades ? <pre>{formatGradeDistribution(grades)}</pre> : 'Nothing to see here'}
-      trigger={<CourseRow courseStatistics={courseStatistics} gradeTypes={gradeTypes} />}
-    />
-  )
-}
-
-CourseRow.propTypes = {
-  courseStatistics: shape({ course: shape({ code: string }) }).isRequired,
-  gradeTypes: arrayOf(number).isRequired,
-}
-
-GradeDistributionRow.propTypes = {
-  courseStatistics: shape({ course: shape({ code: string }) }).isRequired,
-  gradeTypes: arrayOf(number).isRequired,
-}
-
-export default GradeDistributionRow

services/frontend/src/components/PopulationCourseStats/GradeDistribution/index.jsx

@@ -1,49 +1,152 @@
-import React from 'react'
-import { Table, Icon } from 'semantic-ui-react'
-import { instanceOf, func } from 'prop-types'
-import { useSelector } from 'react-redux'
+import React, { useMemo } from 'react'
+import { Link } from 'react-router-dom'
+import { Icon, Item } from 'semantic-ui-react'
+import SortableTable, { group } from 'components/SortableTable'
+import _ from 'lodash'
 import { getTextIn } from '../../../common'
+import CourseFilterToggle from '../CourseFilterToggle'
 import { UsePopulationCourseContext } from '../PopulationCourseContext'
-import GradeDistributionHeader from './GradeDistributionHeader'
-import GradeDistributionRow from './GradeDistributionRow'
 
-const gradeTypes = [1, 2, 3, 4, 5]
+const mapCourseData = course => ({
+  name: course.course.name,
+  code: course.course.code,
+  attempts: _.chain(course.grades).values().map('count').sum().value(),
+  otherPassed: _.chain(course.grades)
+    .omit(_.range(0, 6))
+    .filter(g => g.status.passingGrade || g.status.improvedGrade)
+    .map('count')
+    .sum()
+    .value(),
+  grades: {
+    ...course.grades,
+    0: {
+      count: _.chain(course.grades)
+        .filter(g => g.status.failingGrade)
+        .map('count')
+        .sum()
+        .value(),
+    },
+  },
+})
 
-const GradeDistribution = ({ expandedGroups, toggleGroupExpansion }) => {
-  const { modules } = UsePopulationCourseContext()
+const GradeDistribution = ({ flat }) => {
+  const { modules, courseStatistics, onGoToCourseStatisticsClick } = UsePopulationCourseContext()
 
-  const { language } = useSelector(({ settings }) => settings)
+  const columns = useMemo(
+    () => [
+      {
+        key: 'name-parent',
+        mergeHeader: true,
+        merge: true,
+        children: [
+          {
+            key: 'name',
+            title: 'Name',
+            getRowVal: row => getTextIn(row.name),
+            cellProps: {
+              style: {
+                maxWidth: '20em',
+                whiteSpace: 'normal',
+                overflow: 'hidden',
+              },
+            },
+          },
+          {
+            key: 'filter-toggle',
+            export: false,
+            getRowContent: (row, isGroup) => {
+              if (isGroup) return null
+
+              return <CourseFilterToggle course={row} />
+            },
+          },
+          {
+            key: 'go-to-course',
+            export: false,
+            getRowContent: (row, isGroup) =>
+              !isGroup && (
+                <Item
+                  as={Link}
+                  to={`/coursestatistics?courseCodes=["${encodeURIComponent(
+                    row.code
+                  )}"]&separate=false&unifyOpenUniCourses=false`}
+                >
+                  <Icon name="level up alternate" onClick={() => onGoToCourseStatisticsClick(row.code)} />
+                </Item>
+              ),
+          },
+        ],
+      },
+      {
+        key: 'code',
+        title: 'Code',
+        getRowVal: row => row.code,
+      },
+      {
+        key: 'stats',
+        noHeader: true,
+        getRowVal: (__, isGroup) => (isGroup ? ' ' : null),
+        children: [
+          {
+            key: 'attempts',
+            title: 'Attempts',
+            cellProps: { style: { textAlign: 'right' } },
+            filterType: 'range',
+            getRowVal: row => row.attempts,
+          },
+          ..._.range(0, 6).map(grade => ({
+            key: `grade-${grade}`,
+            title: `${grade}`,
+            cellProps: { style: { textAlign: 'right' } },
+            filterType: 'range',
+            getRowVal: row => row.grades?.[grade]?.count ?? 0,
+          })),
+          {
+            key: 'other-passed',
+            title: 'Other Passed',
+            cellProps: { style: { textAlign: 'right' } },
+            filterType: 'range',
+            getRowVal: row => row.otherPassed,
+          },
+        ],
+      },
+    ],
+    [onGoToCourseStatisticsClick]
+  )
+
+  const data = useMemo(() => {
+    if (flat) {
+      return courseStatistics.map(mapCourseData)
+    }
+
+    return modules.map(({ module, courses }) =>
+      group(
+        {
+          key: `module-${module.code}`,
+          module,
+          headerRowData: ({ definition: { module }, children }) => ({
+            name: module.name,
+            code: module.code,
+            attempts: _.chain(children).map('attempts').sum().value(),
+            otherPassed: _.chain(children).map('otherPassed').sum().value(),
+            grades: _.range(0, 6).map(grade => ({
+              count: _.chain(children)
+                .map(course => course.grades[grade]?.count ?? 0)
+                .sum()
+                .value(),
+            })),
+          }),
+        },
+        courses.map(mapCourseData)
+      )
+    )
+  }, [modules])
 
   return (
-    <Table celled sortable className="fixed-header">
-      <GradeDistributionHeader gradeTypes={gradeTypes} />
-      <Table.Body>
-        {modules.map(({ module, courses }) => (
-          <React.Fragment key={module.code}>
-            <Table.Row>
-              <Table.Cell style={{ cursor: 'pointer' }} colSpan="3" onClick={() => toggleGroupExpansion(module.code)}>
-                <Icon name={expandedGroups.has(module.code) ? 'angle down' : 'angle right'} />
-                <b>{getTextIn(module.name, language)}</b>
-              </Table.Cell>
-              <Table.Cell>
-                <b>{module.code}</b>
-              </Table.Cell>
-              <Table.Cell colSpan="8" />
-            </Table.Row>
-            {expandedGroups.has(module.code) &&
-              courses.map(course => (
-                <GradeDistributionRow key={course.course.code} courseStatistics={course} gradeTypes={gradeTypes} />
-              ))}
-          </React.Fragment>
-        ))}
-      </Table.Body>
-    </Table>
+    <>
+      <SortableTable title="Grade distribution of courses" data={data} columns={columns} />
+    </>
   )
 }
 
-GradeDistribution.propTypes = {
-  expandedGroups: instanceOf(Set).isRequired,
-  toggleGroupExpansion: func.isRequired,
-}
-
 export default GradeDistribution

services/frontend/src/components/PopulationCourseStats/PassFail/PassFailFlat.jsx

@@ -1,22 +0,0 @@
-import React from 'react'
-import { Table } from 'semantic-ui-react'
-import { UsePopulationCourseContext } from '../PopulationCourseContext'
-import PassFailHeader from './PassFailHeader'
-import PassFailRow from './PassFailRow'
-
-const PassFail = () => {
-  const { courseStatistics } = UsePopulationCourseContext()
-
-  return (
-    <Table className="fixed-header" celled sortable>
-      <PassFailHeader />
-      <Table.Body>
-        {courseStatistics.map(stats => (
-          <PassFailRow key={stats.course.code} courseStats={stats} />
-        ))}
-      </Table.Body>
-    </Table>
-  )
-}
-
-export default PassFail

services/frontend/src/components/PopulationCourseStats/PassFail/PassFailHeader.jsx

@@ -1,48 +0,0 @@
-import React from 'react'
-import { Table } from 'semantic-ui-react'
-import SortableHeaderCell from '../SortableHeaderCell'
-import { UsePopulationCourseContext } from '../PopulationCourseContext'
-
-const PassFailHeader = () => {
-  const { onSortableColumnHeaderClick, filterInput, tableColumnNames, sortCriteria, reversed } =
-    UsePopulationCourseContext()
-
-  const getSortableHeaderCell = (label, columnName, rowSpan = 1) => (
-    <SortableHeaderCell
-      content={label}
-      columnName={columnName}
-      onClickFn={onSortableColumnHeaderClick}
-      activeSortColumn={sortCriteria}
-      reversed={reversed}
-      rowSpan={rowSpan}
-    />
-  )
-
-  return (
-    <Table.Header>
-      <Table.Row>
-        <Table.HeaderCell colSpan="4" content="Course" />
-        {getSortableHeaderCell('Students', tableColumnNames.STUDENTS, 2)}
-        <Table.HeaderCell colSpan="3" content="Passed" />
-        <Table.HeaderCell colSpan="2" content="Failed" />
-        <Table.HeaderCell colSpan="2" content="Attempts" />
-        <Table.HeaderCell colSpan="2" content="percentage of population" />
-      </Table.Row>
-      <Table.Row>
-        {filterInput('nameFilter', 'Name', '3')}
-        {filterInput('codeFilter', 'Code')}
-        {getSortableHeaderCell('n', tableColumnNames.PASSED)}
-        {getSortableHeaderCell('after retry', tableColumnNames.RETRY_PASSED)}
-        {getSortableHeaderCell('percentage', tableColumnNames.PERCENTAGE)}
-        {getSortableHeaderCell('n', tableColumnNames.FAILED)}
-        {getSortableHeaderCell('many times', tableColumnNames.FAILED_MANY)}
-        {getSortableHeaderCell('n', tableColumnNames.ATTEMPTS)}
-        {getSortableHeaderCell('per student', tableColumnNames.PER_STUDENT)}
-        {getSortableHeaderCell('Passed', tableColumnNames.PASSED_OF_POPULATION)}
-        {getSortableHeaderCell('attempted', tableColumnNames.TRIED_OF_POPULATION)}
-      </Table.Row>
-    </Table.Header>
-  )
-}
-
-export default PassFailHeader

services/frontend/src/components/PopulationCourseStats/PassFail/PassFailRow.jsx

@@ -1,84 +0,0 @@
-import React from 'react'
-import { Table, Icon, Popup, Item } from 'semantic-ui-react'
-import { Link } from 'react-router-dom'
-import { shape, string } from 'prop-types'
-import { getTextIn } from '../../../common'
-import FilterToggleIcon from '../../FilterToggleIcon'
-import { UsePopulationCourseContext } from '../PopulationCourseContext'
-import useLanguage from '../../LanguagePicker/useLanguage'
-import { isCourseSelected, toggleCourseSelection } from '../../FilterView/filters/courses'
-import useFilters from '../../FilterView/useFilters'
-
-const PassFailRow = ({ courseStats }) => {
-  const { language } = useLanguage()
-  const { useFilterSelector, filterDispatch } = useFilters()
-  const { onGoToCourseStatisticsClick } = UsePopulationCourseContext()
-  const { course, stats } = courseStats
-  const { code, name } = course
-  const {
-    failed,
-    passed,
-    retryPassed,
-    failedMany,
-    attempts,
-    percentage,
-    perStudent,
-    passedOfPopulation,
-    triedOfPopulation,
-  } = stats
-  const isActive = useFilterSelector(isCourseSelected(course.code))
-  return (
-    <Table.Row key={code} active={isActive} data-cy={name.fi}>
-      <Popup
-        trigger={
-          <Table.Cell className="filterCell clickableCell">
-            <FilterToggleIcon isActive={isActive} onClick={() => filterDispatch(toggleCourseSelection(course.code))} />
-          </Table.Cell>
-        }
-        content={
-          isActive ? (
-            <span>
-              Poista rajaus kurssin <b>{getTextIn(name, language)}</b> perusteella
-            </span>
-          ) : (
-            <span>
-              Rajaa opiskelijat kurssin <b>{getTextIn(name, language)}</b> perusteella
-            </span>
-          )
-        }
-        position="top right"
-      />
-      <Table.Cell content={getTextIn(name, language)} className="nameCell" />
-      <Table.Cell className="iconCell clickableCell">
-        <p>
-          <Item
-            as={Link}
-            to={`/coursestatistics?courseCodes=["${encodeURIComponent(
-              code
-            )}"]&separate=false&unifyOpenUniCourses=false`}
-            data-cy={`coursestats-link-${code}`}
-          >
-            <Icon name="level up alternate" onClick={() => onGoToCourseStatisticsClick(code)} />
-          </Item>
-        </p>
-      </Table.Cell>
-      <Table.Cell content={code} />
-      <Table.Cell content={passed + failed} />
-      <Table.Cell content={passed} />
-      <Table.Cell content={retryPassed} />
-      <Table.Cell content={`${percentage.toFixed(2)} %`} />
-      <Table.Cell content={failed} />
-      <Table.Cell content={failedMany} />
-      <Table.Cell content={attempts} />
-      <Table.Cell content={perStudent.toFixed(2)} />
-      <Table.Cell content={`${passedOfPopulation.toFixed(2)}  %`} />
-      <Table.Cell content={`${triedOfPopulation.toFixed(2)}  %`} />
-    </Table.Row>
-  )
-}
-
-PassFailRow.propTypes = {
-  courseStats: shape({ course: shape({ code: string }) }).isRequired,
-}
-
-export default PassFailRow

services/frontend/src/components/PopulationCourseStats/PassFail/index.jsx

@@ -1,34 +1,231 @@
-import React from 'react'
-import { Table } from 'semantic-ui-react'
-import { func, instanceOf } from 'prop-types'
+import React, { useMemo } from 'react'
+import _ from 'lodash'
+import SortableTable, { group } from 'components/SortableTable'
+import { Item, Icon } from 'semantic-ui-react'
+import { Link } from 'react-router-dom'
+import CourseFilterToggle from '../CourseFilterToggle'
 import { UsePopulationCourseContext } from '../PopulationCourseContext'
-import CollapsibleModuleTable from '../CollapsibleModuleTable'
-import PassFailRow from './PassFailRow'
-import PassFailHeader from './PassFailHeader'
+import { getTextIn } from '../../../common'
 
-const PassFail = ({ expandedGroups, toggleGroupExpansion }) => {
-  const { modules } = UsePopulationCourseContext()
+const createModuleAggregateRow = ({ definition, children }) => ({
+  label_code: definition.module.code,
+  label_name: definition.module.name,
+  stats: {
+    passed: _.chain(children).map('stats.passed').sum().value(),
+    retryPassed: _.chain(children).map('stats.retryPassed').sum().value(),
+    percentage: _.chain(children).map('stats.percentage').mean().value(),
+    failed: _.chain(children).map('stats.failed').sum().value(),
+    failedMany: _.chain(children).map('stats.failedMany').sum().value(),
+    attempts: _.chain(children).map('stats.attempts').sum().value(),
+    perStudent: _.chain(children).map('stats.perStudent').mean().value(),
+    passedOfPopulation: _.chain(children).map('stats.passedOfPopulation').mean().value(),
+    triedOfPopulation: _.chain(children).map('stats.triedOfPopulation').mean().value(),
+  },
+})
+
+const PassFail = ({ flat }) => {
+  const { modules, courseStatistics, onGoToCourseStatisticsClick } = UsePopulationCourseContext()
+
+  const columns = useMemo(
+    () => [
+      {
+        key: 'course',
+        title: 'Course',
+        children: [
+          {
+            key: 'course-name-parent',
+            mergeHeader: true,
+            merge: true,
+            children: [
+              {
+                key: 'course-name',
+                title: 'Name',
+                getRowVal: (row, isGroup) => getTextIn(isGroup ? row.label_name : row.name ?? row.course.name),
+                cellProps: {
+                  style: {
+                    maxWidth: '20em',
+                    whiteSpace: 'normal',
+                    overflow: 'hidden',
+                  },
+                },
+              },
+              {
+                key: 'filter-toggle',
+                export: false,
+                getRowContent: (row, isGroup) => {
+                  if (isGroup) return null
+
+                  return <CourseFilterToggle course={row} />
+                },
+              },
+              {
+                key: 'go-to-course',
+                export: false,
+                getRowContent: (row, isGroup) =>
+                  !isGroup && (
+                    <Item
+                      as={Link}
+                      to={`/coursestatistics?courseCodes=["${encodeURIComponent(
+                        row.code
+                      )}"]&separate=false&unifyOpenUniCourses=false`}
+                    >
+                      <Icon name="level up alternate" onClick={() => onGoToCourseStatisticsClick(row.code)} />
+                    </Item>
+                  ),
+              },
+            ],
+          },
+          {
+            key: 'course-code',
+            title: 'Code',
+            getRowVal: (row, isGroup) => (isGroup ? row.label_code : row.code ?? row.course.code),
+          },
+        ],
+      },
+      {
+        key: 'statistics',
+        noHeader: true,
+        getRowVal: (_, isGroup) => (isGroup ? ' ' : undefined),
+        children: [
+          {
+            key: 'passed',
+            title: 'Passed',
+            children: [
+              {
+                key: 'passed-n',
+                title: 'Total',
+                cellStyle: { textAlign: 'right' },
+                filterType: 'range',
+                getRowVal: row => row.stats?.passed ?? 0,
+              },
+              {
+                key: 'passed-after-retry',
+                title: 'After Retry',
+                cellStyle: { textAlign: 'right' },
+                filterType: 'range',
+                getRowVal: row => row.stats?.retryPassed ?? 0,
+              },
+              {
+                key: 'passed-percentage',
+                title: 'Passed-%',
+                cellStyle: { textAlign: 'right' },
+                filterType: 'range',
+                getRowVal: row => row.stats?.percentage ?? 0,
+                formatValue: value =>
+                  value &&
+                  new Intl.NumberFormat('fi-FI', {
+                    style: 'percent',
+                    minimumFractionDigits: 2,
+                    maximumFractionDigits: 2,
+                  }).format(value / 100),
+              },
+            ],
+          },
+          {
+            key: 'failed',
+            title: 'Failed',
+            children: [
+              {
+                key: 'failed-n',
+                title: 'Total',
+                cellStyle: { textAlign: 'right' },
+                filterType: 'range',
+                getRowVal: row => row.stats?.failed ?? 0,
+              },
+              {
+                key: 'failed-many',
+                title: 'Multiple Times',
+                cellStyle: { textAlign: 'right' },
+                filterType: 'range',
+                getRowVal: row => row.stats?.failedMany ?? 0,
+              },
+            ],
+          },
+          {
+            key: 'attempts',
+            title: 'Attempts',
+            children: [
+              {
+                key: 'attempts-n',
+                title: 'Total',
+                cellStyle: { textAlign: 'right' },
+                filterType: 'range',
+                getRowVal: row => row.stats?.attempts,
+              },
+              {
+                key: 'attempts-per-student',
+                title: 'per Student',
+                cellStyle: { textAlign: 'right' },
+                filterType: 'range',
+                getRowVal: row => row.stats?.perStudent,
+                formatValue: value =>
+                  new Intl.NumberFormat('fi-FI', { maximumFractionDigits: 2, minimumFractionDigits: 2 }).format(value),
+              },
+            ],
+          },
+          {
+            key: 'of-population',
+            title: 'Percentage of Population',
+            children: [
+              {
+                key: 'passed-of-population',
+                title: 'Passed',
+                cellStyle: { textAlign: 'right' },
+                filterType: 'range',
+                getRowVal: row => row.stats?.passedOfPopulation,
+                formatValue: value =>
+                  new Intl.NumberFormat('fi-FI', {
+                    style: 'percent',
+                    minimumFractionDigits: 2,
+                    maximumFractionDigits: 2,
+                  }).format(value / 100),
+              },
+              {
+                key: 'attempted-of-population',
+                title: 'Attempted',
+                cellStyle: { textAlign: 'right' },
+                filterType: 'range',
+                getRowVal: row => row.stats?.triedOfPopulation,
+                formatValue: value =>
+                  new Intl.NumberFormat('fi-FI', {
+                    style: 'percent',
+                    minimumFractionDigits: 2,
+                    maximumFractionDigits: 2,
+                  }).format(value / 100),
+              },
+            ],
+          },
+        ],
+      },
+    ],
+    [onGoToCourseStatisticsClick]
+  )
+
+  const data = useMemo(() => {
+    if (flat) {
+      return courseStatistics.map(course => ({ ...course, code: course.course.code, name: course.course.name }))
+    }
+
+    return _.chain(modules)
+      .map(({ module, courses }) =>
+        group(
+          {
+            key: `module-${module.code}`,
+            module,
+            headerRowData: createModuleAggregateRow,
+            columnOverrides: {},
+          },
+          courses
+        )
+      )
+      .value()
+  }, [modules])
 
   return (
-    <Table className="fixed-header" celled sortable>
-      <PassFailHeader />
-      <Table.Body>
-        <CollapsibleModuleTable
-          emptyColSpan={12}
-          modules={modules}
-          expandedGroups={expandedGroups}
-          toggleGroupExpansion={toggleGroupExpansion}
-        >
-          {courses => courses.map(stats => <PassFailRow key={stats.course.code} courseStats={stats} />)}
-        </CollapsibleModuleTable>
-      </Table.Body>
-    </Table>
+    <>
+      <SortableTable title="Pass and fail statistics of courses" data={data} columns={columns} />
+    </>
   )
 }
 
-PassFail.propTypes = {
-  expandedGroups: instanceOf(Set).isRequired,
-  toggleGroupExpansion: func.isRequired,
-}
-
 export default PassFail

services/frontend/src/components/PopulationCourseStats/PassingSemesters/CumulativeCheckbox.jsx

@@ -14,7 +14,9 @@ const CumulativeCheckbox = ({ cumulativeStats, setCumulativeStats }) => {
     setCumulativeStats(!cumulativeStats)
   }
 
-  return <Checkbox toggle checked={cumulativeStats} onChange={handleChange} label="Show cumulative stats" />
+  return (
+    <Checkbox toggle checked={cumulativeStats} onChange={handleChange} label="Show cumulative stats" size="small" />
+  )
 }
 
 CumulativeCheckbox.propTypes = {

services/frontend/src/components/PopulationCourseStats/PassingSemesters/index.jsx

@@ -1,43 +1,159 @@
-import React, { useState } from 'react'
-import { Table } from 'semantic-ui-react'
-import { func, instanceOf } from 'prop-types'
-import PassingSemesterRow from './PassingSemesterRow'
-import CollapsibleModuleTable from '../CollapsibleModuleTable'
-import PassingSemestersHeader from './PassingSemestersHeader'
+import React, { useMemo, useState } from 'react'
+import _ from 'lodash'
+import { Link } from 'react-router-dom'
+import { Item, Icon, Button } from 'semantic-ui-react'
+import SortableTable, { group } from 'components/SortableTable'
+import { getTextIn } from '../../../common'
 import { UsePopulationCourseContext } from '../PopulationCourseContext'
-import CumulativeCheckbox from './CumulativeCheckbox'
+import CourseFilterToggle from '../CourseFilterToggle'
 
-const PassingSemesters = ({ expandedGroups, toggleGroupExpansion }) => {
-  const { modules } = UsePopulationCourseContext()
+const semesterColumn = (year, semester, cumulative) => ({
+  key: `semester-${year}-${semester}`,
+  cellProps: { style: { textAlign: 'right' } },
+  filterType: 'range',
+  title: semester,
+  getRowVal: row =>
+    ((cumulative ? row?.stats?.passingSemestersCumulative : row?.stats?.passingSemesters) ?? {})[
+      `${year}-${semester.toUpperCase()}`
+    ],
+  getRowContent: row => {
+    const value = ((cumulative ? row?.stats?.passingSemestersCumulative : row?.stats?.passingSemesters) ?? {})[
+      `${year}-${semester.toUpperCase()}`
+    ]
+
+    if (value === 0) {
+      return null
+    }
+    return value
+  },
+})
+
+const yearColumn = (year, cumulative) => ({
+  key: `year-${year}`,
+  title: `${year + 1}${['st', 'nd', 'rd'][year] ?? 'th'} year`,
+  children: [semesterColumn(year, 'Fall', cumulative), semesterColumn(year, 'Spring', cumulative)],
+})
+
+const PassingSemesters = () => {
+  const { modules, onGoToCourseStatisticsClick } = UsePopulationCourseContext()
   const [cumulativeStats, setCumulativeStats] = useState(false)
 
+  const columns = useMemo(
+    () => [
+      {
+        key: 'course-name',
+        mergeHeader: true,
+        merge: true,
+        children: [
+          {
+            key: 'name',
+            title: 'Name',
+            getRowVal: (row, isGroup, parents) => getTextIn(isGroup ? parents[0].module.name : row.name),
+            cellProps: {
+              style: {
+                maxWidth: '20em',
+                whiteSpace: 'normal',
+                overflow: 'hidden',
+              },
+            },
+          },
+          {
+            key: 'filter-toggle',
+            export: false,
+            getRowContent: (row, isGroup) => {
+              if (isGroup) return null
+
+              return <CourseFilterToggle course={row} />
+            },
+          },
+          {
+            key: 'go-to-course',
+            export: false,
+            getRowContent: (row, isGroup) =>
+              !isGroup && (
+                <Item
+                  as={Link}
+                  to={`/coursestatistics?courseCodes=["${encodeURIComponent(
+                    row.code
+                  )}"]&separate=false&unifyOpenUniCourses=false`}
+                >
+                  <Icon name="level up alternate" onClick={() => onGoToCourseStatisticsClick(row.code)} />
+                </Item>
+              ),
+          },
+        ],
+      },
+      {
+        key: 'code',
+        title: 'Code',
+        getRowVal: (row, isGroup, parents) => (isGroup ? parents[0].module.code : row.code),
+      },
+      {
+        key: 'stats',
+        noHeader: true,
+        getRowVal: (__, isGroup) => (isGroup ? ' ' : null),
+        children: [
+          {
+            key: 'students',
+            title: 'Students',
+            filterType: 'range',
+            getRowVal: row => row.stats?.students,
+            cellProps: { style: { textAlign: 'right' } },
+          },
+          {
+            key: 'passed',
+            title: 'Passed',
+            filterType: 'range',
+            getRowVal: row => row.stats?.passed,
+            cellProps: { style: { textAlign: 'right' } },
+          },
+          {
+            key: 'passed-before',
+            title: 'Before 1st year',
+            filterType: 'range',
+            getRowVal: row =>
+              (cumulativeStats ? row.stats?.passingSemesters : row.stats?.passingSemestersCumulative)?.BEFORE,
+            cellProps: { style: { textAlign: 'right' } },
+          },
+          ..._.range(0, 6).map(i => yearColumn(i, cumulativeStats)),
+        ],
+      },
+    ],
+    [cumulativeStats, onGoToCourseStatisticsClick]
+  )
+
+  const data = useMemo(
+    () =>
+      _.chain(modules)
+        .map(({ module, courses }) =>
+          group(
+            {
+              key: `module-${module.code}`,
+              module,
+              headerRowData: {},
+              columnOverrides: {},
+            },
+            courses
+          )
+        )
+        .value(),
+    [modules]
+  )
+
   return (
     <div>
-      <CumulativeCheckbox cumulativeStats={cumulativeStats} setCumulativeStats={setCumulativeStats} />
-      <Table celled className="fixed-header">
-        <PassingSemestersHeader />
-        <Table.Body>
-          <CollapsibleModuleTable
-            modules={modules}
-            emptyColSpan={15}
-            expandedGroups={expandedGroups}
-            toggleGroupExpansion={toggleGroupExpansion}
-          >
-            {courses =>
-              courses.map(stats => (
-                <PassingSemesterRow key={stats.course.code} statistics={stats} cumulative={cumulativeStats} />
-              ))
-            }
-          </CollapsibleModuleTable>
-        </Table.Body>
-      </Table>
+      <SortableTable
+        title="Students Passing a Course per Semester"
+        actions={
+          <Button size="mini" style={{ padding: '.75em .75em' }} onClick={() => setCumulativeStats(!cumulativeStats)}>
+            {cumulativeStats ? 'Show yearly stats' : 'Show cumulative stats'}
+          </Button>
+        }
+        columns={columns}
+        data={data}
+      />
     </div>
   )
 }
 
-PassingSemesters.propTypes = {
-  expandedGroups: instanceOf(Set).isRequired,
-  toggleGroupExpansion: func.isRequired,
-}
-
 export default PassingSemesters

services/frontend/src/components/PopulationCourseStats/PopulationCourseStatsFlat.jsx

@@ -1,13 +1,14 @@
 import React, { useState, useEffect, useCallback, useMemo } from 'react'
-import { useDispatch, useSelector } from 'react-redux'
+import { useDispatch } from 'react-redux'
 import { Table, Form, Input, Tab, Icon } from 'semantic-ui-react'
 import { orderBy, debounce } from 'lodash'
+import { useGetSemestersQuery } from 'redux/semesters'
 import { clearCourseStats } from '../../redux/coursestats'
 import './populationCourseStats.css'
 import { PopulationCourseContext } from './PopulationCourseContext'
 import TSA from '../../common/tsa'
-import GradeDistribution from './GradeDistribution/GradeDistributionFlat'
-import PassFail from './PassFail/PassFailFlat'
+import GradeDistribution from './GradeDistribution'
+import PassFail from './PassFail'
 import { getTextIn } from '../../common'
 import useLanguage from '../LanguagePicker/useLanguage'
 
@@ -86,9 +87,11 @@ const initialState = props => ({
 
 const PopulationCourseStatsFlat = ({ courses, pending, filteredStudents, showFilter = true }) => {
   const dispatch = useDispatch()
-  const { years } = useSelector(({ semesters }) => semesters.data)
+  const semesterRequest = useGetSemestersQuery()
   const { language } = useLanguage()
 
+  const years = semesterRequest.isLoading ? [] : semesterRequest.data.years
+
   const props = {
     courses,
     pending,
@@ -215,17 +218,17 @@ const PopulationCourseStatsFlat = ({ courses, pending, filteredStudents, showFil
     {
       menuItem: 'pass/fail',
       render: () => (
-        <div className="menuTab">
-          <PassFail />
-        </div>
+        <Tab.Pane>
+          <PassFail flat />
+        </Tab.Pane>
       ),
     },
     {
       menuItem: 'grades',
       render: () => (
-        <div className="menuTab">
-          <GradeDistribution />
-        </div>
+        <Tab.Pane>
+          <GradeDistribution flat />
+        </Tab.Pane>
       ),
     },
   ]