@kth/om-kursen-ladok-client 1.2.4 → 1.2.5
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/README.md +1 -1
- package/dist/createApiClient.d.ts +2 -2
- package/dist/createApiClient.js +130 -89
- package/dist/createApiClient.js.map +1 -1
- package/dist/groupSearchResults.d.ts +3 -3
- package/dist/groupSearchResults.js +5 -8
- package/dist/groupSearchResults.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js.map +1 -1
- package/dist/mapCourse.d.ts +3 -3
- package/dist/mapCourse.js +6 -6
- package/dist/mapCourse.js.map +1 -1
- package/dist/mapCourseInstans.js.map +1 -1
- package/dist/mapCourseRound.js.map +1 -1
- package/dist/mapCourseSyllabus.d.ts +4 -4
- package/dist/mapCourseSyllabus.js +21 -29
- package/dist/mapCourseSyllabus.js.map +1 -1
- package/dist/mapExaminationModule.d.ts +4 -4
- package/dist/mapExaminationModule.js +6 -6
- package/dist/mapExaminationModule.js.map +1 -1
- package/dist/mapGradingScales.d.ts +1 -1
- package/dist/mapGradingScales.js +3 -3
- package/dist/mapGradingScales.js.map +1 -1
- package/dist/mapProgramTerm.js +1 -1
- package/dist/mapProgramTerm.js.map +1 -1
- package/dist/mapProgramTillfalle.js.map +1 -1
- package/dist/mapSearchResult.d.ts +2 -2
- package/dist/mapSearchResult.js +11 -11
- package/dist/mapSearchResult.js.map +1 -1
- package/dist/mapStructureCourses.d.ts +3 -3
- package/dist/mapStructureCourses.js +3 -3
- package/dist/mapStructureCourses.js.map +1 -1
- package/dist/types/OmKursenLadokApiClient.d.ts +11 -10
- package/dist/utils/courseSyllabusUtil.d.ts +2 -2
- package/dist/utils/courseSyllabusUtil.js +4 -4
- package/dist/utils/courseSyllabusUtil.js.map +1 -1
- package/dist/utils/creditsUtil.d.ts +2 -2
- package/dist/utils/creditsUtil.js +6 -6
- package/dist/utils/creditsUtil.js.map +1 -1
- package/dist/utils/examinationModulesUtil.d.ts +3 -3
- package/dist/utils/examinationModulesUtil.js +8 -8
- package/dist/utils/examinationModulesUtil.js.map +1 -1
- package/dist/utils/gradingScalesUtils.d.ts +1 -1
- package/dist/utils/gradingScalesUtils.js +4 -4
- package/dist/utils/gradingScalesUtils.js.map +1 -1
- package/dist/utils/index.d.ts +3 -3
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/languageUtil.d.ts +3 -3
- package/dist/utils/languageUtil.js +1 -1
- package/dist/utils/languageUtil.js.map +1 -1
- package/dist/utils/periodUtil.d.ts +2 -2
- package/dist/utils/periodUtil.js +12 -16
- package/dist/utils/periodUtil.js.map +1 -1
- package/dist/utils/programStrukturUtil.js +5 -8
- package/dist/utils/programStrukturUtil.js.map +1 -1
- package/dist/utils/schoolUtil.d.ts +1 -1
- package/dist/utils/schoolUtil.js +2 -4
- package/dist/utils/schoolUtil.js.map +1 -1
- package/package.json +1 -1
|
@@ -14,7 +14,7 @@ const mapExaminationModule_1 = require("../mapExaminationModule");
|
|
|
14
14
|
const gradingScalesUtils_1 = require("./gradingScalesUtils");
|
|
15
15
|
const handleError = (message, error) => {
|
|
16
16
|
console.error(message, error);
|
|
17
|
-
return { error: message, details: (error === null || error === void 0 ? void 0 : error.message) ||
|
|
17
|
+
return { error: message, details: (error === null || error === void 0 ? void 0 : error.message) || 'Unknown error' };
|
|
18
18
|
};
|
|
19
19
|
exports.handleError = handleError;
|
|
20
20
|
const formatExaminationTitles = (examinationModules, language) => {
|
|
@@ -38,7 +38,7 @@ const fetchStructure = (uid, ladokClient) => __awaiter(void 0, void 0, void 0, f
|
|
|
38
38
|
return ((_a = struktur === null || struktur === void 0 ? void 0 : struktur.data) === null || _a === void 0 ? void 0 : _a.Strukturdelar) || [];
|
|
39
39
|
}
|
|
40
40
|
catch (error) {
|
|
41
|
-
throw (0, exports.handleError)(
|
|
41
|
+
throw (0, exports.handleError)('Failed to fetch structure', error);
|
|
42
42
|
}
|
|
43
43
|
});
|
|
44
44
|
exports.fetchStructure = fetchStructure;
|
|
@@ -47,7 +47,7 @@ const fetchModules = (utbildningsbasUIDn, ladokClient) => __awaiter(void 0, void
|
|
|
47
47
|
const moduler = yield Promise.all(utbildningsbasUIDn.map((utbildningsbasUID) => __awaiter(void 0, void 0, void 0, function* () {
|
|
48
48
|
try {
|
|
49
49
|
const utbildningsinstans = yield ladokClient.utbildningsinstansSlim(utbildningsbasUID, {
|
|
50
|
-
attributVarden:
|
|
50
|
+
attributVarden: 'utbildning.attribut.kod,utbildning.attribut.svensk.benamning,utbildning.attribut.engelsk.benamning,utbildning.attribut.betygsskala,utbildning.attribut.giltig.from,utbildning.attribut.omfattning,utbildningstyp',
|
|
51
51
|
});
|
|
52
52
|
return utbildningsinstans.data;
|
|
53
53
|
}
|
|
@@ -55,26 +55,26 @@ const fetchModules = (utbildningsbasUIDn, ladokClient) => __awaiter(void 0, void
|
|
|
55
55
|
throw (0, exports.handleError)(`Error fetching module for utbildningsbasUID ${utbildningsbasUID}:`, error);
|
|
56
56
|
}
|
|
57
57
|
})));
|
|
58
|
-
return moduler.filter(
|
|
58
|
+
return moduler.filter(module => module !== null);
|
|
59
59
|
}
|
|
60
60
|
catch (error) {
|
|
61
|
-
throw (0, exports.handleError)(
|
|
61
|
+
throw (0, exports.handleError)('Failed to fetch modules', error);
|
|
62
62
|
}
|
|
63
63
|
});
|
|
64
64
|
exports.fetchModules = fetchModules;
|
|
65
65
|
const getExaminationModules = (utbildningsinstansUID, language, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
|
|
66
66
|
try {
|
|
67
67
|
const strukturDelar = yield (0, exports.fetchStructure)(utbildningsinstansUID, ladokClient);
|
|
68
|
-
const utbildningsbasUIDn = strukturDelar.map(
|
|
68
|
+
const utbildningsbasUIDn = strukturDelar.map(strukturdel => strukturdel.UtbildningsbasUID);
|
|
69
69
|
const examinationModules = yield (0, exports.fetchModules)(utbildningsbasUIDn, ladokClient);
|
|
70
70
|
const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient);
|
|
71
|
-
const mappedExaminationModules = examinationModules.map(
|
|
71
|
+
const mappedExaminationModules = examinationModules.map(m => {
|
|
72
72
|
return m && (0, mapExaminationModule_1.mapExaminationModule)(m, language, gradingScalesCodes);
|
|
73
73
|
});
|
|
74
74
|
return mappedExaminationModules;
|
|
75
75
|
}
|
|
76
76
|
catch (error) {
|
|
77
|
-
throw (0, exports.handleError)(
|
|
77
|
+
throw (0, exports.handleError)('Unexpected error during processing', error);
|
|
78
78
|
}
|
|
79
79
|
});
|
|
80
80
|
exports.getExaminationModules = getExaminationModules;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examinationModulesUtil.js","sourceRoot":"","sources":["../../src/utils/examinationModulesUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"examinationModulesUtil.js","sourceRoot":"","sources":["../../src/utils/examinationModulesUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ exports.getGradingScalesCodes = exports.getGradingScales = exports.fetchGradingS
|
|
|
13
13
|
const mapGradingScales_1 = require("../mapGradingScales");
|
|
14
14
|
const handleError = (message, error) => {
|
|
15
15
|
console.error(message, error);
|
|
16
|
-
return { error: message, details: (error === null || error === void 0 ? void 0 : error.message) ||
|
|
16
|
+
return { error: message, details: (error === null || error === void 0 ? void 0 : error.message) || 'Unknown error' };
|
|
17
17
|
};
|
|
18
18
|
exports.handleError = handleError;
|
|
19
19
|
const fetchGradingScales = (ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -23,7 +23,7 @@ const fetchGradingScales = (ladokClient) => __awaiter(void 0, void 0, void 0, fu
|
|
|
23
23
|
return ((_a = gradingScales === null || gradingScales === void 0 ? void 0 : gradingScales.data) === null || _a === void 0 ? void 0 : _a.Betygsskala) || [];
|
|
24
24
|
}
|
|
25
25
|
catch (error) {
|
|
26
|
-
throw (0, exports.handleError)(
|
|
26
|
+
throw (0, exports.handleError)('Failed to fetch grading scales', error);
|
|
27
27
|
}
|
|
28
28
|
});
|
|
29
29
|
exports.fetchGradingScales = fetchGradingScales;
|
|
@@ -34,7 +34,7 @@ const getGradingScales = (ladokClient) => __awaiter(void 0, void 0, void 0, func
|
|
|
34
34
|
return mappedGradingScales;
|
|
35
35
|
}
|
|
36
36
|
catch (error) {
|
|
37
|
-
throw (0, exports.handleError)(
|
|
37
|
+
throw (0, exports.handleError)('Unexpected error during processing', error);
|
|
38
38
|
}
|
|
39
39
|
});
|
|
40
40
|
exports.getGradingScales = getGradingScales;
|
|
@@ -45,7 +45,7 @@ const getGradingScalesCodes = (ladokClient) => __awaiter(void 0, void 0, void 0,
|
|
|
45
45
|
return mappedGradingScalesCodes;
|
|
46
46
|
}
|
|
47
47
|
catch (error) {
|
|
48
|
-
throw (0, exports.handleError)(
|
|
48
|
+
throw (0, exports.handleError)('Unexpected error during processing', error);
|
|
49
49
|
}
|
|
50
50
|
});
|
|
51
51
|
exports.getGradingScalesCodes = getGradingScalesCodes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gradingScalesUtils.js","sourceRoot":"","sources":["../../src/utils/gradingScalesUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"gradingScalesUtils.js","sourceRoot":"","sources":["../../src/utils/gradingScalesUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0DAA6E;AAEtE,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,KAAW,EAAE,EAAE;IAC1D,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC7B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,eAAe,EAAE,CAAA;AACvE,CAAC,CAAA;AAHY,QAAA,WAAW,eAGvB;AAEM,MAAM,kBAAkB,GAAG,CAAO,WAAsC,EAAE,EAAE;;IACjF,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,CAAA;QACrD,OAAO,CAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,0CAAE,WAAW,KAAI,EAAE,CAAA;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,gCAAgC,EAAE,KAAK,CAAC,CAAA;IAC5D,CAAC;AACH,CAAC,CAAA,CAAA;AAPY,QAAA,kBAAkB,sBAO9B;AAEM,MAAM,gBAAgB,GAAG,CAAO,WAAsC,EAAE,EAAE;IAC/E,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAkB,EAAC,WAAW,CAAC,CAAA;QAC3D,MAAM,mBAAmB,GAAG,IAAA,mCAAgB,EAAC,aAAa,CAAC,CAAA;QAC3D,OAAO,mBAAmB,CAAA;IAC5B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,oCAAoC,EAAE,KAAK,CAAC,CAAA;IAChE,CAAC;AACH,CAAC,CAAA,CAAA;AARY,QAAA,gBAAgB,oBAQ5B;AAEM,MAAM,qBAAqB,GAAG,CAAO,WAAsC,EAAE,EAAE;IACpF,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAkB,EAAC,WAAW,CAAC,CAAA;QAC3D,MAAM,wBAAwB,GAAG,IAAA,wCAAqB,EAAC,aAAa,CAAC,CAAA;QACrE,OAAO,wBAAwB,CAAA;IACjC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,oCAAoC,EAAE,KAAK,CAAC,CAAA;IAChE,CAAC;AACH,CAAC,CAAA,CAAA;AARY,QAAA,qBAAqB,yBAQjC"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
1
|
+
export * from './dateUtil';
|
|
2
|
+
export * from './languageUtil';
|
|
3
|
+
export * from './periodUtil';
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,iDAA8B;AAC9B,+CAA4B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Grunddata, Organisation, Studietakt, Tilltradesniva, Utbildningstyp } from
|
|
2
|
-
export type Language =
|
|
1
|
+
import { Grunddata, Organisation, Studietakt, Tilltradesniva, Utbildningstyp } from '@kth/ladok-attributvarde-utils';
|
|
2
|
+
export type Language = 'sv' | 'en';
|
|
3
3
|
export interface TranslatedGrunddata {
|
|
4
4
|
id: string;
|
|
5
5
|
code: string;
|
|
@@ -27,7 +27,7 @@ export interface TranslatedTilltradesniva extends TranslatedGrunddata {
|
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
29
|
export interface TranslatedStudietakt extends TranslatedGrunddata {
|
|
30
|
-
takt: Studietakt[
|
|
30
|
+
takt: Studietakt['takt'];
|
|
31
31
|
}
|
|
32
32
|
export declare const translateGrunddata: (grunddata: Grunddata, language: Language) => TranslatedGrunddata;
|
|
33
33
|
export declare const translateOrganisation: (organisation: Organisation, language: Language) => TranslatedOrganisation;
|
|
@@ -18,7 +18,7 @@ const translateGrunddata = (grunddata, language) => {
|
|
|
18
18
|
id,
|
|
19
19
|
code,
|
|
20
20
|
name: rest[language],
|
|
21
|
-
nameOther: rest[language ===
|
|
21
|
+
nameOther: rest[language === 'sv' ? 'en' : 'sv'],
|
|
22
22
|
};
|
|
23
23
|
};
|
|
24
24
|
exports.translateGrunddata = translateGrunddata;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"languageUtil.js","sourceRoot":"","sources":["../../src/utils/languageUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"languageUtil.js","sourceRoot":"","sources":["../../src/utils/languageUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAsCO,MAAM,kBAAkB,GAAG,CAAC,SAAoB,EAAE,QAAkB,EAAuB,EAAE;IAClG,MAAM,EAAE,EAAE,EAAE,IAAI,KAAc,SAAS,EAAlB,IAAI,UAAK,SAAS,EAAjC,cAAqB,CAAY,CAAA;IACvC,OAAO;QACL,EAAE;QACF,IAAI;QACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;QACpB,SAAS,EAAE,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;KACjD,CAAA;AACH,CAAC,CAAA;AARY,QAAA,kBAAkB,sBAQ9B;AAEM,MAAM,qBAAqB,GAAG,CAAC,YAA0B,EAAE,QAAkB,EAA0B,EAAE;IAC9G,uCACK,IAAA,0BAAkB,EAAC,YAAY,EAAE,QAAQ,CAAC,KAC7C,oBAAoB,EAAE,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAC9D;AACH,CAAC,CAAA;AALY,QAAA,qBAAqB,yBAKjC;AAEM,MAAM,uBAAuB,GAAG,CACrC,cAA8B,EAC9B,QAAkB,EACQ,EAAE;IAC5B,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,cAAc,CAAC,WAAW,CAAA;IAC7C,MAAM,KAAoB,cAAc,CAAC,KAAK,EAAxC,EAAE,IAAI,OAAkC,EAA7B,IAAI,cAAf,QAAiB,CAAuB,CAAA;IAC9C,uCACK,IAAA,0BAAkB,EAAC,cAAc,EAAE,QAAQ,CAAC,KAC/C,WAAW,EAAE;YACX,IAAI,EAAE,cAAc,CAAC,WAAW,CAAC,IAAI;YACrC,EAAE;YACF,EAAE;SACH,EACD,KAAK,EAAE;YACL,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;SACrB,IACF;AACH,CAAC,CAAA;AAlBY,QAAA,uBAAuB,2BAkBnC;AAEM,MAAM,wBAAwB,GAAG,CACtC,cAA8B,EAC9B,QAAkB,EACQ,EAAE;IAC5B,MAAM,KAAoB,cAAc,CAAC,KAAK,EAAxC,EAAE,IAAI,OAAkC,EAA7B,IAAI,cAAf,QAAiB,CAAuB,CAAA;IAC9C,uCACK,IAAA,0BAAkB,EAAC,cAAc,EAAE,QAAQ,CAAC,KAC/C,KAAK,EAAE;YACL,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;SACrB,IACF;AACH,CAAC,CAAA;AAZY,QAAA,wBAAwB,4BAYpC;AAEM,MAAM,mBAAmB,GAAG,CAAC,UAAsB,EAAE,QAAkB,EAAwB,EAAE;IACtG,uCACK,IAAA,0BAAkB,EAAC,UAAU,EAAE,QAAQ,CAAC,KAC3C,IAAI,EAAE,UAAU,CAAC,IAAI,IACtB;AACH,CAAC,CAAA;AALY,QAAA,mBAAmB,uBAK/B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PeriodItem } from
|
|
2
|
-
import { ProgramInstans } from
|
|
1
|
+
import { PeriodItem } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
import { ProgramInstans } from '../mapProgramInstans';
|
|
3
3
|
export declare const transformPeriodInDigits: (period: string) => string | null;
|
|
4
4
|
export declare const transformDigitsInPeriod: (period: string) => string;
|
|
5
5
|
export declare const findValidProgramForCode: (code: string, periods: PeriodItem[], programs: ProgramInstans[]) => ProgramInstans | undefined;
|
package/dist/utils/periodUtil.js
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getKthStudyPeriod = exports.getPeriodCodeForDate = exports.findValidProgramForCode = exports.transformDigitsInPeriod = exports.transformPeriodInDigits = void 0;
|
|
4
4
|
const transformPeriodInDigits = (period) => {
|
|
5
|
-
const validPrefixes = [
|
|
5
|
+
const validPrefixes = ['HT', 'VT'];
|
|
6
6
|
if (validPrefixes.includes(period.slice(0, 2)) && period.length > 2) {
|
|
7
|
-
const suffix = period.startsWith(
|
|
7
|
+
const suffix = period.startsWith('HT') ? '2' : '1';
|
|
8
8
|
const year = period.slice(2);
|
|
9
9
|
return year + suffix;
|
|
10
10
|
}
|
|
@@ -13,7 +13,7 @@ const transformPeriodInDigits = (period) => {
|
|
|
13
13
|
exports.transformPeriodInDigits = transformPeriodInDigits;
|
|
14
14
|
const transformDigitsInPeriod = (period) => {
|
|
15
15
|
const year = period.slice(0, 4);
|
|
16
|
-
const semester = period.slice(4) ===
|
|
16
|
+
const semester = period.slice(4) === '1' ? 'VT' : 'HT';
|
|
17
17
|
return `${semester}${year}`;
|
|
18
18
|
};
|
|
19
19
|
exports.transformDigitsInPeriod = transformDigitsInPeriod;
|
|
@@ -46,7 +46,7 @@ const getPeriodCodeForDate = (date) => {
|
|
|
46
46
|
const JULY = 6;
|
|
47
47
|
const year = date.getFullYear();
|
|
48
48
|
const month = date.getMonth();
|
|
49
|
-
const semester = month < JULY ?
|
|
49
|
+
const semester = month < JULY ? 'VT' : 'HT';
|
|
50
50
|
return `${semester}${year}`;
|
|
51
51
|
};
|
|
52
52
|
exports.getPeriodCodeForDate = getPeriodCodeForDate;
|
|
@@ -56,25 +56,21 @@ const getKthStudyPeriod = (date, startPeriod, type) => {
|
|
|
56
56
|
const day = date.getDate();
|
|
57
57
|
if (!startPeriod.code || !startPeriod.startDate || !startPeriod.endDate)
|
|
58
58
|
return undefined;
|
|
59
|
-
if (type ===
|
|
60
|
-
if (startPeriod.code.startsWith(
|
|
59
|
+
if (type === 'start') {
|
|
60
|
+
if (startPeriod.code.startsWith('HT') && date < startPeriod.startDate)
|
|
61
61
|
return 0;
|
|
62
|
-
if (startPeriod.code.startsWith(
|
|
63
|
-
date >= startPeriod.startDate &&
|
|
64
|
-
month <= 9)
|
|
62
|
+
if (startPeriod.code.startsWith('HT') && date >= startPeriod.startDate && month <= 9)
|
|
65
63
|
return 1;
|
|
66
|
-
if (startPeriod.code.startsWith(
|
|
64
|
+
if (startPeriod.code.startsWith('HT') && date <= startPeriod.endDate)
|
|
67
65
|
return 2;
|
|
68
|
-
if (startPeriod.code.startsWith(
|
|
69
|
-
date >= startPeriod.startDate &&
|
|
70
|
-
month <= 2)
|
|
66
|
+
if (startPeriod.code.startsWith('VT') && date >= startPeriod.startDate && month <= 2)
|
|
71
67
|
return 3;
|
|
72
|
-
if (startPeriod.code.startsWith(
|
|
68
|
+
if (startPeriod.code.startsWith('VT') && date <= startPeriod.endDate)
|
|
73
69
|
return 4;
|
|
74
|
-
if (startPeriod.code.startsWith(
|
|
70
|
+
if (startPeriod.code.startsWith('VT') && date > startPeriod.endDate)
|
|
75
71
|
return 5;
|
|
76
72
|
}
|
|
77
|
-
else if (type ===
|
|
73
|
+
else if (type === 'end') {
|
|
78
74
|
if ((month == 7 && day > 15) || month == 8)
|
|
79
75
|
return 0;
|
|
80
76
|
if (month >= 9 && month <= 11)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"periodUtil.js","sourceRoot":"","sources":["../../src/utils/periodUtil.ts"],"names":[],"mappings":";;;AAGO,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAE,EAAE;IACxD,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"periodUtil.js","sourceRoot":"","sources":["../../src/utils/periodUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,8 +83,8 @@ const fetchStructurePartsVersions = (utbildningsinstansUIDn, ladokClient) => __a
|
|
|
83
83
|
exports.fetchStructurePartsVersions = fetchStructurePartsVersions;
|
|
84
84
|
const categoryMap = {
|
|
85
85
|
'VILLKORLIGT VALFRI': 'VV',
|
|
86
|
-
|
|
87
|
-
|
|
86
|
+
REKOMMENDERAD: 'R',
|
|
87
|
+
VALFRI: 'V',
|
|
88
88
|
};
|
|
89
89
|
const categorizeStructureParts = (strukturDelar) => {
|
|
90
90
|
return strukturDelar.map(strukturdel => {
|
|
@@ -105,7 +105,7 @@ function fetchMappedStructurePartInstances(categorizedStrukturDelar, language, l
|
|
|
105
105
|
return filtered.map(instance => (0, mapStructureCourses_1.mapStructurePartInstances)(instance, language));
|
|
106
106
|
});
|
|
107
107
|
}
|
|
108
|
-
const SPECIALIZATION_INSTANCE_TYPE =
|
|
108
|
+
const SPECIALIZATION_INSTANCE_TYPE = 'Inriktningstillfälle';
|
|
109
109
|
function isSpecializationInstance(instance) {
|
|
110
110
|
const type = instance.utbildningstyp;
|
|
111
111
|
return (type === null || type === void 0 ? void 0 : type.name) === SPECIALIZATION_INSTANCE_TYPE || (type === null || type === void 0 ? void 0 : type.nameOther) === SPECIALIZATION_INSTANCE_TYPE;
|
|
@@ -187,17 +187,14 @@ const mapSpecializationCurriculums = (specializations, startperiodCode, lengthIn
|
|
|
187
187
|
});
|
|
188
188
|
const fetchProgramStructure = (utbildningstillfalleUID, language, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
|
|
189
189
|
try {
|
|
190
|
-
const { startperiod, lengthInStudyYears, courseListFromStructure, specializationListFromStructure
|
|
190
|
+
const { startperiod, lengthInStudyYears, courseListFromStructure, specializationListFromStructure } = yield getMainProgramInstanceData(utbildningstillfalleUID, language, ladokClient);
|
|
191
191
|
const periodData = yield ladokClient.period();
|
|
192
192
|
if (periodData.type === 'error') {
|
|
193
193
|
throw new Error(`API error: ${periodData.responseInfo.message}`);
|
|
194
194
|
}
|
|
195
195
|
const mainStudyYears = (0, studyYearUtil_1.generateStudyYearData)(courseListFromStructure, periodData.data.Period, startperiod === null || startperiod === void 0 ? void 0 : startperiod.code, lengthInStudyYears);
|
|
196
196
|
const specializationCurriculums = yield mapSpecializationCurriculums(specializationListFromStructure, startperiod === null || startperiod === void 0 ? void 0 : startperiod.code, lengthInStudyYears, language, ladokClient, periodData.data.Period);
|
|
197
|
-
return [
|
|
198
|
-
{ studyYears: mainStudyYears },
|
|
199
|
-
...specializationCurriculums,
|
|
200
|
-
];
|
|
197
|
+
return [{ studyYears: mainStudyYears }, ...specializationCurriculums];
|
|
201
198
|
}
|
|
202
199
|
catch (error) {
|
|
203
200
|
throw (0, exports.handleError)('Unexpected error during processing', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"programStrukturUtil.js","sourceRoot":"","sources":["../../src/utils/programStrukturUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,gEAAyF;AACzF,0DAAoF;AACpF,8EAAiE;AACjE,mDAAuD;AAGhD,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,KAAW,EAAE,EAAE;IAC1D,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAC7B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,eAAe,EAAE,CAAA;AACvE,CAAC,CAAA;AAHY,QAAA,WAAW,eAGvB;AAEM,MAAM,4BAA4B,GAAG,CAAO,GAAW,EAAE,WAAsC,EAAE,EAAE;;IACxG,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAA;QACpE,OAAO,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,0CAAE,aAAa,KAAI,EAAE,CAAA;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,2BAA2B,EAAE,KAAK,CAAC,CAAA;IACvD,CAAC;AACH,CAAC,CAAA,CAAA;AAPY,QAAA,4BAA4B,gCAOxC;AAEM,MAAM,0BAA0B,GAAG,CAAO,GAAW,EAAE,WAAsC,EAAE,EAAE;;IACtG,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAA;QAClE,OAAO,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,0CAAE,aAAa,KAAI,EAAE,CAAA;IAC5C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,2BAA2B,EAAE,KAAK,CAAC,CAAA;IACvD,CAAC;AACH,CAAC,CAAA,CAAA;AAPY,QAAA,0BAA0B,8BAOtC;AAEM,MAAM,2BAA2B,GAAG,
|
|
1
|
+
{"version":3,"file":"programStrukturUtil.js","sourceRoot":"","sources":["../../src/utils/programStrukturUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { Organisation } from
|
|
1
|
+
import { Organisation } from '@kth/ladok-attributvarde-utils';
|
|
2
2
|
export declare const extractSchoolCodeFromOrganisation: (organisation: Organisation | undefined, language: string) => string;
|
package/dist/utils/schoolUtil.js
CHANGED
|
@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.extractSchoolCodeFromOrganisation = void 0;
|
|
4
4
|
const extractSchoolCodeFromOrganisation = (organisation, language) => {
|
|
5
5
|
if (!organisation)
|
|
6
|
-
return
|
|
7
|
-
return language ==
|
|
8
|
-
? organisation.sv.split("/")[0]
|
|
9
|
-
: organisation.en.split("/")[0];
|
|
6
|
+
return '';
|
|
7
|
+
return language == 'sv' ? organisation.sv.split('/')[0] : organisation.en.split('/')[0];
|
|
10
8
|
};
|
|
11
9
|
exports.extractSchoolCodeFromOrganisation = extractSchoolCodeFromOrganisation;
|
|
12
10
|
//# sourceMappingURL=schoolUtil.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schoolUtil.js","sourceRoot":"","sources":["../../src/utils/schoolUtil.ts"],"names":[],"mappings":";;;AAEO,MAAM,iCAAiC,GAAG,
|
|
1
|
+
{"version":3,"file":"schoolUtil.js","sourceRoot":"","sources":["../../src/utils/schoolUtil.ts"],"names":[],"mappings":";;;AAEO,MAAM,iCAAiC,GAAG,CAAC,YAAsC,EAAE,QAAgB,EAAE,EAAE;IAC5G,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,CAAA;IAC5B,OAAO,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;AACzF,CAAC,CAAA;AAHY,QAAA,iCAAiC,qCAG7C"}
|
package/package.json
CHANGED