@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
package/dist/mapCourse.js
CHANGED
|
@@ -7,19 +7,19 @@ const creditsUtil_1 = require("./utils/creditsUtil");
|
|
|
7
7
|
const schoolUtil_1 = require("./utils/schoolUtil");
|
|
8
8
|
const mapCourse = (course, language, gradingScalesCodes) => {
|
|
9
9
|
const benamning = {
|
|
10
|
-
sv: course.index[
|
|
11
|
-
en: course.index[
|
|
10
|
+
sv: course.index['utbildning.attribut.svensk.benamning'],
|
|
11
|
+
en: course.index['utbildning.attribut.engelsk.benamning'],
|
|
12
12
|
};
|
|
13
|
-
const betygsskala = (0, ladok_attributvarde_utils_1.extractGrunddata)(course.Attributvarden,
|
|
13
|
+
const betygsskala = (0, ladok_attributvarde_utils_1.extractGrunddata)(course.Attributvarden, 'utbildning.attribut.betygsskala');
|
|
14
14
|
const huvudomraden = (0, ladok_attributvarde_utils_1.extractHuvudomraden)(course.Attributvarden);
|
|
15
15
|
const organisation = (0, ladok_attributvarde_utils_1.extractOrganisation)(course.Attributvarden);
|
|
16
16
|
const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(course.Attributvarden);
|
|
17
17
|
const schoolCode = (0, schoolUtil_1.extractSchoolCodeFromOrganisation)(organisation, language);
|
|
18
|
-
const omfattning = course.index[
|
|
18
|
+
const omfattning = course.index['utbildning.attribut.omfattning'];
|
|
19
19
|
return {
|
|
20
20
|
uid: course.instans_uid,
|
|
21
21
|
versionsnummer: course.index.versionsnummer,
|
|
22
|
-
kod: course.index[
|
|
22
|
+
kod: course.index['utbildning.attribut.kod'],
|
|
23
23
|
benamning: benamning[language],
|
|
24
24
|
omfattning: {
|
|
25
25
|
number: omfattning,
|
|
@@ -28,7 +28,7 @@ const mapCourse = (course, language, gradingScalesCodes) => {
|
|
|
28
28
|
organisation: organisation && (0, languageUtil_1.translateOrganisation)(organisation, language),
|
|
29
29
|
utbildningstyp: utbildningstyp && (0, languageUtil_1.translateUtbildningstyp)(utbildningstyp, language),
|
|
30
30
|
betygsskala: betygsskala && Object.assign(Object.assign({}, (0, languageUtil_1.translateGrunddata)(betygsskala, language)), { formatted: gradingScalesCodes[betygsskala.code] }),
|
|
31
|
-
huvudomraden: huvudomraden === null || huvudomraden === void 0 ? void 0 : huvudomraden.map(
|
|
31
|
+
huvudomraden: huvudomraden === null || huvudomraden === void 0 ? void 0 : huvudomraden.map(x => (0, languageUtil_1.translateGrunddata)(x, language)),
|
|
32
32
|
schoolCode,
|
|
33
33
|
};
|
|
34
34
|
};
|
package/dist/mapCourse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapCourse.js","sourceRoot":"","sources":["../src/mapCourse.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"mapCourse.js","sourceRoot":"","sources":["../src/mapCourse.ts"],"names":[],"mappings":";;;AAAA,8EAKuC;AAGvC,uDAQ6B;AAC7B,qDAAgE;AAChE,mDAAsE;AAmB/D,MAAM,SAAS,GAAG,CACvB,MAAiE,EACjE,QAAkB,EAClB,kBAAsC,EAC9B,EAAE;IACV,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC;QACxD,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC;KAC1D,CAAA;IACD,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAAC,MAAM,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAA;IAC9F,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAA;IAEnE,MAAM,UAAU,GAAG,IAAA,8CAAiC,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAE5E,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;IAEjE,OAAO;QACL,GAAG,EAAE,MAAM,CAAC,WAAY;QACxB,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc;QAC3C,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC;QAC5C,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC;QAC9B,UAAU,EAAE;YACV,MAAM,EAAE,UAAU;YAClB,iBAAiB,EAAE,IAAA,wCAA0B,EAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,CAAC;SACpF;QACD,YAAY,EAAE,YAAY,IAAI,IAAA,oCAAqB,EAAC,YAAY,EAAE,QAAQ,CAAC;QAC3E,cAAc,EAAE,cAAc,IAAI,IAAA,sCAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;QACnF,WAAW,EAAE,WAAW,oCACnB,IAAA,iCAAkB,EAAC,WAAW,EAAE,QAAQ,CAAC,KAC5C,SAAS,EAAE,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,GAChD;QACD,YAAY,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iCAAkB,EAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACrE,UAAU;KACX,CAAA;AACH,CAAC,CAAA;AApCY,QAAA,SAAS,aAoCrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapCourseInstans.js","sourceRoot":"","sources":["../src/mapCourseInstans.ts"],"names":[],"mappings":";;;AAAA,8EAAqF;AAGrF,uDAAkG;AAQ3F,MAAM,wBAAwB,GAAG,
|
|
1
|
+
{"version":3,"file":"mapCourseInstans.js","sourceRoot":"","sources":["../src/mapCourseInstans.ts"],"names":[],"mappings":";;;AAAA,8EAAqF;AAGrF,uDAAkG;AAQ3F,MAAM,wBAAwB,GAAG,CACtC,MAAmD,EACnD,QAAkB,EACI,EAAE;IACxB,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAA;IAEjC,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,sCAAsC,CAAC;QACzE,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,uCAAuC,CAAC;KAC3E,CAAA;IAED,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,cAAc,CAAC,CAAA;IAE5D,MAAM,GAAG,GAAG,IAAA,yCAAa,EAAC,cAAc,EAAE,yBAAyB,CAAC,CAAA;IAEpE,OAAO;QACL,GAAG,EAAE,GAAI;QACT,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAE;QAC/B,cAAc,EAAE,cAAc,IAAI,IAAA,sCAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;KACpF,CAAA;AACH,CAAC,CAAA;AApBY,QAAA,wBAAwB,4BAoBpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapCourseRound.js","sourceRoot":"","sources":["../src/mapCourseRound.ts"],"names":[],"mappings":";;;AAAA,8EAUuC;AAEvC,mCAOgB;AAChB,qDAAoD;AAgE7C,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"mapCourseRound.js","sourceRoot":"","sources":["../src/mapCourseRound.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { SokPlanItem } from
|
|
2
|
-
import { Grunddata } from
|
|
3
|
-
import { Language } from
|
|
4
|
-
import { GradingScalesCodes } from
|
|
1
|
+
import { SokPlanItem } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
import { Grunddata } from '@kth/ladok-attributvarde-utils';
|
|
3
|
+
import { Language } from './utils';
|
|
4
|
+
import { GradingScalesCodes } from './mapGradingScales';
|
|
5
5
|
interface FormattedExaminationModules {
|
|
6
6
|
completeExaminationStrings: string[];
|
|
7
7
|
titles: string[];
|
|
@@ -16,50 +16,42 @@ const convertMarkdownToHtml = (markdownText) => {
|
|
|
16
16
|
};
|
|
17
17
|
const extractString = (syllabus, attributeName, language) => {
|
|
18
18
|
var _a;
|
|
19
|
-
return convertMarkdownToHtml((_a = syllabus.AktuellaAttributvarden.find((item)
|
|
20
|
-
var _a;
|
|
21
|
-
return ((_a = item.Attributdefinition) === null || _a === void 0 ? void 0 : _a.Kod) ===
|
|
22
|
-
`utbildning.lokalt.attribut.29.${attributeName}.${language}`;
|
|
23
|
-
})) === null || _a === void 0 ? void 0 : _a.Varden[0]);
|
|
19
|
+
return convertMarkdownToHtml((_a = syllabus.AktuellaAttributvarden.find(item => { var _a; return ((_a = item.Attributdefinition) === null || _a === void 0 ? void 0 : _a.Kod) === `utbildning.lokalt.attribut.29.${attributeName}.${language}`; })) === null || _a === void 0 ? void 0 : _a.Varden[0]);
|
|
24
20
|
};
|
|
25
21
|
const mapCourseSyllabus = (syllabus, gradingScalesCodes, examinationModules, language) => {
|
|
26
22
|
var _a;
|
|
27
23
|
return {
|
|
28
24
|
course: {
|
|
29
|
-
kod: syllabus.index[
|
|
25
|
+
kod: syllabus.index['utbildning.attribut.kod'],
|
|
30
26
|
benamning: {
|
|
31
|
-
sv: syllabus.index[
|
|
32
|
-
en: syllabus.index[
|
|
27
|
+
sv: syllabus.index['utbildning.attribut.svensk.benamning'],
|
|
28
|
+
en: syllabus.index['utbildning.attribut.engelsk.benamning'],
|
|
33
29
|
},
|
|
34
30
|
omfattning: {
|
|
35
|
-
number: syllabus.index[
|
|
36
|
-
formattedWithUnit: (0, creditsUtil_1.formatCreditsWithUnitLabel)(syllabus.index[
|
|
31
|
+
number: syllabus.index['utbildning.attribut.omfattning'],
|
|
32
|
+
formattedWithUnit: (0, creditsUtil_1.formatCreditsWithUnitLabel)(syllabus.index['utbildning.attribut.omfattning'], (0, ladok_attributvarde_utils_2.extractUtbildningstyp)(syllabus.instans.Attributvarden), language),
|
|
37
33
|
},
|
|
38
|
-
betygsskala: gradingScalesCodes[syllabus.index[
|
|
34
|
+
betygsskala: gradingScalesCodes[syllabus.index['utbildning.attribut.betygsskala.kod']],
|
|
39
35
|
nivainomstudieordning: (0, ladok_attributvarde_utils_2.extractUtbildningstyp)(syllabus.instans.Attributvarden),
|
|
40
36
|
huvudomraden: (0, ladok_attributvarde_utils_1.extractHuvudomraden)(syllabus.instans.Attributvarden),
|
|
41
|
-
overgangsbestammelser: extractString(syllabus,
|
|
37
|
+
overgangsbestammelser: extractString(syllabus, 'overgangsbestammelser', language),
|
|
42
38
|
},
|
|
43
39
|
kursplan: {
|
|
44
40
|
giltigfrom: (0, courseSyllabusUtil_1.getSemester)(syllabus.GiltigFran),
|
|
45
|
-
utgava: (_a = syllabus.AktuellaAttributvarden.find((item)
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
larandemal: extractString(syllabus, "larandemal", language),
|
|
52
|
-
kursinnehall: extractString(syllabus, "kursinnehall", language),
|
|
53
|
-
etisktforhallandesatt: extractString(syllabus, "etiskt.forhallningssatt", language),
|
|
54
|
-
faststallande: extractString(syllabus, "fastallande1", language),
|
|
41
|
+
utgava: (_a = syllabus.AktuellaAttributvarden.find(item => { var _a; return ((_a = item.Attributdefinition) === null || _a === void 0 ? void 0 : _a.Kod) === `utbildning.lokalt.attribut.29.utgava`; })) === null || _a === void 0 ? void 0 : _a.Varden[0],
|
|
42
|
+
undervisningssprak: extractString(syllabus, 'undervisningssprak', language),
|
|
43
|
+
larandemal: extractString(syllabus, 'larandemal', language),
|
|
44
|
+
kursinnehall: extractString(syllabus, 'kursinnehall', language),
|
|
45
|
+
etisktforhallandesatt: extractString(syllabus, 'etiskt.forhallningssatt', language),
|
|
46
|
+
faststallande: extractString(syllabus, 'fastallande1', language),
|
|
55
47
|
examinationModules,
|
|
56
|
-
kommentartillexamination: extractString(syllabus,
|
|
57
|
-
ovrigakravforslutbetyg: extractString(syllabus,
|
|
58
|
-
kurslitteratur: extractString(syllabus,
|
|
59
|
-
kursupplagg: extractString(syllabus,
|
|
60
|
-
sarskildbehorighet: extractString(syllabus,
|
|
61
|
-
gammalutrustning: extractString(syllabus,
|
|
62
|
-
avvecklingsbeslut: extractString(syllabus,
|
|
48
|
+
kommentartillexamination: extractString(syllabus, 'kommentar.till.examination', language),
|
|
49
|
+
ovrigakravforslutbetyg: extractString(syllabus, 'ovriga.krav.for.slutbeyg', language),
|
|
50
|
+
kurslitteratur: extractString(syllabus, 'gammal.kurslitteratur', language),
|
|
51
|
+
kursupplagg: extractString(syllabus, 'gammal.kursupplagg', language),
|
|
52
|
+
sarskildbehorighet: extractString(syllabus, 'sarskild.behorighet', language),
|
|
53
|
+
gammalutrustning: extractString(syllabus, 'gammal.utrustning', language),
|
|
54
|
+
avvecklingsbeslut: extractString(syllabus, 'avvecklingsbeslut', language),
|
|
63
55
|
},
|
|
64
56
|
};
|
|
65
57
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapCourseSyllabus.js","sourceRoot":"","sources":["../src/mapCourseSyllabus.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"mapCourseSyllabus.js","sourceRoot":"","sources":["../src/mapCourseSyllabus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Utbildningsinstans, UtbildningsinstansSlim } from
|
|
2
|
-
import { Language, TranslatedGrunddata } from
|
|
3
|
-
import { Grunddata } from
|
|
4
|
-
import { GradingScalesCodes } from
|
|
1
|
+
import { Utbildningsinstans, UtbildningsinstansSlim } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
import { Language, TranslatedGrunddata } from './utils';
|
|
3
|
+
import { Grunddata } from '@kth/ladok-attributvarde-utils';
|
|
4
|
+
import { GradingScalesCodes } from './mapGradingScales';
|
|
5
5
|
export type ExaminationModule = {
|
|
6
6
|
ladokUID: string;
|
|
7
7
|
kod: string;
|
|
@@ -8,16 +8,16 @@ const mapExaminationModule = (moduleInstance, language, gradingScalesCodes) => {
|
|
|
8
8
|
var _a;
|
|
9
9
|
const { Attributvarden, Uid } = moduleInstance;
|
|
10
10
|
const benamning = {
|
|
11
|
-
sv: (0, ladok_attributvarde_utils_1.extractString)(Attributvarden,
|
|
12
|
-
en: (0, ladok_attributvarde_utils_1.extractString)(Attributvarden,
|
|
11
|
+
sv: (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.svensk.benamning'),
|
|
12
|
+
en: (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.engelsk.benamning'),
|
|
13
13
|
};
|
|
14
|
-
const betygsskala = (0, ladok_attributvarde_utils_1.extractGrunddata)(Attributvarden,
|
|
15
|
-
const giltigFrom = (0, ladok_attributvarde_utils_1.extractGrunddata)(Attributvarden,
|
|
16
|
-
const omfattning = (_a = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden,
|
|
14
|
+
const betygsskala = (0, ladok_attributvarde_utils_1.extractGrunddata)(Attributvarden, 'utbildning.attribut.betygsskala');
|
|
15
|
+
const giltigFrom = (0, ladok_attributvarde_utils_1.extractGrunddata)(Attributvarden, 'utbildning.attribut.giltig.from');
|
|
16
|
+
const omfattning = (_a = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.omfattning', 'omfattning')) !== null && _a !== void 0 ? _a : '0';
|
|
17
17
|
const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(Attributvarden);
|
|
18
18
|
return {
|
|
19
19
|
ladokUID: Uid,
|
|
20
|
-
kod: (0, ladok_attributvarde_utils_1.extractString)(Attributvarden,
|
|
20
|
+
kod: (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.kod'),
|
|
21
21
|
benamning: benamning[language],
|
|
22
22
|
betygsskala: betygsskala && Object.assign(Object.assign({}, (0, utils_1.translateGrunddata)(betygsskala, language)), { formatted: gradingScalesCodes[betygsskala.code] }),
|
|
23
23
|
omfattning: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapExaminationModule.js","sourceRoot":"","sources":["../src/mapExaminationModule.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"mapExaminationModule.js","sourceRoot":"","sources":["../src/mapExaminationModule.ts"],"names":[],"mappings":";;;AACA,qDAAgE;AAChE,mCAA2E;AAC3E,8EAAkH;AAe3G,MAAM,oBAAoB,GAAG,CAClC,cAA2D,EAC3D,QAAkB,EAClB,kBAAsC,EACnB,EAAE;;IACrB,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,cAAc,CAAA;IAE9C,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,sCAAsC,CAAC;QACzE,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,uCAAuC,CAAC;KAC3E,CAAA;IAED,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAAC,cAAc,EAAE,iCAAiC,CAAC,CAAA;IACvF,MAAM,UAAU,GAAG,IAAA,4CAAgB,EAAC,cAAc,EAAE,iCAAiC,CAAC,CAAA;IAEtF,MAAM,UAAU,GAAG,MAAA,IAAA,yCAAa,EAAC,cAAc,EAAE,gCAAgC,EAAE,YAAY,CAAC,mCAAI,GAAG,CAAA;IAEvG,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,cAAc,CAAC,CAAA;IAE5D,OAAO;QACL,QAAQ,EAAE,GAAG;QACb,GAAG,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,yBAAyB,CAAE;QAC9D,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC;QAC9B,WAAW,EAAE,WAAW,oCACnB,IAAA,0BAAkB,EAAC,WAAW,EAAE,QAAQ,CAAC,KAC5C,SAAS,EAAE,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,GAChD;QACD,UAAU,EAAE;YACV,MAAM,EAAE,UAAU;YAClB,iBAAiB,EAAE,IAAA,wCAA0B,EAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,CAAC;SACpF;QACD,UAAU,EAAE,UAAU;KACvB,CAAA;AACH,CAAC,CAAA;AAjCY,QAAA,oBAAoB,wBAiChC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BetygsskalaItem } from
|
|
1
|
+
import { BetygsskalaItem } from '@kth/ladok-mellanlager-client/dist/types/endpoints/betygsskala';
|
|
2
2
|
export type GradingScales = Record<string, GradingScale>;
|
|
3
3
|
export type GradingScale = {
|
|
4
4
|
kod: string;
|
package/dist/mapGradingScales.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.mapGradingScalesCodes = exports.mapGradingScales = void 0;
|
|
4
4
|
const mapGrades = (betygsgrader = []) => betygsgrader
|
|
5
|
-
.map(
|
|
5
|
+
.map(grad => ({
|
|
6
6
|
id: grad.ID,
|
|
7
7
|
benamning: { en: grad.Benamning.en, sv: grad.Benamning.sv },
|
|
8
8
|
kod: grad.Kod,
|
|
@@ -22,8 +22,8 @@ const mapGradingScales = (items) => items.reduce((gradingScales, item) => {
|
|
|
22
22
|
exports.mapGradingScales = mapGradingScales;
|
|
23
23
|
const mapGradingScalesCodes = (items) => items.reduce((gradingScalesCodes, item) => {
|
|
24
24
|
const betygsgraderKoder = mapGrades(item.Betygsgrader)
|
|
25
|
-
.map(
|
|
26
|
-
.join(
|
|
25
|
+
.map(grad => grad.kod)
|
|
26
|
+
.join(', ');
|
|
27
27
|
gradingScalesCodes[item.Kod] = betygsgraderKoder;
|
|
28
28
|
return gradingScalesCodes;
|
|
29
29
|
}, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapGradingScales.js","sourceRoot":"","sources":["../src/mapGradingScales.ts"],"names":[],"mappings":";;;AA2BA,MAAM,SAAS,GAAG,CAAC,eAAsB,EAAE,EAAE,EAAE,CAC7C,YAAY;KACT,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"mapGradingScales.js","sourceRoot":"","sources":["../src/mapGradingScales.ts"],"names":[],"mappings":";;;AA2BA,MAAM,SAAS,GAAG,CAAC,eAAsB,EAAE,EAAE,EAAE,CAC7C,YAAY;KACT,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACZ,EAAE,EAAE,IAAI,CAAC,EAAE;IACX,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE;IAC3D,GAAG,EAAE,IAAI,CAAC,GAAG;IACb,cAAc,EAAE,IAAI,CAAC,cAAc;IACnC,IAAI,EAAE,IAAI,CAAC,IAAI;CAChB,CAAC,CAAC;KACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,cAAc,CAAC,CAAA;AAEjD,MAAM,gBAAgB,GAAG,CAAC,KAAwB,EAAiB,EAAE,CAC1E,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE;IACnC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;QACxB,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE;QAC3D,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;KAC3C,CAAA;IACD,OAAO,aAAa,CAAA;AACtB,CAAC,EAAE,EAAmB,CAAC,CAAA;AATZ,QAAA,gBAAgB,oBASJ;AAElB,MAAM,qBAAqB,GAAG,CAAC,KAAwB,EAAsB,EAAE,CACpF,KAAK,CAAC,MAAM,CAAC,CAAC,kBAAkB,EAAE,IAAI,EAAE,EAAE;IACxC,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;SACnD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;SACrB,IAAI,CAAC,IAAI,CAAC,CAAA;IACb,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAA;IAChD,OAAO,kBAAkB,CAAA;AAC3B,CAAC,EAAE,EAAwB,CAAC,CAAA;AAPjB,QAAA,qBAAqB,yBAOJ"}
|
package/dist/mapProgramTerm.js
CHANGED
|
@@ -8,7 +8,7 @@ const mapProgramTerm = (item, language) => {
|
|
|
8
8
|
status: (0, ladok_attributvarde_utils_1.extractLadokStatus)(item.Attributvarden),
|
|
9
9
|
kod: item.index['utbildning.attribut.kod'],
|
|
10
10
|
lokalmarkning: lokalmarkning,
|
|
11
|
-
startPeriod: item.index['utbildning.attribut.startperiod.kod']
|
|
11
|
+
startPeriod: item.index['utbildning.attribut.startperiod.kod'],
|
|
12
12
|
};
|
|
13
13
|
};
|
|
14
14
|
exports.mapProgramTerm = mapProgramTerm;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapProgramTerm.js","sourceRoot":"","sources":["../src/mapProgramTerm.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"mapProgramTerm.js","sourceRoot":"","sources":["../src/mapProgramTerm.ts"],"names":[],"mappings":";;;AAAA,8EAAqH;AAW9G,MAAM,cAAc,GAAG,CAC5B,IAAmE,EACnE,QAAkB,EACL,EAAE;IACf,MAAM,aAAa,GAAG,IAAA,gDAAoB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAE/D,OAAO;QACL,MAAM,EAAE,IAAA,8CAAkB,EAAC,IAAI,CAAC,cAAc,CAAC;QAC/C,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC;QAC1C,aAAa,EAAE,aAAa;QAC5B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,qCAAqC,CAAC;KAC/D,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,cAAc,kBAY1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapProgramTillfalle.js","sourceRoot":"","sources":["../src/mapProgramTillfalle.ts"],"names":[],"mappings":";;;AAAA,8EAUuC;AAEvC,mCAQgB;AAChB,qDAAgF;AAuBzE,MAAM,mBAAmB,GAAG,
|
|
1
|
+
{"version":3,"file":"mapProgramTillfalle.js","sourceRoot":"","sources":["../src/mapProgramTillfalle.ts"],"names":[],"mappings":";;;AAAA,8EAUuC;AAEvC,mCAQgB;AAChB,qDAAgF;AAuBzE,MAAM,mBAAmB,GAAG,CACjC,IAAmE,EACnE,QAAkB,EACA,EAAE;;IACpB,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAA;IAE3C,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,sCAAsC,CAAC;QACtD,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,uCAAuC,CAAC;KACxD,CAAA;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;IAC/D,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAC7D,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IACjE,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IACzE,MAAM,aAAa,GAAG,IAAA,gDAAoB,EAAC,IAAI,CAAC,cAAc,CAAC,CAAA;IAE/D,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,aAAa;QACvB,MAAM,EAAE,IAAA,8CAAkB,EAAC,IAAI,CAAC,cAAc,CAAC;QAC/C,QAAQ,EAAE,MAAA,IAAA,0CAAc,EAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,mCAAI,KAAK;QAElE,wBAAwB,EAAE,IAAA,yCAAa,EAAC,eAAe,EAAE,8CAA8C,CAAC;QACxG,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC;QAE9B,UAAU,EAAE;YACV,MAAM,EAAE,UAAU;YAClB,iBAAiB,EAAE,IAAA,wCAA0B,EAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,CAAC;SACpF;QACD,cAAc,EAAE,cAAc,IAAI,IAAA,4BAAc,EAAC,cAAc,EAAE,QAAQ,CAAC;QAC1E,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QACtD,YAAY,EAAE,YAAY,IAAI,IAAA,6BAAqB,EAAC,YAAY,EAAE,QAAQ,CAAC;QAE3E,cAAc,EAAE,cAAc,IAAI,IAAA,+BAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;QAEnF,cAAc,EAAE,cAAc,IAAI,IAAA,gCAAwB,EAAC,cAAc,EAAE,QAAQ,CAAC;QACpF,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC;QAC1C,aAAa,EAAE,aAAa;KAC7B,CAAA;AACH,CAAC,CAAA;AAvCY,QAAA,mBAAmB,uBAuC/B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { SokUtbildningsTillfalleItem, SokUtbildningsTillfalleSlimItem } from
|
|
2
|
-
import { Language, TranslatedGrunddata, TranslatedOrganisation, TranslatedUtbildningstyp } from
|
|
1
|
+
import { SokUtbildningsTillfalleItem, SokUtbildningsTillfalleSlimItem } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
import { Language, TranslatedGrunddata, TranslatedOrganisation, TranslatedUtbildningstyp } from './utils/languageUtil';
|
|
3
3
|
export type SearchResultPeriod = {
|
|
4
4
|
startperiod: string;
|
|
5
5
|
forstaUndervisningsdatum?: {
|
package/dist/mapSearchResult.js
CHANGED
|
@@ -9,24 +9,24 @@ const schoolUtil_1 = require("./utils/schoolUtil");
|
|
|
9
9
|
const mapCourseResult = (courseRound, language) => {
|
|
10
10
|
var _a, _b, _c, _d, _e, _f, _g;
|
|
11
11
|
const benamning = {
|
|
12
|
-
sv: courseRound.index[
|
|
13
|
-
en: courseRound.index[
|
|
12
|
+
sv: courseRound.index['utbildning.attribut.svensk.benamning'],
|
|
13
|
+
en: courseRound.index['utbildning.attribut.engelsk.benamning'],
|
|
14
14
|
};
|
|
15
15
|
const organisation = (0, ladok_attributvarde_utils_1.extractOrganisation)(courseRound.Attributvarden);
|
|
16
16
|
const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(((_a = courseRound.instans) === null || _a === void 0 ? void 0 : _a.Attributvarden) || courseRound.Attributvarden);
|
|
17
|
-
const studieort = (0, ladok_attributvarde_utils_1.extractGrunddata)(courseRound.Attributvarden,
|
|
18
|
-
const undervisningssprak = (0, ladok_attributvarde_utils_1.extractGrunddata)(courseRound.Attributvarden,
|
|
17
|
+
const studieort = (0, ladok_attributvarde_utils_1.extractGrunddata)(courseRound.Attributvarden, 'utbildning.attribut.studieort');
|
|
18
|
+
const undervisningssprak = (0, ladok_attributvarde_utils_1.extractGrunddata)(courseRound.Attributvarden, 'utbildning.attribut.undervisningssprak');
|
|
19
19
|
const malgrupp = {
|
|
20
|
-
sv: (0, ladok_attributvarde_utils_1.extractString)(courseRound.Attributvarden,
|
|
21
|
-
en: (0, ladok_attributvarde_utils_1.extractString)(courseRound.Attributvarden,
|
|
20
|
+
sv: (0, ladok_attributvarde_utils_1.extractString)(courseRound.Attributvarden, 'utbildning.lokalt.attribut.29.malgrupp.sv', 'html'),
|
|
21
|
+
en: (0, ladok_attributvarde_utils_1.extractString)(courseRound.Attributvarden, 'utbildning.lokalt.attribut.29.malgrupp.en', 'html'),
|
|
22
22
|
};
|
|
23
23
|
const startperiod = (0, ladok_attributvarde_utils_1.extractStartPeriod)(courseRound.Attributvarden);
|
|
24
24
|
const studietakt = (0, ladok_attributvarde_utils_1.extractStudietakt)(courseRound.Attributvarden);
|
|
25
25
|
const schoolCode = (0, schoolUtil_1.extractSchoolCodeFromOrganisation)(organisation, language);
|
|
26
|
-
const omfattning = courseRound.index[
|
|
26
|
+
const omfattning = courseRound.index['utbildning.attribut.omfattning'];
|
|
27
27
|
return {
|
|
28
28
|
versionsnummer: courseRound.index.versionsnummer,
|
|
29
|
-
kod: courseRound.index[
|
|
29
|
+
kod: courseRound.index['utbildning.attribut.kod'],
|
|
30
30
|
benamning: benamning[language],
|
|
31
31
|
omfattning: {
|
|
32
32
|
number: omfattning,
|
|
@@ -43,17 +43,17 @@ const mapCourseResult = (courseRound, language) => {
|
|
|
43
43
|
inDigits: (0, utils_1.transformPeriodInDigits)(startperiod.code),
|
|
44
44
|
},
|
|
45
45
|
period: {
|
|
46
|
-
startperiod: (startperiod === null || startperiod === void 0 ? void 0 : startperiod.code) ||
|
|
46
|
+
startperiod: (startperiod === null || startperiod === void 0 ? void 0 : startperiod.code) || '',
|
|
47
47
|
forstaUndervisningsdatum: Object.assign({ date: (_b = courseRound.Tillfallesperioder.at(0)) === null || _b === void 0 ? void 0 : _b.ForstaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_c = courseRound.Tillfallesperioder.at(0)) === null || _c === void 0 ? void 0 : _c.ForstaUndervisningsdatum), {
|
|
48
48
|
code: startperiod === null || startperiod === void 0 ? void 0 : startperiod.code,
|
|
49
49
|
startDate: startperiod && new Date(startperiod.startDay),
|
|
50
50
|
endDate: startperiod && new Date(startperiod.lastDay),
|
|
51
|
-
},
|
|
51
|
+
}, 'start') }, (0, utils_1.getYearAndWeek)((_d = courseRound.Tillfallesperioder.at(0)) === null || _d === void 0 ? void 0 : _d.ForstaUndervisningsdatum)),
|
|
52
52
|
sistaUndervisningsdatum: Object.assign({ date: (_e = courseRound.Tillfallesperioder.at(-1)) === null || _e === void 0 ? void 0 : _e.SistaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_f = courseRound.Tillfallesperioder.at(-1)) === null || _f === void 0 ? void 0 : _f.SistaUndervisningsdatum), {
|
|
53
53
|
code: startperiod === null || startperiod === void 0 ? void 0 : startperiod.code,
|
|
54
54
|
startDate: startperiod && new Date(startperiod.startDay),
|
|
55
55
|
endDate: startperiod && new Date(startperiod.lastDay),
|
|
56
|
-
},
|
|
56
|
+
}, 'end') }, (0, utils_1.getYearAndWeek)((_g = courseRound.Tillfallesperioder.at(-1)) === null || _g === void 0 ? void 0 : _g.SistaUndervisningsdatum)),
|
|
57
57
|
tillfallesperioderNummer: courseRound.Tillfallesperioder.length,
|
|
58
58
|
},
|
|
59
59
|
schoolCode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapSearchResult.js","sourceRoot":"","sources":["../src/mapSearchResult.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"mapSearchResult.js","sourceRoot":"","sources":["../src/mapSearchResult.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Utbildningstillfalle, UtbildningstillfalleSlim } from
|
|
2
|
-
import { Language, TranslatedGrunddata, TranslatedUtbildningstyp } from
|
|
3
|
-
import { LadokStatus } from
|
|
1
|
+
import { Utbildningstillfalle, UtbildningstillfalleSlim } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
import { Language, TranslatedGrunddata, TranslatedUtbildningstyp } from './utils';
|
|
3
|
+
import { LadokStatus } from '@kth/ladok-attributvarde-utils';
|
|
4
4
|
export type StructurePartInstance = {
|
|
5
5
|
utbildningsinstansUid: string;
|
|
6
6
|
uid: string;
|
|
@@ -6,11 +6,11 @@ const utils_1 = require("./utils");
|
|
|
6
6
|
const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
|
|
7
7
|
const mapStructurePartInstances = (entity, language) => {
|
|
8
8
|
const { Attributvarden, Uid } = entity;
|
|
9
|
-
const utbildningsinstansUid = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden,
|
|
10
|
-
const tillfalleskod = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden,
|
|
9
|
+
const utbildningsinstansUid = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildningsinstans.uid');
|
|
10
|
+
const tillfalleskod = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.utbildningstillfalleskod');
|
|
11
11
|
const omfattningNumber = entity.Tillfallesperioder.reduce((sum, period) => sum + period.Omfattningsvarde, 0);
|
|
12
12
|
const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(Attributvarden);
|
|
13
|
-
const startperiod = (0, ladok_attributvarde_utils_1.extractGrunddata)(Attributvarden,
|
|
13
|
+
const startperiod = (0, ladok_attributvarde_utils_1.extractGrunddata)(Attributvarden, 'utbildning.attribut.startperiod');
|
|
14
14
|
return {
|
|
15
15
|
utbildningsinstansUid: utbildningsinstansUid,
|
|
16
16
|
uid: Uid,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapStructureCourses.js","sourceRoot":"","sources":["../src/mapStructureCourses.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"mapStructureCourses.js","sourceRoot":"","sources":["../src/mapStructureCourses.ts"],"names":[],"mappings":";;;AACA,qDAAgE;AAChE,mCAMgB;AAChB,8EAMuC;AA0BhC,MAAM,yBAAyB,GAAG,CACvC,MAAuD,EACvD,QAAkB,EACK,EAAE;IACzB,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,MAAM,CAAA;IAEtC,MAAM,qBAAqB,GAAG,IAAA,yCAAa,EAAC,cAAc,EAAE,wBAAwB,CAAC,CAAA;IAErF,MAAM,aAAa,GAAG,IAAA,yCAAa,EAAC,cAAc,EAAE,8CAA8C,CAAC,CAAA;IAEnG,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAA;IAE5G,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,cAAc,CAAC,CAAA;IAE5D,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAAC,cAAc,EAAE,iCAAiC,CAAC,CAAA;IAEvF,OAAO;QACL,qBAAqB,EAAE,qBAAsB;QAC7C,GAAG,EAAE,GAAG;QACR,aAAa,EAAE,aAAc;QAC7B,MAAM,EAAE,IAAA,8CAAkB,EAAC,cAAc,CAAC;QAC1C,cAAc,EAAE,cAAc,IAAI,IAAA,+BAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;QACnF,UAAU,EAAE;YACV,MAAM,EAAE,gBAAgB;YACxB,iBAAiB,EAAE,IAAA,wCAA0B,EAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,QAAQ,CAAC;SACrG;QACD,WAAW,EAAE,WAAW,IAAI,IAAA,0BAAkB,EAAC,WAAW,EAAE,QAAQ,CAAC;QACrE,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;KAC9C,CAAA;AACH,CAAC,CAAA;AA7BY,QAAA,yBAAyB,6BA6BrC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { MellanlagringResponse, ResponseInfo } from
|
|
2
|
-
import { GroupedCourseSearchResult } from
|
|
3
|
-
import { Course } from
|
|
4
|
-
import { CourseRound } from
|
|
5
|
-
import { Language } from
|
|
6
|
-
import { Utbildningsplan } from
|
|
7
|
-
import { KursPlan } from
|
|
8
|
-
import { Period } from
|
|
9
|
-
import { ProgramInstans } from
|
|
10
|
-
import { ProgramTillfalle } from
|
|
1
|
+
import { MellanlagringResponse, ResponseInfo } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
import { GroupedCourseSearchResult } from '../groupSearchResults';
|
|
3
|
+
import { Course } from '../mapCourse';
|
|
4
|
+
import { CourseRound } from '../mapCourseRound';
|
|
5
|
+
import { Language } from '../utils';
|
|
6
|
+
import { Utbildningsplan } from '../mapUtbildningsplan';
|
|
7
|
+
import { KursPlan } from '../mapCourseSyllabus';
|
|
8
|
+
import { Period } from '@kth/ladok-mellanlager-client/dist/types/endpoints/period';
|
|
9
|
+
import { ProgramInstans } from '../mapProgramInstans';
|
|
10
|
+
import { ProgramTillfalle } from '../mapProgramTillfalle';
|
|
11
11
|
export type OmKursenLadokApiClient = {
|
|
12
12
|
getLatestCourseVersion: (courseCode: string, language: Language) => Promise<(Course & ResponseInfo) | ResponseInfo>;
|
|
13
13
|
searchCourses: (searchParams: {
|
|
@@ -22,6 +22,7 @@ export type OmKursenLadokApiClient = {
|
|
|
22
22
|
errorCode?: string;
|
|
23
23
|
} | string>;
|
|
24
24
|
getActiveCourseRounds: (courseCode: string, language: Language) => Promise<CourseRound[] | undefined>;
|
|
25
|
+
getActiveAndFutureCourseRounds: (courseCode: string, language: Language) => Promise<CourseRound[] | undefined>;
|
|
25
26
|
getCourseRoundsFromPeriod: (courseCode: string, fromPeriod: string, language: Language) => Promise<CourseRound[] | undefined>;
|
|
26
27
|
getCourseRoundsForExactStartPeriod: (courseCode: string, startPeriod: string, language: Language) => Promise<CourseRound[] | undefined>;
|
|
27
28
|
getUtbildningsPlan: (uid: string, language: Language) => Promise<Utbildningsplan | undefined>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SokPlanItem, SokPlanSlimItem } from
|
|
2
|
-
import { PeriodItem } from
|
|
1
|
+
import { SokPlanItem, SokPlanSlimItem } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
import { PeriodItem } from '@kth/ladok-mellanlager-client/dist/types/endpoints/period';
|
|
3
3
|
export declare const getSemester: (dateStr: string) => string;
|
|
4
4
|
export declare function getSyllabusForSemester(semester: string, syllabuses: SokPlanItem[] | SokPlanSlimItem[], periods: PeriodItem[]): SokPlanItem | null;
|
|
@@ -4,7 +4,7 @@ exports.getSemester = void 0;
|
|
|
4
4
|
exports.getSyllabusForSemester = getSyllabusForSemester;
|
|
5
5
|
const periodUtil_1 = require("./periodUtil");
|
|
6
6
|
const getSemester = (dateStr) => {
|
|
7
|
-
const [yearStr, monthStr] = dateStr.split(
|
|
7
|
+
const [yearStr, monthStr] = dateStr.split('-');
|
|
8
8
|
const year = parseInt(yearStr, 10);
|
|
9
9
|
const month = parseInt(monthStr, 10);
|
|
10
10
|
if (month >= 1 && month <= 7) {
|
|
@@ -13,7 +13,7 @@ const getSemester = (dateStr) => {
|
|
|
13
13
|
else if (month >= 8 && month <= 12) {
|
|
14
14
|
return `HT${year}`;
|
|
15
15
|
}
|
|
16
|
-
throw new Error(
|
|
16
|
+
throw new Error('Invalid date format or value');
|
|
17
17
|
};
|
|
18
18
|
exports.getSemester = getSemester;
|
|
19
19
|
function sortSyllabuses(syllabuses) {
|
|
@@ -31,8 +31,8 @@ function sortSyllabuses(syllabuses) {
|
|
|
31
31
|
return versionB - versionA;
|
|
32
32
|
}
|
|
33
33
|
// Step 3: If same course version date, sort by latest syllabus version (descending)
|
|
34
|
-
const syllabusEditionA = a.AktuellaAttributvarden.find((Attributvarde) => Attributvarde.Attributdefinition.Kod ===
|
|
35
|
-
const syllabusEditionB = b.AktuellaAttributvarden.find((Attributvarde) => Attributvarde.Attributdefinition.Kod ===
|
|
34
|
+
const syllabusEditionA = a.AktuellaAttributvarden.find((Attributvarde) => Attributvarde.Attributdefinition.Kod === 'utbildning.lokalt.attribut.29.utgava').Varden[0];
|
|
35
|
+
const syllabusEditionB = b.AktuellaAttributvarden.find((Attributvarde) => Attributvarde.Attributdefinition.Kod === 'utbildning.lokalt.attribut.29.utgava').Varden[0];
|
|
36
36
|
if (parseInt(syllabusEditionA) !== parseInt(syllabusEditionB)) {
|
|
37
37
|
return parseInt(syllabusEditionB) - parseInt(syllabusEditionA);
|
|
38
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"courseSyllabusUtil.js","sourceRoot":"","sources":["../../src/utils/courseSyllabusUtil.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"courseSyllabusUtil.js","sourceRoot":"","sources":["../../src/utils/courseSyllabusUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Utbildningstyp } from
|
|
2
|
-
import { Language } from
|
|
1
|
+
import { Utbildningstyp } from '@kth/ladok-attributvarde-utils';
|
|
2
|
+
import { Language } from './languageUtil';
|
|
3
3
|
export declare const getCreditsUnit: (utbildningstyp: Utbildningstyp, language: Language) => string;
|
|
4
4
|
export declare const formatCreditsWithUnitLabel: (omfattning: string, utbildningstyp: Utbildningstyp | undefined, language: Language) => string;
|
|
@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.formatCreditsWithUnitLabel = exports.getCreditsUnit = void 0;
|
|
4
4
|
const getCreditsUnit = (utbildningstyp, language) => {
|
|
5
5
|
switch (utbildningstyp.creditsUnit.code) {
|
|
6
|
-
case
|
|
7
|
-
return language ===
|
|
8
|
-
case
|
|
9
|
-
return
|
|
6
|
+
case 'HP':
|
|
7
|
+
return language === 'sv' ? 'hp' : 'credits';
|
|
8
|
+
case 'FUP':
|
|
9
|
+
return 'fup';
|
|
10
10
|
default:
|
|
11
11
|
return utbildningstyp.creditsUnit.code.toLocaleLowerCase();
|
|
12
12
|
}
|
|
13
13
|
};
|
|
14
14
|
exports.getCreditsUnit = getCreditsUnit;
|
|
15
|
-
const formatCredits = (omfattning, language) => language ===
|
|
15
|
+
const formatCredits = (omfattning, language) => language === 'sv' ? omfattning.replace('.', ',') : omfattning;
|
|
16
16
|
const formatCreditsWithUnitLabel = (omfattning, utbildningstyp, language) => {
|
|
17
17
|
const credits = formatCredits(omfattning, language);
|
|
18
|
-
const unit = utbildningstyp ? (0, exports.getCreditsUnit)(utbildningstyp, language) :
|
|
18
|
+
const unit = utbildningstyp ? (0, exports.getCreditsUnit)(utbildningstyp, language) : '';
|
|
19
19
|
return `${credits} ${unit}`;
|
|
20
20
|
};
|
|
21
21
|
exports.formatCreditsWithUnitLabel = formatCreditsWithUnitLabel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"creditsUtil.js","sourceRoot":"","sources":["../../src/utils/creditsUtil.ts"],"names":[],"mappings":";;;AAGO,MAAM,cAAc,GAAG,CAAC,cAA8B,EAAE,QAAkB,EAAE,EAAE;IACnF,QAAQ,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACxC,KAAK,IAAI;YACP,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"creditsUtil.js","sourceRoot":"","sources":["../../src/utils/creditsUtil.ts"],"names":[],"mappings":";;;AAGO,MAAM,cAAc,GAAG,CAAC,cAA8B,EAAE,QAAkB,EAAE,EAAE;IACnF,QAAQ,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QACxC,KAAK,IAAI;YACP,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;QAC7C,KAAK,KAAK;YACR,OAAO,KAAK,CAAA;QACd;YACE,OAAO,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAA;IAC9D,CAAC;AACH,CAAC,CAAA;AATY,QAAA,cAAc,kBAS1B;AAED,MAAM,aAAa,GAAG,CAAC,UAAkB,EAAE,QAAkB,EAAE,EAAE,CAC/D,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;AAExD,MAAM,0BAA0B,GAAG,CACxC,UAAkB,EAClB,cAA0C,EAC1C,QAAkB,EAClB,EAAE;IACF,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACnD,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC3E,OAAO,GAAG,OAAO,IAAI,IAAI,EAAE,CAAA;AAC7B,CAAC,CAAA;AARY,QAAA,0BAA0B,8BAQtC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { LadokMellanlagerApiClient } from
|
|
2
|
-
import { ExaminationModule } from
|
|
3
|
-
import { Language } from
|
|
1
|
+
import { LadokMellanlagerApiClient } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
import { ExaminationModule } from '../mapExaminationModule';
|
|
3
|
+
import { Language } from './languageUtil';
|
|
4
4
|
export declare const handleError: (message: string, error?: any) => {
|
|
5
5
|
error: string;
|
|
6
6
|
details: any;
|