@kth/om-kursen-ladok-client 2.3.2 → 2.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/attributVardenConstants.d.ts +5 -5
- package/dist/attributVardenConstants.js +8 -8
- package/dist/attributVardenConstants.js.map +1 -1
- package/dist/createApiClient.js +43 -41
- package/dist/createApiClient.js.map +1 -1
- package/dist/kth/KTHPeriod/calculateKTHPeriodSemesterFromTillfallesperiod.d.ts +1 -1
- package/dist/kth/KTHPeriod/extractKTHPeriodSemesterFromLasperiodsfordelning.d.ts +1 -1
- package/dist/kth/KTHPeriod/getKTHPeriodSemesters.d.ts +1 -1
- package/dist/{mapCourseRound.d.ts → mapCourseInstance.d.ts} +2 -2
- package/dist/{mapCourseRound.js → mapCourseInstance.js} +4 -4
- package/dist/mapCourseInstance.js.map +1 -0
- package/dist/{mapCourse.d.ts → mapCourseVersion.d.ts} +2 -2
- package/dist/{mapCourse.js → mapCourseVersion.js} +4 -4
- package/dist/mapCourseVersion.js.map +1 -0
- package/dist/{mapProgramTillfalle.d.ts → mapProgrammeInstance.d.ts} +2 -2
- package/dist/{mapProgramTillfalle.js → mapProgrammeInstance.js} +4 -4
- package/dist/mapProgrammeInstance.js.map +1 -0
- package/dist/{mapProgramTerm.d.ts → mapProgrammeSemester.d.ts} +2 -3
- package/dist/{mapProgramTerm.js → mapProgrammeSemester.js} +4 -4
- package/dist/mapProgrammeSemester.js.map +1 -0
- package/dist/{mapProgramSyllabus.d.ts → mapProgrammeSyllabus.d.ts} +3 -3
- package/dist/{mapProgramSyllabus.js → mapProgrammeSyllabus.js} +9 -9
- package/dist/mapProgrammeSyllabus.js.map +1 -0
- package/dist/mapSearchResult.d.ts +1 -1
- package/dist/mapSearchResult.js +21 -21
- package/dist/mapSearchResult.js.map +1 -1
- package/dist/programme/createProgrammeApi.js +5 -5
- package/dist/programme/createProgrammeApi.js.map +1 -1
- package/dist/programme/types.d.ts +5 -5
- package/dist/programme/utbildningsTypIdConstants.d.ts +1 -1
- package/dist/programme/utbildningsTypIdConstants.js +1 -1
- package/dist/programme/utils/programmeVersionUtil.d.ts +3 -3
- package/dist/programme/utils/programmeVersionUtil.js +6 -6
- package/dist/programme/utils/programmeVersionUtil.js.map +1 -1
- package/dist/search/continuationConfig.d.ts +2 -0
- package/dist/search/continuationConfig.js +6 -0
- package/dist/search/continuationConfig.js.map +1 -0
- package/dist/search/createSearchApi.js +9 -5
- package/dist/search/createSearchApi.js.map +1 -1
- package/dist/search/searchService.js +10 -6
- package/dist/search/searchService.js.map +1 -1
- package/dist/search/types.d.ts +2 -2
- package/dist/search/utils/educationalTypeUtils.d.ts +1 -1
- package/dist/search/utils/educationalTypeUtils.js +3 -3
- package/dist/search/utils/educationalTypeUtils.js.map +1 -1
- package/dist/search/utils/getLatestCompletedCourseVersions.d.ts +2 -2
- package/dist/search/utils/mapCourseInstanceSearchDTO.d.ts +3 -0
- package/dist/search/utils/mapCourseInstanceSearchDTO.js +42 -0
- package/dist/search/utils/mapCourseInstanceSearchDTO.js.map +1 -0
- package/dist/search/utils/mapCourseVersionDTO.d.ts +2 -2
- package/dist/search/utils/mapCourseVersionDTO.js.map +1 -1
- package/dist/search/utils/searchUtils.d.ts +3 -3
- package/dist/search/utils/searchUtils.js +7 -7
- package/dist/search/utils/searchUtils.js.map +1 -1
- package/dist/supportApis/supportService.js +1 -1
- package/dist/supportApis/supportService.js.map +1 -1
- package/dist/types/OmKursenLadokApiClient.d.ts +16 -16
- package/dist/utils/filterCourseInstanceUtils.d.ts +7 -0
- package/dist/utils/filterCourseInstanceUtils.js +20 -0
- package/dist/utils/filterCourseInstanceUtils.js.map +1 -0
- package/dist/utils/getAllEntitiesByUseOfContinuation.js +2 -2
- package/dist/utils/getAllEntitiesByUseOfContinuation.js.map +1 -1
- package/dist/utils/index.d.ts +1 -1
- package/dist/utils/index.js +1 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/partOfProgrammeUtil.d.ts +1 -0
- package/dist/utils/partOfProgrammeUtil.js +16 -4
- package/dist/utils/partOfProgrammeUtil.js.map +1 -1
- package/dist/utils/periodUtil.d.ts +1 -1
- package/dist/utils/periodUtil.js +12 -12
- package/dist/utils/periodUtil.js.map +1 -1
- package/dist/utils/{programStrukturUtil.d.ts → programmeStructureUtil.d.ts} +7 -7
- package/dist/utils/{programStrukturUtil.js → programmeStructureUtil.js} +40 -40
- package/dist/utils/programmeStructureUtil.js.map +1 -0
- package/dist/utils/programmeUtil.d.ts +39 -0
- package/dist/utils/{programUtil.js → programmeUtil.js} +128 -128
- package/dist/utils/programmeUtil.js.map +1 -0
- package/dist/utils/studyYearUtil.d.ts +3 -3
- package/dist/utils/studyYearUtil.js.map +1 -1
- package/dist/utils/syllabusExtractionUtil.js +2 -2
- package/dist/utils/syllabusExtractionUtil.js.map +1 -1
- package/package.json +2 -2
- package/dist/mapCourse.js.map +0 -1
- package/dist/mapCourseRound.js.map +0 -1
- package/dist/mapProgramSyllabus.js.map +0 -1
- package/dist/mapProgramTerm.js.map +0 -1
- package/dist/mapProgramTillfalle.js.map +0 -1
- package/dist/search/utils/mapCourseRoundSearchDTO.d.ts +0 -3
- package/dist/search/utils/mapCourseRoundSearchDTO.js +0 -42
- package/dist/search/utils/mapCourseRoundSearchDTO.js.map +0 -1
- package/dist/utils/filterCourseRoundUtils.d.ts +0 -7
- package/dist/utils/filterCourseRoundUtils.js +0 -20
- package/dist/utils/filterCourseRoundUtils.js.map +0 -1
- package/dist/utils/programStrukturUtil.js.map +0 -1
- package/dist/utils/programUtil.d.ts +0 -39
- package/dist/utils/programUtil.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchUtils.js","sourceRoot":"","sources":["../../../src/search/utils/searchUtils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"searchUtils.js","sourceRoot":"","sources":["../../../src/search/utils/searchUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,7 @@ class SupportService {
|
|
|
74
74
|
kodEllerBenamning: '*',
|
|
75
75
|
organisation: departmentCode,
|
|
76
76
|
senasteversion: 'true',
|
|
77
|
-
utbildningstypid: (0, educationalTypeUtils_1.
|
|
77
|
+
utbildningstypid: (0, educationalTypeUtils_1.getUtbildningsnivaParameterForCourseVersion)(utbildningsniva),
|
|
78
78
|
avvecklad: avvecklad ? 'true' : 'false',
|
|
79
79
|
antalTraffar: '1',
|
|
80
80
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supportService.js","sourceRoot":"","sources":["../../src/supportApis/supportService.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8EAAqE;AASrE,+
|
|
1
|
+
{"version":3,"file":"supportService.js","sourceRoot":"","sources":["../../src/supportApis/supportService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,38 +1,38 @@
|
|
|
1
1
|
import { MellanlagringResponse, ResponseInfo } from '@kth/ladok-mellanlager-client';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { CourseVersion } from '../mapCourseVersion';
|
|
3
|
+
import { CourseInstance } from '../mapCourseInstance';
|
|
4
4
|
import { Language } from '../utils';
|
|
5
5
|
import { Utbildningsplan } from '../mapUtbildningsplan';
|
|
6
6
|
import { KursPlan } from '../mapCourseSyllabus';
|
|
7
7
|
import { Period } from '@kth/ladok-mellanlager-client/dist/types/endpoints/period';
|
|
8
8
|
import { ProgrammeVersion } from '../mapProgrammeVersion';
|
|
9
|
-
import {
|
|
9
|
+
import { ProgrammeInstance } from '../mapProgrammeInstance';
|
|
10
10
|
import { SearchApi } from '../search/types';
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
11
|
+
import { ProgrammeCurriculum } from '../utils/programmeUtil';
|
|
12
|
+
import { ProgrammeSyllabus } from '../mapProgrammeSyllabus';
|
|
13
13
|
import { SupportApi } from '../supportApis/createSupportApis';
|
|
14
14
|
import { ProgrammeApi } from '../programme/types';
|
|
15
15
|
export type OmKursenLadokApiClient = {
|
|
16
|
-
getLatestCourseVersion: (courseCode: string, language: Language) => Promise<(
|
|
17
|
-
getLatestCourseVersionIncludingCancelled: (courseCode: string, language: Language) => Promise<(
|
|
16
|
+
getLatestCourseVersion: (courseCode: string, language: Language) => Promise<(CourseVersion & ResponseInfo) | ResponseInfo>;
|
|
17
|
+
getLatestCourseVersionIncludingCancelled: (courseCode: string, language: Language) => Promise<(CourseVersion & ResponseInfo) | ResponseInfo>;
|
|
18
18
|
Search: SearchApi;
|
|
19
19
|
Programme: ProgrammeApi;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
getActiveCourseInstances: (courseCode: string, language: Language) => Promise<CourseInstance[] | undefined>;
|
|
21
|
+
getActiveAndFutureCourseInstances: (courseCode: string, language: Language) => Promise<CourseInstance[] | undefined>;
|
|
22
|
+
getCourseInstancesFromPeriod: (courseCode: string, fromPeriod: string, language: Language) => Promise<CourseInstance[] | undefined>;
|
|
23
|
+
getCourseInstancesForExactStartPeriod: (courseCode: string, startPeriod: string, language: Language) => Promise<CourseInstance[] | undefined>;
|
|
24
24
|
getUtbildningsPlan: (uid: string, language: Language) => Promise<Utbildningsplan | undefined>;
|
|
25
25
|
getExaminationModulesByUtbildningstillfalleUid: (utbildningstillfalleUid: string, language: Language) => Promise<any>;
|
|
26
26
|
getExaminationModulesByUtbildningsinstansUid: (utbildningsinstansUid: string, language: Language) => Promise<any>;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
27
|
+
getActiveProgrammeInstance: (programmeCode: string, semester: string, language: Language) => Promise<ProgrammeInstance | undefined>;
|
|
28
|
+
getProgrammeCurriculums: (programmeCode: string, semester: string, language: Language) => Promise<ProgrammeCurriculum[]>;
|
|
29
|
+
getProgrammeVersion: (programmeCode: string, semester: string, language: Language) => Promise<{
|
|
30
|
+
programmeVersion: ProgrammeVersion | undefined;
|
|
31
31
|
statusCode: number;
|
|
32
32
|
}>;
|
|
33
33
|
getUtbildningstilfalleStructure: (utbildningstillfalleUID: string, language: Language) => Promise<any>;
|
|
34
34
|
getCourseSyllabus: (courseCode: string, semester: string, language: Language) => Promise<KursPlan> | undefined;
|
|
35
|
-
|
|
35
|
+
getProgrammeSyllabus: (courseCode: string, semester: string, language: Language) => Promise<ProgrammeSyllabus>;
|
|
36
36
|
getCourseSyllabuses: (courseCode: string, language: Language) => Promise<KursPlan[]> | undefined;
|
|
37
37
|
getAllValidCourseSyllabuses: (courseCode: string, language: Language) => Promise<KursPlan[]> | undefined;
|
|
38
38
|
getAllGradingScales: () => Promise<any>;
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { CourseInstance } from '../mapCourseInstance';
|
|
2
|
+
export declare const removeCourseInstancesBasedOnTillfalleskod: (courseInstance: Pick<CourseInstance, "tillfalleskod">) => boolean;
|
|
3
|
+
export declare const removeCourseInstancesBasedOnFinansieringsform: (courseInstance: {
|
|
4
|
+
finansieringsform?: {
|
|
5
|
+
code: string;
|
|
6
|
+
};
|
|
7
|
+
}) => boolean;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.removeCourseInstancesBasedOnFinansieringsform = exports.removeCourseInstancesBasedOnTillfalleskod = void 0;
|
|
4
|
+
// kurstillfällen starting with these prefixes should never be shown https://kth-se.atlassian.net/browse/KUI-1761
|
|
5
|
+
const TILLFALLESKOD_PREFIXES_TO_REMOVE = ['OM', 'UPP'];
|
|
6
|
+
// kurstillfällen with these finansieringsform codes should never be shown https://kth-se.atlassian.net/browse/KUI-1761
|
|
7
|
+
const FINANSIERINGSFORM_CODES_TO_REMOVE = ['FOA', 'XER'];
|
|
8
|
+
const removeCourseInstancesBasedOnTillfalleskod = (courseInstance) => {
|
|
9
|
+
return !TILLFALLESKOD_PREFIXES_TO_REMOVE.some(prefix => { var _a; return (_a = courseInstance.tillfalleskod) === null || _a === void 0 ? void 0 : _a.startsWith(prefix); });
|
|
10
|
+
};
|
|
11
|
+
exports.removeCourseInstancesBasedOnTillfalleskod = removeCourseInstancesBasedOnTillfalleskod;
|
|
12
|
+
const removeCourseInstancesBasedOnFinansieringsform = (courseInstance) => {
|
|
13
|
+
var _a;
|
|
14
|
+
if (!courseInstance.finansieringsform) {
|
|
15
|
+
return true;
|
|
16
|
+
}
|
|
17
|
+
return !FINANSIERINGSFORM_CODES_TO_REMOVE.includes((_a = courseInstance.finansieringsform) === null || _a === void 0 ? void 0 : _a.code);
|
|
18
|
+
};
|
|
19
|
+
exports.removeCourseInstancesBasedOnFinansieringsform = removeCourseInstancesBasedOnFinansieringsform;
|
|
20
|
+
//# sourceMappingURL=filterCourseInstanceUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filterCourseInstanceUtils.js","sourceRoot":"","sources":["../../src/utils/filterCourseInstanceUtils.ts"],"names":[],"mappings":";;;AAEA,iHAAiH;AACjH,MAAM,gCAAgC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAEtD,uHAAuH;AACvH,MAAM,iCAAiC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;AAEjD,MAAM,yCAAyC,GAAG,CACvD,cAAqD,EAC5C,EAAE;IACX,OAAO,CAAC,gCAAgC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAC,OAAA,MAAA,cAAc,CAAC,aAAa,0CAAE,UAAU,CAAC,MAAM,CAAC,CAAA,EAAA,CAAC,CAAA;AAC3G,CAAC,CAAA;AAJY,QAAA,yCAAyC,6CAIrD;AAEM,MAAM,6CAA6C,GAAG,CAAC,cAE7D,EAAW,EAAE;;IACZ,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC;QACtC,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,CAAC,iCAAiC,CAAC,QAAQ,CAAC,MAAA,cAAc,CAAC,iBAAiB,0CAAE,IAAI,CAAC,CAAA;AAC5F,CAAC,CAAA;AAPY,QAAA,6CAA6C,iDAOzD"}
|
|
@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.getAllEntitiesByUseOfContinuation = void 0;
|
|
13
13
|
const SearchError_1 = require("../utils/SearchError");
|
|
14
|
-
const MAX_SEARCH_RESULTS_TO_RETURN =
|
|
15
|
-
const MAX_CONTINUATION_ITERATIONS =
|
|
14
|
+
const MAX_SEARCH_RESULTS_TO_RETURN = 1000;
|
|
15
|
+
const MAX_CONTINUATION_ITERATIONS = 10;
|
|
16
16
|
const getAllEntitiesByUseOfContinuation = (apiCall_1, requestQuery_1, ...args_1) => __awaiter(void 0, [apiCall_1, requestQuery_1, ...args_1], void 0, function* (apiCall, requestQuery, { maxSearchResultsToReturn = MAX_SEARCH_RESULTS_TO_RETURN, maxContinuationIterations = MAX_CONTINUATION_ITERATIONS, } = {}) {
|
|
17
17
|
var _a;
|
|
18
18
|
let continuationToken = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAllEntitiesByUseOfContinuation.js","sourceRoot":"","sources":["../../src/utils/getAllEntitiesByUseOfContinuation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,sDAAkD;AAGlD,MAAM,4BAA4B,GAAG,
|
|
1
|
+
{"version":3,"file":"getAllEntitiesByUseOfContinuation.js","sourceRoot":"","sources":["../../src/utils/getAllEntitiesByUseOfContinuation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,sDAAkD;AAGlD,MAAM,4BAA4B,GAAG,IAAI,CAAA;AACzC,MAAM,2BAA2B,GAAG,EAAE,CAAA;AAE/B,MAAM,iCAAiC,GAAG,uCAeH,EAAE,8EAX9C,OAK4C,EAC5C,YAAe,EACf,EACE,wBAAwB,GAAG,4BAA4B,EACvD,yBAAyB,GAAG,2BAA2B,MAChC,EAAE;;IAE3B,IAAI,iBAAiB,GAAuB,SAAS,CAAA;IACrD,IAAI,cAAc,GAAG,CAAC,CAAA;IACtB,IAAI,WAAW,GAAQ,EAAE,CAAA;IACzB,IAAI,YAAgD,CAAA;IAEpD,GAAG,CAAC;QACF,IAAI,cAAc,IAAI,yBAAyB,EAAE,CAAC;YAChD,MAAM,yBAAW,CAAC,QAAQ,CAAC,sDAAsD,yBAAyB,EAAE,CAAC,CAAA;QAC/G,CAAC;QACD,MAAM,aAAa,qBACd,CAAC,iBAAiB,KAAK,IAAI,IAAI,iBAAiB,KAAK,SAAS,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAC5F,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,aAAa,CAAC,CAAA;QAEzD,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;QAElC,oGAAoG;QACpG,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,yBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACnC,CAAC;QAED,oGAAoG;QACpG,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,yBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QACxD,CAAC;QAED,IAAI,MAAM,CAAC,UAAU,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;YAC3C,mHAAmH;YACnH,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,CAAA;QAC1C,CAAC;QAED,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE9C,IAAI,WAAW,CAAC,MAAM,GAAG,wBAAwB,EAAE,CAAC;YAClD,MAAM,yBAAW,CAAC,QAAQ,CAAC,wCAAwC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QAC1F,CAAC;QAED,iBAAiB,GAAG,MAAA,MAAM,CAAC,UAAU,CAAC,iBAAiB,mCAAI,SAAS,CAAA;QACpE,cAAc,EAAE,CAAA;IAClB,CAAC,QAAQ,iBAAiB,EAAC;IAE3B,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CAAA;AACtC,CAAC,CAAA,CAAA;AA1DY,QAAA,iCAAiC,qCA0D7C"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -2,6 +2,6 @@ export * from './dateUtil';
|
|
|
2
2
|
export * from './languageUtil';
|
|
3
3
|
export * from './periodUtil';
|
|
4
4
|
export * from './studyYearUtil';
|
|
5
|
-
export * from './
|
|
5
|
+
export * from './filterCourseInstanceUtils';
|
|
6
6
|
export * from './versionUtils';
|
|
7
7
|
export * from './AcademicSemester';
|
package/dist/utils/index.js
CHANGED
|
@@ -18,7 +18,7 @@ __exportStar(require("./dateUtil"), exports);
|
|
|
18
18
|
__exportStar(require("./languageUtil"), exports);
|
|
19
19
|
__exportStar(require("./periodUtil"), exports);
|
|
20
20
|
__exportStar(require("./studyYearUtil"), exports);
|
|
21
|
-
__exportStar(require("./
|
|
21
|
+
__exportStar(require("./filterCourseInstanceUtils"), exports);
|
|
22
22
|
__exportStar(require("./versionUtils"), exports);
|
|
23
23
|
__exportStar(require("./AcademicSemester"), exports);
|
|
24
24
|
//# sourceMappingURL=index.js.map
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,iDAA8B;AAC9B,+CAA4B;AAC5B,kDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,iDAA8B;AAC9B,+CAA4B;AAC5B,kDAA+B;AAC/B,8DAA2C;AAC3C,iDAA8B;AAC9B,qDAAkC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { LadokMellanlagerApiClient, PeriodItem, SokUtbildningsTillfalleItem, SokUtbildningsTillfalleSlimItem } from '@kth/ladok-mellanlager-client';
|
|
2
2
|
import { PartOfProgramme } from '../mapPartOfProgramme';
|
|
3
|
+
export declare const processProgrammes: (programmeInstances: SokUtbildningsTillfalleItem[] | SokUtbildningsTillfalleSlimItem[], courseInstance: SokUtbildningsTillfalleItem | SokUtbildningsTillfalleSlimItem, periodItems: PeriodItem[], ladokClient: LadokMellanlagerApiClient, specialisationInstance?: SokUtbildningsTillfalleItem | SokUtbildningsTillfalleSlimItem) => Promise<PartOfProgramme[]>;
|
|
3
4
|
export declare const getPartOfProgrammes: (courseInstances: SokUtbildningsTillfalleItem[] | SokUtbildningsTillfalleSlimItem[], periodItems: PeriodItem[], ladokClient: LadokMellanlagerApiClient) => Promise<Record<string, PartOfProgramme[]>>;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getPartOfProgrammes = void 0;
|
|
12
|
+
exports.getPartOfProgrammes = exports.processProgrammes = void 0;
|
|
13
13
|
const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
|
|
14
14
|
const mapPartOfProgramme_1 = require("../mapPartOfProgramme");
|
|
15
15
|
const studyYearUtil_1 = require("./studyYearUtil");
|
|
@@ -45,6 +45,7 @@ const processProgrammes = (programmeInstances, courseInstance, periodItems, lado
|
|
|
45
45
|
return studyYears.map(studyYear => (0, mapPartOfProgramme_1.mapPartOfProgramme)(programmeInstance, structureItemCourse, studyYear, specialisationInstance));
|
|
46
46
|
})))).flat();
|
|
47
47
|
});
|
|
48
|
+
exports.processProgrammes = processProgrammes;
|
|
48
49
|
const processSpecialisations = (specialisationInstances, courseInstance, periodItems, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
|
|
49
50
|
return (yield Promise.all(specialisationInstances.map((specialisationInstance) => __awaiter(void 0, void 0, void 0, function* () {
|
|
50
51
|
var _a;
|
|
@@ -54,9 +55,19 @@ const processSpecialisations = (specialisationInstances, courseInstance, periodI
|
|
|
54
55
|
[];
|
|
55
56
|
const [firstProgrammeInstanceUID] = extractUIDsByEducationType(structureRefs, ladok_attributvarde_utils_1.EducationalTypeID.Programme);
|
|
56
57
|
const programmeInstances = yield fetchEducationalInstances([firstProgrammeInstanceUID], ladokClient);
|
|
57
|
-
return processProgrammes(programmeInstances, courseInstance, periodItems, ladokClient, specialisationInstance);
|
|
58
|
+
return (0, exports.processProgrammes)(programmeInstances, courseInstance, periodItems, ladokClient, specialisationInstance);
|
|
58
59
|
})))).flat();
|
|
59
60
|
});
|
|
61
|
+
const removeDuplicateParts = (parts) => {
|
|
62
|
+
const uniqueMap = new Map();
|
|
63
|
+
parts.forEach(part => {
|
|
64
|
+
const key = `${part.kod}-${part.arskurs}-${part.inriktning || ''}`;
|
|
65
|
+
if (!uniqueMap.has(key)) {
|
|
66
|
+
uniqueMap.set(key, part);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
return Array.from(uniqueMap.values());
|
|
70
|
+
};
|
|
60
71
|
const getPartOfProgramme = (courseInstance, periodItems, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
|
|
61
72
|
var _a;
|
|
62
73
|
const structureRefs = ((_a = (yield ladokClient.strukturListaInnehaller(courseInstance.tillfalle_uid)).data) === null || _a === void 0 ? void 0 : _a.Strukturreferenser) || [];
|
|
@@ -65,8 +76,9 @@ const getPartOfProgramme = (courseInstance, periodItems, ladokClient) => __await
|
|
|
65
76
|
const specialisationInstances = (yield fetchEducationalInstances(specialisationInstanceUIDs, ladokClient)) || [];
|
|
66
77
|
const programmeInstances = (yield fetchEducationalInstances(programmeInstanceUIDs, ladokClient)) || [];
|
|
67
78
|
const specialisationParts = yield processSpecialisations(specialisationInstances, courseInstance, periodItems, ladokClient);
|
|
68
|
-
const programmeParts = yield processProgrammes(programmeInstances, courseInstance, periodItems, ladokClient);
|
|
69
|
-
|
|
79
|
+
const programmeParts = yield (0, exports.processProgrammes)(programmeInstances, courseInstance, periodItems, ladokClient);
|
|
80
|
+
const uniquePartOfProgrammes = removeDuplicateParts([...specialisationParts, ...programmeParts]);
|
|
81
|
+
return uniquePartOfProgrammes;
|
|
70
82
|
});
|
|
71
83
|
const getPartOfProgrammes = (courseInstances, periodItems, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
|
|
72
84
|
const partOfProgrammes = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"partOfProgrammeUtil.js","sourceRoot":"","sources":["../../src/utils/partOfProgrammeUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8EAAiF;AAQjF,8DAA2E;AAC3E,mDAAmD;AAEnD,MAAM,0BAA0B,GAAG,CAAC,aAAiC,EAAE,eAAkC,EAAE,EAAE,CAC3G,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,IAAI,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAA;AAExG,MAAM,yBAAyB,GAAG,CAChC,wBAAkC,EAClC,WAAsC,EACtC,EAAE;IACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,wBAAwB,CAAC,GAAG,CAAC,CAAM,GAAG,EAAC,EAAE;;QACvC,MAAM,QAAQ,GAAG,MAAA,CACf,MAAM,WAAW,CAAC,wBAAwB,CAAC,GAAG,EAAE;YAC9C,cAAc,EAAE,wBAAwB;SACzC,CAAC,CACH,CAAC,IAAI,0CAAE,cAAc,CAAA;QAEtB,MAAM,UAAU,GAAG,IAAA,yCAAa,EAAC,QAAQ,IAAI,EAAE,EAAE,wBAAwB,CAAC,CAAA;QAC1E,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAA;QAE5B,MAAM,YAAY,GAAG,MAAA,CACnB,MAAM,WAAW,CAAC,2BAA2B,CAAC;YAC5C,qBAAqB,EAAE,UAAU;YACjC,cAAc,EAAE,iCAAiC;YACjD,qBAAqB,EACnB,qGAAqG;SACxG,CAAC,CACH,CAAC,KAAK,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,GAAG,CAAC,CAAA;QAE3C,OAAO,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,IAAI,CAAA;IAC7B,CAAC,CAAA,CAAC,CACH,CAAA;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAA2C,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;AACzF,CAAC,CAAA,CAAA;
|
|
1
|
+
{"version":3,"file":"partOfProgrammeUtil.js","sourceRoot":"","sources":["../../src/utils/partOfProgrammeUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export declare const parsePeriod: (period: string) => {
|
|
|
13
13
|
export declare const transformPeriodInDigits: (period: string) => string | null;
|
|
14
14
|
export declare const transformDigitsInPeriod: (period: string) => string;
|
|
15
15
|
export declare const findPeriodByKod: (kod: string, periods: PeriodItem[]) => PeriodItem | undefined;
|
|
16
|
-
export declare const
|
|
16
|
+
export declare const findValidProgrammeVersionForCode: (code: string, periods: PeriodItem[], programmeVersions: ProgrammeVersion[]) => ProgrammeVersion | undefined;
|
|
17
17
|
export declare const getPeriodCodeForDate: (date: Date) => string;
|
|
18
18
|
export declare const getKthStudyPeriod: (date: Date, startPeriod: {
|
|
19
19
|
code: string | undefined;
|
package/dist/utils/periodUtil.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getKthStudyPeriod = exports.getPeriodCodeForDate = exports.
|
|
3
|
+
exports.getKthStudyPeriod = exports.getPeriodCodeForDate = exports.findValidProgrammeVersionForCode = exports.findPeriodByKod = exports.transformDigitsInPeriod = exports.transformPeriodInDigits = exports.parsePeriod = exports.isValidLadokPeriod = void 0;
|
|
4
4
|
const versionUtils_1 = require("./versionUtils");
|
|
5
5
|
const validLadokPeriod = /(VT|HT)(\d{4})/;
|
|
6
6
|
/**
|
|
@@ -44,25 +44,25 @@ const findPeriodByKod = (kod, periods) => {
|
|
|
44
44
|
return periods.find(p => p.Kod === kod);
|
|
45
45
|
};
|
|
46
46
|
exports.findPeriodByKod = findPeriodByKod;
|
|
47
|
-
const
|
|
48
|
-
const { giltigFrom } =
|
|
47
|
+
const isProgrammeVersionValidForPeriod = (programmeVersion, periodStart) => {
|
|
48
|
+
const { giltigFrom } = programmeVersion;
|
|
49
49
|
if (!(giltigFrom === null || giltigFrom === void 0 ? void 0 : giltigFrom.startDay) || !(giltigFrom === null || giltigFrom === void 0 ? void 0 : giltigFrom.lastDay))
|
|
50
50
|
return false;
|
|
51
|
-
const
|
|
52
|
-
return periodStart >=
|
|
51
|
+
const programmeStart = new Date(giltigFrom.startDay);
|
|
52
|
+
return periodStart >= programmeStart;
|
|
53
53
|
};
|
|
54
|
-
const
|
|
54
|
+
const findValidProgrammeVersionForCode = (code, periods, programmeVersions) => {
|
|
55
55
|
const matchedPeriod = findPeriodByCode(code, periods);
|
|
56
56
|
if (!matchedPeriod)
|
|
57
57
|
return undefined;
|
|
58
58
|
const periodStart = new Date(matchedPeriod.Giltighetsperiod.Startdatum);
|
|
59
|
-
const
|
|
60
|
-
const
|
|
61
|
-
if (
|
|
62
|
-
return
|
|
63
|
-
return
|
|
59
|
+
const sortedProgrammeVersions = (0, versionUtils_1.sortByVersionsnummerDesc)(programmeVersions);
|
|
60
|
+
const validProgrammes = sortedProgrammeVersions.filter((programmeVersion, index, arr) => isProgrammeVersionValidForPeriod(programmeVersion, periodStart));
|
|
61
|
+
if (validProgrammes.length > 0)
|
|
62
|
+
return validProgrammes[0];
|
|
63
|
+
return sortedProgrammeVersions.length > 0 ? sortedProgrammeVersions[0] : undefined;
|
|
64
64
|
};
|
|
65
|
-
exports.
|
|
65
|
+
exports.findValidProgrammeVersionForCode = findValidProgrammeVersionForCode;
|
|
66
66
|
const getPeriodCodeForDate = (date) => {
|
|
67
67
|
const JULY = 6;
|
|
68
68
|
const year = date.getFullYear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"periodUtil.js","sourceRoot":"","sources":["../../src/utils/periodUtil.ts"],"names":[],"mappings":";;;AAEA,iDAAyD;AAEzD,MAAM,gBAAgB,GAAG,gBAAgB,CAAA;AAEzC;;;;GAIG;AACI,MAAM,kBAAkB,GAAG,CAAC,MAAc,EAAE,EAAE;IACnD,OAAO,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AACtC,CAAC,CAAA;AAFY,QAAA,kBAAkB,sBAE9B;AAEM,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE;IAC5C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IAC5C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,uDAAuD,EAAE,MAAM,CAAC,CAAA;QAC7E,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AACvD,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAEM,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAE,EAAE;IACxD,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAElC,IAAI,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;QAClD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC5B,OAAO,IAAI,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAVY,QAAA,uBAAuB,2BAUnC;AACM,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAU,EAAE;IAChE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;IACtD,OAAO,GAAG,QAAQ,GAAG,IAAI,EAAE,CAAA;AAC7B,CAAC,CAAA;AAJY,QAAA,uBAAuB,2BAInC;AAED,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,OAAqB,EAA0B,EAAE;IACvF,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA;AAEM,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,OAAqB,EAA0B,EAAE;IAC5F,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;AACzC,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAED,MAAM,
|
|
1
|
+
{"version":3,"file":"periodUtil.js","sourceRoot":"","sources":["../../src/utils/periodUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,19 +3,19 @@ import { Language } from './languageUtil';
|
|
|
3
3
|
import { StructurePartInstance } from '../mapStructureCourses';
|
|
4
4
|
import { StructurePartVersion } from '../mapStructurePartVersions';
|
|
5
5
|
import { StudyYear } from './studyYearUtil';
|
|
6
|
-
export type
|
|
6
|
+
export type ProgrammeCourse = StructurePartVersion & Partial<Omit<StructurePartInstance, 'Tillfallesperioder'>> & {
|
|
7
7
|
Valvillkor: CategorizedStrukturdel['Valvillkor'];
|
|
8
8
|
Tillfallesperioder: Partial<StructurePartInstance['Tillfallesperioder'][number]> & {
|
|
9
9
|
ForstaUndervisningsdatum: string;
|
|
10
10
|
SistaUndervisningsdatum: string;
|
|
11
11
|
}[];
|
|
12
12
|
};
|
|
13
|
-
export type
|
|
13
|
+
export type ProgrammeCurriculumFromStructure = {
|
|
14
14
|
studyYears: StudyYear[];
|
|
15
15
|
} | {
|
|
16
16
|
studyYears: StudyYear[];
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
programmeSpecialisation: {
|
|
18
|
+
programmeSpecialisationCode: string;
|
|
19
19
|
title: string;
|
|
20
20
|
};
|
|
21
21
|
};
|
|
@@ -31,9 +31,9 @@ type CategorizedStrukturdel = Strukturdel & {
|
|
|
31
31
|
Valvillkor: string;
|
|
32
32
|
};
|
|
33
33
|
export declare const fetchAndCategorizeStructureParts: (utbildningstillfalleUID: string, language: Language, ladokClient: LadokMellanlagerApiClient) => Promise<{
|
|
34
|
-
structureCourses:
|
|
35
|
-
|
|
34
|
+
structureCourses: ProgrammeCourse[];
|
|
35
|
+
structureSpecialisations: StructurePartInstance[];
|
|
36
36
|
freeTexts: Fritext[];
|
|
37
37
|
}>;
|
|
38
|
-
export declare const
|
|
38
|
+
export declare const fetchProgrammeStructure: (utbildningstillfalleUID: string, language: Language, ladokClient: LadokMellanlagerApiClient) => Promise<ProgrammeCurriculumFromStructure[]>;
|
|
39
39
|
export {};
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.fetchProgrammeStructure = exports.fetchAndCategorizeStructureParts = exports.fetchStructurePartVersion = exports.fetchStructurePartInstance = exports.fetchStructureByInstansUid = exports.fetchStructureByTillfalleUid = exports.handleError = void 0;
|
|
13
13
|
const mapStructureCourses_1 = require("../mapStructureCourses");
|
|
14
14
|
const mapStructurePartVersions_1 = require("../mapStructurePartVersions");
|
|
15
15
|
const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
|
|
@@ -136,7 +136,7 @@ function fetchStructurePartsByType(categorizedStrukturDelar, language, ladokClie
|
|
|
136
136
|
return [...fetchedInstances, ...fetchedVersions].filter(typeChecking_1.isDefined);
|
|
137
137
|
});
|
|
138
138
|
}
|
|
139
|
-
function
|
|
139
|
+
function isSpecialisationInstance(instance) {
|
|
140
140
|
if (instance.type === 'instance') {
|
|
141
141
|
const utbildningstyp = instance.data.utbildningstyp;
|
|
142
142
|
return (utbildningstyp === null || utbildningstyp === void 0 ? void 0 : utbildningstyp.id) === ladok_attributvarde_utils_1.EducationalTypeID.Specialisation;
|
|
@@ -152,14 +152,14 @@ function isInvalidData(instance) {
|
|
|
152
152
|
else
|
|
153
153
|
return false;
|
|
154
154
|
}
|
|
155
|
-
function
|
|
155
|
+
function separateSpecialisations(structureParts) {
|
|
156
156
|
const filteredMappedStructurePartsDividedByType = [];
|
|
157
|
-
const
|
|
157
|
+
const specialisationListFromStructure = [];
|
|
158
158
|
structureParts.forEach(structurePart => {
|
|
159
|
-
// base condition for finding
|
|
160
|
-
if (
|
|
161
|
-
if (!
|
|
162
|
-
|
|
159
|
+
// base condition for finding specialisations is that the need to be instance type
|
|
160
|
+
if (isSpecialisationInstance(structurePart)) {
|
|
161
|
+
if (!specialisationListFromStructure.some(addedSpec => addedSpec.uid === structurePart.data.uid)) {
|
|
162
|
+
specialisationListFromStructure.push(structurePart.data);
|
|
163
163
|
}
|
|
164
164
|
}
|
|
165
165
|
else {
|
|
@@ -167,7 +167,7 @@ function separateSpecializations(structureParts) {
|
|
|
167
167
|
filteredMappedStructurePartsDividedByType.push(structurePart);
|
|
168
168
|
}
|
|
169
169
|
});
|
|
170
|
-
return { filteredMappedStructurePartsDividedByType,
|
|
170
|
+
return { filteredMappedStructurePartsDividedByType, specialisationListFromStructure };
|
|
171
171
|
}
|
|
172
172
|
function mergeStructurePartInstancesAndVersions(filteredMappedStructurePartsDividedByType, ladokClient, language) {
|
|
173
173
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -211,72 +211,72 @@ const fetchAndCategorizeStructureParts = (utbildningstillfalleUID, language, lad
|
|
|
211
211
|
const { Strukturdelar = [], Fritexter: freeTexts = [] } = structureData || {};
|
|
212
212
|
const categorizedStrukturParts = categorizeStructureParts(Strukturdelar);
|
|
213
213
|
const structurePartsDevidedByType = yield fetchStructurePartsByType(categorizedStrukturParts, language, ladokClient);
|
|
214
|
-
const { filteredMappedStructurePartsDividedByType,
|
|
214
|
+
const { filteredMappedStructurePartsDividedByType, specialisationListFromStructure } = separateSpecialisations(structurePartsDevidedByType);
|
|
215
215
|
const filteredMappedStructurePartInstancesAndVersions = yield mergeStructurePartInstancesAndVersions(filteredMappedStructurePartsDividedByType, ladokClient, language);
|
|
216
216
|
return {
|
|
217
217
|
structureCourses: filteredMappedStructurePartInstancesAndVersions,
|
|
218
|
-
|
|
218
|
+
structureSpecialisations: specialisationListFromStructure,
|
|
219
219
|
freeTexts,
|
|
220
220
|
};
|
|
221
221
|
});
|
|
222
222
|
exports.fetchAndCategorizeStructureParts = fetchAndCategorizeStructureParts;
|
|
223
|
-
const
|
|
224
|
-
const
|
|
223
|
+
const getMainProgrammeInstanceData = (uid, language, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
|
|
224
|
+
const programmeDetails = yield ladokClient.utbildningstillfalleSlim(uid, {
|
|
225
225
|
attributVarden: 'utbildningsinstans.uid,utbildning.attribut.startperiod',
|
|
226
226
|
});
|
|
227
|
-
if (
|
|
228
|
-
throw new Error(`API error: ${
|
|
227
|
+
if (programmeDetails.type === 'error') {
|
|
228
|
+
throw new Error(`API error: ${programmeDetails.responseInfo.message}`);
|
|
229
229
|
}
|
|
230
|
-
const
|
|
231
|
-
const
|
|
232
|
-
const lengthInStudyYears = Math.ceil(Number(
|
|
233
|
-
const { structureCourses,
|
|
230
|
+
const scope = programmeDetails.data.Tillfallesperioder.reduce((sum, period) => sum + period.Omfattningsvarde, 0);
|
|
231
|
+
const startPeriod = (0, ladok_attributvarde_utils_1.extractGrunddata)(programmeDetails.data.Attributvarden, 'utbildning.attribut.startperiod');
|
|
232
|
+
const lengthInStudyYears = Math.ceil(Number(scope) / 60);
|
|
233
|
+
const { structureCourses, structureSpecialisations: structureSpecialisations, freeTexts, } = yield (0, exports.fetchAndCategorizeStructureParts)(uid, language, ladokClient);
|
|
234
234
|
return {
|
|
235
|
-
|
|
235
|
+
startPeriod,
|
|
236
236
|
lengthInStudyYears,
|
|
237
237
|
structureCourses,
|
|
238
|
-
|
|
238
|
+
structureSpecialisations,
|
|
239
239
|
freeTexts,
|
|
240
240
|
};
|
|
241
241
|
});
|
|
242
|
-
const
|
|
243
|
-
const tillfalleUids =
|
|
244
|
-
const versionUids =
|
|
245
|
-
const
|
|
242
|
+
const mapSpecialisationCurriculums = (specialisations, startperiodCode, lengthInStudyYears, language, ladokClient, allPeriods) => __awaiter(void 0, void 0, void 0, function* () {
|
|
243
|
+
const tillfalleUids = specialisations.map(s => s.uid);
|
|
244
|
+
const versionUids = specialisations.map(s => s.utbildningsinstansUid);
|
|
245
|
+
const specialisationTasks = versionUids.map(uid => () => __awaiter(void 0, void 0, void 0, function* () {
|
|
246
246
|
const version = yield (0, exports.fetchStructurePartVersion)(uid, ladokClient);
|
|
247
247
|
return version;
|
|
248
248
|
}));
|
|
249
|
-
const
|
|
250
|
-
const
|
|
249
|
+
const specialisationsData = yield (0, concurrentTasks_1.executeTasksInConcurrentBatches)(specialisationTasks);
|
|
250
|
+
const mappedSpecialisations = specialisationsData
|
|
251
251
|
.filter(typeChecking_1.isDefined)
|
|
252
252
|
.map(entity => (0, mapStructurePartVersions_1.mapStructurePartVersions)(entity, language));
|
|
253
|
-
const
|
|
253
|
+
const specialisationsCourseListFromStructure = [];
|
|
254
254
|
for (const uid of tillfalleUids) {
|
|
255
255
|
const { structureCourses, freeTexts } = yield (0, exports.fetchAndCategorizeStructureParts)(uid, language, ladokClient);
|
|
256
|
-
|
|
256
|
+
specialisationsCourseListFromStructure.push({ structureCourses, freeTexts });
|
|
257
257
|
}
|
|
258
|
-
return
|
|
259
|
-
studyYears: (0, studyYearUtil_1.generateStudyYearData)(
|
|
260
|
-
|
|
261
|
-
|
|
258
|
+
return mappedSpecialisations.map((spec, index) => ({
|
|
259
|
+
studyYears: (0, studyYearUtil_1.generateStudyYearData)(specialisationsCourseListFromStructure[index].structureCourses, specialisationsCourseListFromStructure[index].freeTexts, allPeriods, startperiodCode, lengthInStudyYears),
|
|
260
|
+
programmeSpecialisation: {
|
|
261
|
+
programmeSpecialisationCode: spec.kod,
|
|
262
262
|
title: spec.benamning,
|
|
263
263
|
},
|
|
264
264
|
}));
|
|
265
265
|
});
|
|
266
|
-
const
|
|
266
|
+
const fetchProgrammeStructure = (utbildningstillfalleUID, language, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
|
|
267
267
|
try {
|
|
268
|
-
const {
|
|
268
|
+
const { startPeriod, lengthInStudyYears, structureCourses, structureSpecialisations, freeTexts } = yield getMainProgrammeInstanceData(utbildningstillfalleUID, language, ladokClient);
|
|
269
269
|
const periodData = yield ladokClient.period(); // TODO: Use cached values
|
|
270
270
|
if (periodData.type === 'error') {
|
|
271
271
|
throw new Error(`API error: ${periodData.responseInfo.message}`);
|
|
272
272
|
}
|
|
273
|
-
const mainStudyYears = (0, studyYearUtil_1.generateStudyYearData)(structureCourses, freeTexts, periodData.data.Period,
|
|
274
|
-
const
|
|
275
|
-
return [{ studyYears: mainStudyYears }, ...
|
|
273
|
+
const mainStudyYears = (0, studyYearUtil_1.generateStudyYearData)(structureCourses, freeTexts, periodData.data.Period, startPeriod === null || startPeriod === void 0 ? void 0 : startPeriod.code, lengthInStudyYears);
|
|
274
|
+
const specialisationCurriculums = yield mapSpecialisationCurriculums(structureSpecialisations, startPeriod === null || startPeriod === void 0 ? void 0 : startPeriod.code, lengthInStudyYears, language, ladokClient, periodData.data.Period);
|
|
275
|
+
return [{ studyYears: mainStudyYears }, ...specialisationCurriculums];
|
|
276
276
|
}
|
|
277
277
|
catch (error) {
|
|
278
278
|
throw (0, exports.handleError)('Unexpected error during processing', error);
|
|
279
279
|
}
|
|
280
280
|
});
|
|
281
|
-
exports.
|
|
282
|
-
//# sourceMappingURL=
|
|
281
|
+
exports.fetchProgrammeStructure = fetchProgrammeStructure;
|
|
282
|
+
//# sourceMappingURL=programmeStructureUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"programmeStructureUtil.js","sourceRoot":"","sources":["../../src/utils/programmeStructureUtil.ts"],"names":[],"mappings":"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"}
|