iritmaximus/oodikone
1
0
Fork 0
mirror of https://github.com/UniversityOfHelsinkiCS/oodikone.git synced 2026-10-12 19:03:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

[Study programme overview] Make getStartDate function simpler, it doesn't need study programme

Browse Source
This commit is contained in:
Valtteri Kantanen
2024-07-03 11:11:24 +03:00
parent 04c78d4c15
commit 85c662c939
5 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/backend/src/services/faculty/facultyStudents.js
+1 -1
View File
@@ -205,7 +205,7 @@ const combineFacultyStudents = async (code, programmes, specialGroups, graduated
// Only academic years are considered
const includeAllSpecials = specialGroups === 'SPECIAL_INCLUDED'
const includeGraduated = graduated === 'GRADUATED_INCLUDED'
const since = getStartDate(code, true)
const since = getStartDate(true)
const years = getYearsArray(since.getFullYear(), true, true)
const settings = { includeAllSpecials, includeGraduated }
const facultyTableStats = getYearsObject({ years, emptyArrays: true })
services/backend/src/services/studyProgramme/studyProgrammeBasics.js
+1 -1
View File
@@ -210,7 +210,7 @@ const initializeTableStats = (
const getBasicStatsForStudytrack = async ({ studyprogramme, combinedProgramme, settings }) => {
const { includeAllSpecials, isAcademicYear } = settings
const since = getStartDate(studyprogramme, isAcademicYear)
const since = getStartDate(isAcademicYear)
const years = getYearsArray(since.getFullYear(), isAcademicYear)
const queryParameters = { studyprogramme, years, isAcademicYear, includeAllSpecials, combinedProgramme }
const queryParametersCombinedProg = { studyprogramme: combinedProgramme, years, isAcademicYear, includeAllSpecials }
services/backend/src/services/studyProgramme/studyProgrammeGraduations.js
+1 -1
View File
@@ -198,7 +198,7 @@ const getProgrammesBeforeOrAfter = async (studyprogramme, queryParameters) => {
const getGraduationStatsForStudytrack = async ({ studyprogramme, combinedProgramme, settings }) => {
const { isAcademicYear, includeAllSpecials } = settings
const since = getStartDate(studyprogramme, isAcademicYear)
const since = getStartDate(isAcademicYear)
const years = getYearsArray(since.getFullYear(), isAcademicYear)
const queryParameters = { studyprogramme, since, years, isAcademicYear, includeAllSpecials }
const combinedQueryParameters = {
services/backend/src/services/studyProgramme/studyProgrammeHelpers.js
+1 -6
View File
@@ -172,12 +172,7 @@ const defineYear = (date, isAcademicYear) => {
return `${year} - ${year + 1}`
}
const getStartDate = (studyprogramme, isAcademicYear) => {
if ((studyprogramme.includes('KH') || studyprogramme.includes('MH')) && isAcademicYear) return new Date('2017-08-01')
if (studyprogramme.includes('KH') || studyprogramme.includes('MH')) return new Date('2017-01-01')
if (isAcademicYear) return new Date('2017-08-01')
return new Date('2017-01-01')
}
const getStartDate = isAcademicYear => (isAcademicYear ? new Date('2017-08-01') : new Date('2017-01-01'))
const alltimeStartDate = new Date('1900-01-01')
const alltimeEndDate = new Date()
services/backend/src/services/studyProgramme/studyTrackStats.js
+1 -1
View File
@@ -414,7 +414,7 @@ const getEmptyStatsObjects = (years, studytracks, studyprogramme, combinedProgra
const getStudytrackStatsForStudyprogramme = async ({ studyprogramme, combinedProgramme, settings, associations }) => {
const isAcademicYear = true
const includeYearsCombined = true
const since = getStartDate(studyprogramme, isAcademicYear)
const since = getStartDate(isAcademicYear)
const years = getYearsArray(since.getFullYear(), isAcademicYear, includeYearsCombined)
const studytracks = associations.programmes[studyprogramme]