mirror of
https://github.com/UniversityOfHelsinkiCS/oodikone.git
synced 2026-10-12 19:03:39 +03:00
Remove inactive-field from studyprogramme basics
This commit is contained in:
@@ -7,13 +7,7 @@ const {
|
||||
getStartDate,
|
||||
tableTitles,
|
||||
} = require('./studyprogrammeHelpers')
|
||||
const {
|
||||
graduatedStudyRights,
|
||||
startedStudyrights,
|
||||
inactiveStudyrights,
|
||||
transfersAway,
|
||||
transfersTo,
|
||||
} = require('./studyprogramme')
|
||||
const { graduatedStudyRights, startedStudyrights, transfersAway, transfersTo } = require('./studyprogramme')
|
||||
const { getYearStartAndEndDates } = require('../util/semester')
|
||||
|
||||
const getStartedStats = async ({ studyprogramme, since, years, isAcademicYear, includeAllSpecials }) => {
|
||||
@@ -64,27 +58,6 @@ const getGraduatedStats = async ({ studyprogramme, since, years, isAcademicYear,
|
||||
return { graphStats, tableStats }
|
||||
}
|
||||
|
||||
const getInactiveStats = 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 studyrights = await inactiveStudyrights(studyprogramme, studentnumbersOfTheYear)
|
||||
graphStats[indexOf(years, year)] += studyrights.length
|
||||
tableStats[year] += studyrights.length
|
||||
})
|
||||
)
|
||||
|
||||
return { graphStats, tableStats }
|
||||
}
|
||||
|
||||
const getTransferredAwayStats = async ({ studyprogramme, since, years, isAcademicYear }) => {
|
||||
const studyrights = await transfersAway(studyprogramme, since)
|
||||
const { graphStats, tableStats } = getStatsBasis(years)
|
||||
@@ -119,7 +92,6 @@ const getBasicStatsForStudytrack = async ({ studyprogramme, settings }) => {
|
||||
const queryParameters = { studyprogramme, since, years, isAcademicYear, includeAllSpecials }
|
||||
const started = await getStartedStats(queryParameters)
|
||||
const graduated = await getGraduatedStats(queryParameters)
|
||||
const inactive = await getInactiveStats(queryParameters)
|
||||
const transferredAway = await getTransferredAwayStats(queryParameters)
|
||||
const transferredTo = await getTransferredToStats(queryParameters)
|
||||
|
||||
@@ -131,7 +103,6 @@ const getBasicStatsForStudytrack = async ({ studyprogramme, settings }) => {
|
||||
year,
|
||||
started.tableStats[year],
|
||||
graduated.tableStats[year],
|
||||
inactive.tableStats[year],
|
||||
transferredAway.tableStats[year],
|
||||
transferredTo.tableStats[year],
|
||||
]
|
||||
@@ -151,10 +122,6 @@ const getBasicStatsForStudytrack = async ({ studyprogramme, settings }) => {
|
||||
name: 'Graduated',
|
||||
data: graduated.graphStats,
|
||||
},
|
||||
{
|
||||
name: 'Inactive',
|
||||
data: inactive.graphStats,
|
||||
},
|
||||
{
|
||||
name: 'Transferred away',
|
||||
data: transferredAway.graphStats,
|
||||
|
||||
@@ -276,7 +276,7 @@ const getCreditThresholds = studyprogramme => {
|
||||
const tableTitles = {
|
||||
basics: {
|
||||
SPECIAL_EXCLUDED: ['', 'Started studying', 'Graduated'],
|
||||
SPECIAL_INCLUDED: ['', 'Started studying', 'Graduated', 'Inactive', 'Transferred away', 'Transferred to'],
|
||||
SPECIAL_INCLUDED: ['', 'Started studying', 'Graduated', 'Transferred away', 'Transferred to'],
|
||||
},
|
||||
credits: {
|
||||
SPECIAL_EXCLUDED: ['', 'Total', 'Major students credits', 'Transferred credits'],
|
||||
|
||||
Reference in New Issue
Block a user