@kth/om-kursen-ladok-client 2.0.1 → 2.0.2

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.
Files changed (41) hide show
  1. package/dist/attributVardenConstants.d.ts +5 -0
  2. package/dist/attributVardenConstants.js +73 -1
  3. package/dist/attributVardenConstants.js.map +1 -1
  4. package/dist/createApiClient.js +23 -39
  5. package/dist/createApiClient.js.map +1 -1
  6. package/dist/mapCourse.d.ts +1 -1
  7. package/dist/mapCourse.js +3 -2
  8. package/dist/mapCourse.js.map +1 -1
  9. package/dist/mapCourseSyllabus.js +5 -4
  10. package/dist/mapCourseSyllabus.js.map +1 -1
  11. package/dist/mapProgramInstans.d.ts +1 -1
  12. package/dist/mapProgramInstans.js +3 -2
  13. package/dist/mapProgramInstans.js.map +1 -1
  14. package/dist/mapProgramSyllabus.js +1 -1
  15. package/dist/mapProgramSyllabus.js.map +1 -1
  16. package/dist/mapProgramTillfalle.js +3 -3
  17. package/dist/mapProgramTillfalle.js.map +1 -1
  18. package/dist/mapSearchResult.d.ts +1 -1
  19. package/dist/mapSearchResult.js +8 -8
  20. package/dist/mapSearchResult.js.map +1 -1
  21. package/dist/mapStructurePartVersions.js +1 -1
  22. package/dist/mapStructurePartVersions.js.map +1 -1
  23. package/dist/queryConstants.d.ts +1 -0
  24. package/dist/queryConstants.js +5 -0
  25. package/dist/queryConstants.js.map +1 -0
  26. package/dist/search/utils/getLatestCompletedCourseVersions.js +1 -1
  27. package/dist/search/utils/getLatestCompletedCourseVersions.js.map +1 -1
  28. package/dist/search/utils/searchUtils.js +3 -3
  29. package/dist/search/utils/searchUtils.js.map +1 -1
  30. package/dist/utils/courseSyllabusUtil.js +3 -2
  31. package/dist/utils/courseSyllabusUtil.js.map +1 -1
  32. package/dist/utils/programStrukturUtil.js +10 -2
  33. package/dist/utils/programStrukturUtil.js.map +1 -1
  34. package/dist/utils/programUtil.js +5 -5
  35. package/dist/utils/programUtil.js.map +1 -1
  36. package/dist/utils/studyYearUtil.js +2 -0
  37. package/dist/utils/studyYearUtil.js.map +1 -1
  38. package/dist/utils/versionUtils.d.ts +1 -1
  39. package/dist/utils/versionUtils.js +4 -4
  40. package/dist/utils/versionUtils.js.map +1 -1
  41. package/package.json +3 -3
@@ -2,3 +2,8 @@ export declare const ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS: string;
2
2
  export declare const ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS: string;
3
3
  export declare const ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH: string;
4
4
  export declare const INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH: string;
5
+ export declare const INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAM_VERSION: string;
6
+ export declare const ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS: string;
7
+ export declare const INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS: string;
8
+ export declare const ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE: string;
9
+ export declare const INSTANS_ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE: string;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH = exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH = exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS = exports.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS = void 0;
3
+ exports.INSTANS_ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE = exports.ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE = exports.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS = exports.ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS = exports.INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAM_VERSION = exports.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH = exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH = exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS = exports.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS = void 0;
4
4
  exports.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS = [
5
5
  'utbildning.attribut.betygsskala',
6
6
  'utbildning.attribut.huvudomrade.och.successiv.fordjupning',
@@ -21,6 +21,8 @@ exports.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS = [
21
21
  'utbildning.attribut.svensk.benamning',
22
22
  'utbildning.attribut.engelsk.benamning',
23
23
  'utbildning.attribut.lokalmarkning',
24
+ 'versionsnummer',
25
+ 'utbildning.attribut.omfattning',
24
26
  ].join(',');
25
27
  exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS = [
26
28
  'utbildning.lokalt.attribut.29.malgrupp.sv',
@@ -54,5 +56,75 @@ exports.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH = [
54
56
  'utbildning.attribut.engelsk.benamning',
55
57
  'utbildning.attribut.kod',
56
58
  'utbildning.attribut.lokalmarkning',
59
+ 'versionsnummer',
60
+ 'utbildning.attribut.omfattning',
61
+ ].join(',');
62
+ exports.INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAM_VERSION = [
63
+ 'utbildning.attribut.organisation',
64
+ 'utbildningstyp',
65
+ 'utbildning.attribut.giltig.from',
66
+ 'utbildning.attribut.tilltradesniva',
67
+ 'utbildning.lokalt.attribut.29.sista.antagningstermin.en',
68
+ 'utbildning.attribut.svensk.benamning',
69
+ 'utbildning.attribut.engelsk.benamning',
70
+ 'utbildning.attribut.kod',
71
+ 'versionsnummer',
72
+ 'utbildning.attribut.omfattning',
73
+ ].join(',');
74
+ exports.ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS = [
75
+ 'utbildning.lokalt.attribut.29.utgava',
76
+ 'utbildning.lokalt.attribut.29.overgangsbestammelser.en',
77
+ 'utbildning.lokalt.attribut.29.overgangsbestammelser.sv',
78
+ 'utbildning.lokalt.attribut.29.undervisningssprak.en',
79
+ 'utbildning.lokalt.attribut.29.undervisningssprak.sv',
80
+ 'utbildning.lokalt.attribut.29.larandemal.sv',
81
+ 'utbildning.lokalt.attribut.29.larandemal.en',
82
+ 'utbildning.lokalt.attribut.29.kursinnehall.sv',
83
+ 'utbildning.lokalt.attribut.29.kursinnehall.en',
84
+ 'utbildning.lokalt.attribut.29.etiskt.forhallningssatt.en',
85
+ 'utbildning.lokalt.attribut.29.etiskt.forhallningssatt.sv',
86
+ 'utbildning.lokalt.attribut.29.fastallande1.en',
87
+ 'utbildning.lokalt.attribut.29.fastallande1.sv',
88
+ 'utbildning.lokalt.attribut.29.kommentar.till.examination.en',
89
+ 'utbildning.lokalt.attribut.29.kommentar.till.examination.sv',
90
+ 'utbildning.lokalt.attribut.29.ovriga.krav.for.slutbeyg.sv',
91
+ 'utbildning.lokalt.attribut.29.ovriga.krav.for.slutbeyg.en',
92
+ 'utbildning.lokalt.attribut.29.gammal.kurslitteratur.sv',
93
+ 'utbildning.lokalt.attribut.29.gammal.kurslitteratur.en',
94
+ 'utbildning.lokalt.attribut.29.gammal.kursupplagg.en',
95
+ 'utbildning.lokalt.attribut.29.gammal.kursupplagg.sv',
96
+ 'utbildning.lokalt.attribut.29.sarskild.behorighet.en',
97
+ 'utbildning.lokalt.attribut.29.sarskild.behorighet.sv',
98
+ 'utbildning.lokalt.attribut.29.gammal.utrustning.en',
99
+ 'utbildning.lokalt.attribut.29.gammal.utrustning.sv',
100
+ 'utbildning.lokalt.attribut.29.avvecklingsbeslut.en',
101
+ 'utbildning.lokalt.attribut.29.avvecklingsbeslut.sv',
102
+ 'utbildning.lokalt.attribut.29.ovriga.foreskrifter.en',
103
+ 'utbildning.lokalt.attribut.29.ovriga.foreskrifter.sv',
104
+ ].join(',');
105
+ exports.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS = [
106
+ 'utbildningstyp',
107
+ 'utbildning.attribut.huvudomrade.och.successiv.fordjupning',
108
+ 'utbildning.attribut.kod',
109
+ 'utbildning.attribut.svensk.benamning',
110
+ 'utbildning.attribut.engelsk.benamning',
111
+ 'utbildning.attribut.betygsskala',
112
+ 'versionsnummer',
113
+ 'utbildning.attribut.omfattning',
114
+ ].join(',');
115
+ exports.ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE = [
116
+ 'utbildning.attribut.organisation',
117
+ 'utbildningstyp',
118
+ 'utbildning.attribut.lokalmarkning',
119
+ 'status',
120
+ 'installt',
121
+ 'utbildning.attribut.utbildningstillfalleskod',
122
+ ].join(',');
123
+ exports.INSTANS_ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE = [
124
+ 'utbildning.attribut.tilltradesniva',
125
+ 'utbildning.attribut.svensk.benamning',
126
+ 'utbildning.attribut.engelsk.benamning',
127
+ 'utbildning.attribut.kod',
128
+ 'utbildning.attribut.omfattning',
57
129
  ].join(',');
58
130
  //# sourceMappingURL=attributVardenConstants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"attributVardenConstants.js","sourceRoot":"","sources":["../src/attributVardenConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,mCAAmC,GAAG;IACjD,iCAAiC;IACjC,2DAA2D;IAC3D,kCAAkC;IAClC,gBAAgB;IAChB,QAAQ;IACR,WAAW;IACX,6CAA6C;IAC7C,6CAA6C;IAC7C,oDAAoD;IACpD,oDAAoD;IACpD,gDAAgD;IAChD,qDAAqD;IACrD,qDAAqD;IACrD,4DAA4D;IAC5D,4DAA4D;IAC5D,yBAAyB;IACzB,sCAAsC;IACtC,uCAAuC;IACvC,mCAAmC;CACpC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,iCAAiC,GAAG;IAC/C,2CAA2C;IAC3C,2CAA2C;IAC3C,2CAA2C;IAC3C,2CAA2C;IAC3C,kDAAkD;IAClD,kDAAkD;IAClD,uCAAuC;IACvC,sCAAsC;IACtC,wCAAwC;IACxC,+BAA+B;IAC/B,uCAAuC;IACvC,gCAAgC;IAChC,QAAQ;IACR,UAAU;IACV,8CAA8C;IAC9C,+CAA+C;IAC/C,wCAAwC;IACxC,wCAAwC;IACxC,iCAAiC;CAClC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,wCAAwC,GAAG;IACtD,GAAG,yCAAiC,CAAC,KAAK,CAAC,GAAG,CAAC;IAC/C,kCAAkC;IAClC,iCAAiC;CAClC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,gDAAgD,GAAG;IAC9D,gBAAgB;IAChB,sCAAsC;IACtC,uCAAuC;IACvC,yBAAyB;IACzB,mCAAmC;CACpC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA"}
1
+ {"version":3,"file":"attributVardenConstants.js","sourceRoot":"","sources":["../src/attributVardenConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,mCAAmC,GAAG;IACjD,iCAAiC;IACjC,2DAA2D;IAC3D,kCAAkC;IAClC,gBAAgB;IAChB,QAAQ;IACR,WAAW;IACX,6CAA6C;IAC7C,6CAA6C;IAC7C,oDAAoD;IACpD,oDAAoD;IACpD,gDAAgD;IAChD,qDAAqD;IACrD,qDAAqD;IACrD,4DAA4D;IAC5D,4DAA4D;IAC5D,yBAAyB;IACzB,sCAAsC;IACtC,uCAAuC;IACvC,mCAAmC;IACnC,gBAAgB;IAChB,gCAAgC;CACjC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,iCAAiC,GAAG;IAC/C,2CAA2C;IAC3C,2CAA2C;IAC3C,2CAA2C;IAC3C,2CAA2C;IAC3C,kDAAkD;IAClD,kDAAkD;IAClD,uCAAuC;IACvC,sCAAsC;IACtC,wCAAwC;IACxC,+BAA+B;IAC/B,uCAAuC;IACvC,gCAAgC;IAChC,QAAQ;IACR,UAAU;IACV,8CAA8C;IAC9C,+CAA+C;IAC/C,wCAAwC;IACxC,wCAAwC;IACxC,iCAAiC;CAClC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,wCAAwC,GAAG;IACtD,GAAG,yCAAiC,CAAC,KAAK,CAAC,GAAG,CAAC;IAC/C,kCAAkC;IAClC,iCAAiC;CAClC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,gDAAgD,GAAG;IAC9D,gBAAgB;IAChB,sCAAsC;IACtC,uCAAuC;IACvC,yBAAyB;IACzB,mCAAmC;IACnC,gBAAgB;IAChB,gCAAgC;CACjC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,2CAA2C,GAAG;IACzD,kCAAkC;IAClC,gBAAgB;IAChB,iCAAiC;IACjC,oCAAoC;IACpC,yDAAyD;IACzD,sCAAsC;IACtC,uCAAuC;IACvC,yBAAyB;IACzB,gBAAgB;IAChB,gCAAgC;CACjC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,mCAAmC,GAAG;IACjD,sCAAsC;IACtC,wDAAwD;IACxD,wDAAwD;IACxD,qDAAqD;IACrD,qDAAqD;IACrD,6CAA6C;IAC7C,6CAA6C;IAC7C,+CAA+C;IAC/C,+CAA+C;IAC/C,0DAA0D;IAC1D,0DAA0D;IAC1D,+CAA+C;IAC/C,+CAA+C;IAC/C,6DAA6D;IAC7D,6DAA6D;IAC7D,2DAA2D;IAC3D,2DAA2D;IAC3D,wDAAwD;IACxD,wDAAwD;IACxD,qDAAqD;IACrD,qDAAqD;IACrD,sDAAsD;IACtD,sDAAsD;IACtD,oDAAoD;IACpD,oDAAoD;IACpD,oDAAoD;IACpD,oDAAoD;IACpD,sDAAsD;IACtD,sDAAsD;CACvD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,2CAA2C,GAAG;IACzD,gBAAgB;IAChB,2DAA2D;IAC3D,yBAAyB;IACzB,sCAAsC;IACtC,uCAAuC;IACvC,iCAAiC;IACjC,gBAAgB;IAChB,gCAAgC;CACjC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,2CAA2C,GAAG;IACzD,kCAAkC;IAClC,gBAAgB;IAChB,mCAAmC;IACnC,QAAQ;IACR,UAAU;IACV,8CAA8C;CAC/C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEE,QAAA,mDAAmD,GAAG;IACjE,oCAAoC;IACpC,sCAAsC;IACtC,uCAAuC;IACvC,yBAAyB;IACzB,gCAAgC;CACjC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA"}
@@ -26,6 +26,7 @@ const createSearchApi_1 = require("./search/createSearchApi");
26
26
  const attributVardenConstants_1 = require("./attributVardenConstants");
27
27
  const programUtil_1 = require("./utils/programUtil");
28
28
  const createSupportApis_1 = require("./supportApis/createSupportApis");
29
+ const queryConstants_1 = require("./queryConstants");
29
30
  const mergeApiResponses = (a, b, uniqueItemKey) => {
30
31
  var _a, _b, _c, _d, _e, _f, _g, _h;
31
32
  if (a.type === 'error')
@@ -64,6 +65,12 @@ const filterAndMapCourseRounds = (response, language, partOfProgrammes) => {
64
65
  .filter(utils_1.removeCourseRoundsBasedOnTillfalleskod)
65
66
  .filter(utils_1.removeCourseRoundsBasedOnFinansieringsform);
66
67
  };
68
+ const DEFAULT_COURSE_ROUNDS_QUERY_PARAMS = {
69
+ striktKod: 'true',
70
+ attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
71
+ instansAttributVarden: 'utbildningstyp',
72
+ antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
73
+ };
67
74
  const createApiClient = (config) => {
68
75
  const ladokClient = (0, ladok_mellanlager_client_1.createClient)(config);
69
76
  return {
@@ -80,7 +87,7 @@ const createApiClient = (config) => {
80
87
  return Object.assign(Object.assign({}, result.responseInfo), { statusCode: 404, message: 'not found' });
81
88
  }
82
89
  const course = result.items
83
- .sort((a, b) => parseInt(b.index.versionsnummer) - parseInt(a.index.versionsnummer))
90
+ .sort((a, b) => (0, ladok_attributvarde_utils_1.extractVersionNumber)(b.Attributvarden) - (0, ladok_attributvarde_utils_1.extractVersionNumber)(a.Attributvarden))
84
91
  .at(0);
85
92
  const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient);
86
93
  const mappedCourse = (0, mapCourse_1.mapCourse)(course, language, gradingScalesCodes);
@@ -104,7 +111,7 @@ const createApiClient = (config) => {
104
111
  return Object.assign(Object.assign({}, resultActiveAndCancelledVersions.responseInfo), { statusCode: 404, message: 'not found' });
105
112
  }
106
113
  const course = resultActiveAndCancelledVersions.items
107
- .sort((a, b) => parseInt(b.index.versionsnummer) - parseInt(a.index.versionsnummer))
114
+ .sort((a, b) => (0, ladok_attributvarde_utils_1.extractVersionNumber)(b.Attributvarden) - (0, ladok_attributvarde_utils_1.extractVersionNumber)(a.Attributvarden))
108
115
  .at(0);
109
116
  const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient);
110
117
  const mappedCourse = (0, mapCourse_1.mapCourse)(course, language, gradingScalesCodes);
@@ -113,23 +120,12 @@ const createApiClient = (config) => {
113
120
  Search: (0, createSearchApi_1.createSearchApi)(ladokClient),
114
121
  getActiveCourseRounds: (courseCode, language) => __awaiter(void 0, void 0, void 0, function* () {
115
122
  const currentDate = (0, utils_1.getFormattedCurrentDate)();
116
- const result = yield ladokClient.sokKursTillfalleSlim({
117
- kodEllerBenamning: courseCode,
118
- pagaendeDatum: currentDate,
119
- striktKod: 'true',
120
- attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
121
- instansAttributVarden: 'utbildningstyp,',
122
- });
123
+ const result = yield ladokClient.sokKursTillfalleSlim(Object.assign(Object.assign({}, DEFAULT_COURSE_ROUNDS_QUERY_PARAMS), { kodEllerBenamning: courseCode, pagaendeDatum: currentDate }));
123
124
  return filterAndMapCourseRounds(result, language);
124
125
  }),
125
126
  getActiveAndFutureCourseRounds: (courseCode, language) => __awaiter(void 0, void 0, void 0, function* () {
126
127
  const currentDate = (0, utils_1.getFormattedCurrentDate)();
127
- const requestObject = {
128
- kodEllerBenamning: courseCode,
129
- striktKod: 'true',
130
- attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
131
- instansAttributVarden: 'utbildningstyp,',
132
- };
128
+ const requestObject = Object.assign(Object.assign({}, DEFAULT_COURSE_ROUNDS_QUERY_PARAMS), { kodEllerBenamning: courseCode });
133
129
  const [resultPagaendeDatum, resultTerminsKodStart] = yield Promise.all([
134
130
  ladokClient.sokKursTillfalleSlim(Object.assign({ pagaendeDatum: currentDate }, requestObject)),
135
131
  ladokClient.sokKursTillfalleSlim(Object.assign({ terminkodStart: (0, courseSyllabusUtil_1.getSemester)(currentDate) }, requestObject)),
@@ -149,23 +145,11 @@ const createApiClient = (config) => {
149
145
  return filterAndMapCourseRounds(resultActiveAndFutureRounds, language, partOfProgrammes);
150
146
  }),
151
147
  getCourseRoundsFromPeriod: (courseCode, fromPeriod, language) => __awaiter(void 0, void 0, void 0, function* () {
152
- const result = yield ladokClient.sokKursTillfalleSlim({
153
- kodEllerBenamning: courseCode,
154
- terminkodStart: fromPeriod,
155
- striktKod: 'true',
156
- attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
157
- instansAttributVarden: 'utbildningstyp,',
158
- });
148
+ const result = yield ladokClient.sokKursTillfalleSlim(Object.assign(Object.assign({}, DEFAULT_COURSE_ROUNDS_QUERY_PARAMS), { kodEllerBenamning: courseCode, terminkodStart: fromPeriod }));
159
149
  return filterAndMapCourseRounds(result, language);
160
150
  }),
161
151
  getCourseRoundsForExactStartPeriod: (courseCode, startPeriod, language) => __awaiter(void 0, void 0, void 0, function* () {
162
- const result = yield ladokClient.sokKursTillfalleSlim({
163
- kodEllerBenamning: courseCode,
164
- startPeriod: startPeriod,
165
- striktKod: 'true',
166
- attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
167
- instansAttributVarden: 'utbildningstyp,',
168
- });
152
+ const result = yield ladokClient.sokKursTillfalleSlim(Object.assign(Object.assign({}, DEFAULT_COURSE_ROUNDS_QUERY_PARAMS), { kodEllerBenamning: courseCode, startPeriod: startPeriod }));
169
153
  return filterAndMapCourseRounds(result, language);
170
154
  }),
171
155
  getUtbildningsPlan: (uid, language) => __awaiter(void 0, void 0, void 0, function* () {
@@ -219,8 +203,8 @@ const createApiClient = (config) => {
219
203
  kodEllerBenamning: courseCode,
220
204
  striktKod: 'true',
221
205
  tillstand: 'BESLUTAD',
222
- attributVarden: 'utbildning.lokalt.attribut.29.utgava,utbildning.lokalt.attribut.29.overgangsbestammelser.en,utbildning.lokalt.attribut.29.overgangsbestammelser.sv,utbildning.lokalt.attribut.29.undervisningssprak.en,utbildning.lokalt.attribut.29.undervisningssprak.sv,utbildning.lokalt.attribut.29.larandemal.sv,utbildning.lokalt.attribut.29.larandemal.en,utbildning.lokalt.attribut.29.kursinnehall.sv,utbildning.lokalt.attribut.29.kursinnehall.en,utbildning.lokalt.attribut.29.etiskt.forhallningssatt.en,utbildning.lokalt.attribut.29.etiskt.forhallningssatt.sv,utbildning.lokalt.attribut.29.fastallande1.en,utbildning.lokalt.attribut.29.fastallande1.sv,utbildning.lokalt.attribut.29.kommentar.till.examination.en,utbildning.lokalt.attribut.29.kommentar.till.examination.sv,utbildning.lokalt.attribut.29.ovriga.krav.for.slutbeyg.sv,utbildning.lokalt.attribut.29.ovriga.krav.for.slutbeyg.en,utbildning.lokalt.attribut.29.gammal.kurslitteratur.sv,utbildning.lokalt.attribut.29.gammal.kurslitteratur.en,utbildning.lokalt.attribut.29.gammal.kursupplagg.en,utbildning.lokalt.attribut.29.gammal.kursupplagg.sv,utbildning.lokalt.attribut.29.sarskild.behorighet.en,utbildning.lokalt.attribut.29.sarskild.behorighet.sv,utbildning.lokalt.attribut.29.gammal.utrustning.en,utbildning.lokalt.attribut.29.gammal.utrustning.sv,utbildning.lokalt.attribut.29.avvecklingsbeslut.en,utbildning.lokalt.attribut.29.avvecklingsbeslut.sv,utbildning.lokalt.attribut.29.ovriga.foreskrifter.en,utbildning.lokalt.attribut.29.ovriga.foreskrifter.sv',
223
- instansAttributVarden: 'utbildningstyp,utbildning.attribut.huvudomrade.och.successiv.fordjupning,utbildning.attribut.kod,utbildning.attribut.svensk.benamning,utbildning.attribut.engelsk.benamning,utbildning.attribut.betygsskala',
206
+ attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS,
207
+ instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS,
224
208
  });
225
209
  if (result.type !== 'success') {
226
210
  throw new Error(`API call failed: ${result.responseInfo.apiError || 'Unknown error'}`);
@@ -230,12 +214,6 @@ const createApiClient = (config) => {
230
214
  }
231
215
  const syllabuses = result.data;
232
216
  const periods = yield ladokClient.period(); // TODO: Use cached values
233
- const UtbildningsinstansUID = syllabuses[1].instans.Uid;
234
- const examinationModules = yield (0, examinationModulesUtil_1.getExaminationModules)(UtbildningsinstansUID, language, ladokClient);
235
- if (!examinationModules) {
236
- throw new Error(`No examination modules were found for UtbildningsinstansUID ${UtbildningsinstansUID}`);
237
- }
238
- const formattedExaminationModules = (0, examinationModulesUtil_1.formatExaminationTitles)(examinationModules, language);
239
217
  if (periods.type !== 'success') {
240
218
  throw new Error(`API call failed: ${periods.responseInfo.apiError || 'Unknown error'}`);
241
219
  }
@@ -246,6 +224,12 @@ const createApiClient = (config) => {
246
224
  if (!activeSyllabus) {
247
225
  throw new Error(`No syllabus found for course ${courseCode} in semester ${semester}.`);
248
226
  }
227
+ const UtbildningsinstansUID = activeSyllabus.instans.Uid;
228
+ const examinationModules = yield (0, examinationModulesUtil_1.getExaminationModules)(UtbildningsinstansUID, language, ladokClient);
229
+ if (!examinationModules) {
230
+ throw new Error(`No examination modules were found for UtbildningsinstansUID ${UtbildningsinstansUID}`);
231
+ }
232
+ const formattedExaminationModules = (0, examinationModulesUtil_1.formatExaminationTitles)(examinationModules, language);
249
233
  const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient);
250
234
  const mappedSyllabus = (0, mapCourseSyllabus_1.mapCourseSyllabus)(activeSyllabus, gradingScalesCodes, formattedExaminationModules, language);
251
235
  return mappedSyllabus;
@@ -263,8 +247,8 @@ const createApiClient = (config) => {
263
247
  const result = yield ladokClient.sokPlanSlim({
264
248
  kodEllerBenamning: courseCode,
265
249
  striktKod: 'true',
266
- attributVarden: 'utbildning.lokalt.attribut.29.utgava,utbildning.lokalt.attribut.29.overgangsbestammelser.en,utbildning.lokalt.attribut.29.overgangsbestammelser.sv,utbildning.lokalt.attribut.29.undervisningssprak.en,utbildning.lokalt.attribut.29.undervisningssprak.sv,utbildning.lokalt.attribut.29.larandemal.sv,utbildning.lokalt.attribut.29.larandemal.en,utbildning.lokalt.attribut.29.kursinnehall.sv,utbildning.lokalt.attribut.29.kursinnehall.en,utbildning.lokalt.attribut.29.etiskt.forhallningssatt.en,utbildning.lokalt.attribut.29.etiskt.forhallningssatt.sv,utbildning.lokalt.attribut.29.fastallande1.en,utbildning.lokalt.attribut.29.fastallande1.sv,utbildning.lokalt.attribut.29.kommentar.till.examination.en,utbildning.lokalt.attribut.29.kommentar.till.examination.sv,utbildning.lokalt.attribut.29.ovriga.krav.for.slutbeyg.sv,utbildning.lokalt.attribut.29.ovriga.krav.for.slutbeyg.en,utbildning.lokalt.attribut.29.gammal.kurslitteratur.sv,utbildning.lokalt.attribut.29.gammal.kurslitteratur.en,utbildning.lokalt.attribut.29.gammal.kursupplagg.en,utbildning.lokalt.attribut.29.gammal.kursupplagg.sv,utbildning.lokalt.attribut.29.sarskild.behorighet.en,utbildning.lokalt.attribut.29.sarskild.behorighet.sv,utbildning.lokalt.attribut.29.gammal.utrustning.en,utbildning.lokalt.attribut.29.gammal.utrustning.sv,utbildning.lokalt.attribut.29.avvecklingsbeslut.en,utbildning.lokalt.attribut.29.avvecklingsbeslut.sv,utbildning.lokalt.attribut.29.ovriga.foreskrifter.en,utbildning.lokalt.attribut.29.ovriga.foreskrifter.sv',
267
- instansAttributVarden: 'utbildningstyp,utbildning.attribut.huvudomrade.och.successiv.fordjupning,utbildning.attribut.kod,utbildning.attribut.svensk.benamning,utbildning.attribut.engelsk.benamning,utbildning.attribut.betygsskala',
250
+ attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS,
251
+ instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS,
268
252
  });
269
253
  if (result.type !== 'success') {
270
254
  throw new Error(`API call failed: ${result.responseInfo.apiError || 'Unknown error'}`);
@@ -1 +1 @@
1
- {"version":3,"file":"createApiClient.js","sourceRoot":"","sources":["../src/createApiClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createApiClient.js","sourceRoot":"","sources":["../src/createApiClient.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,7 @@ export type Course = BasicCourse & {
19
19
  };
20
20
  export type BasicCourse = {
21
21
  uid?: string;
22
- versionsnummer: string;
22
+ versionsnummer: number;
23
23
  kod: string;
24
24
  benamning?: string;
25
25
  omfattning: {
package/dist/mapCourse.js CHANGED
@@ -6,12 +6,13 @@ const languageUtil_1 = require("./utils/languageUtil");
6
6
  const creditsUtil_1 = require("./utils/creditsUtil");
7
7
  const schoolUtil_1 = require("./utils/schoolUtil");
8
8
  const extractBasicData = (course, language) => {
9
+ var _a;
9
10
  const kod = (0, ladok_attributvarde_utils_1.extractString)(course.Attributvarden, 'utbildning.attribut.kod');
10
11
  const benamningMultiLingual = {
11
12
  sv: (0, ladok_attributvarde_utils_1.extractString)(course.Attributvarden, 'utbildning.attribut.svensk.benamning'),
12
13
  en: (0, ladok_attributvarde_utils_1.extractString)(course.Attributvarden, 'utbildning.attribut.engelsk.benamning'),
13
14
  };
14
- const omfattningRaw = course.index['utbildning.attribut.omfattning'];
15
+ const omfattningRaw = (_a = (0, ladok_attributvarde_utils_1.extractString)(course.Attributvarden, 'utbildning.attribut.omfattning', 'omfattning')) !== null && _a !== void 0 ? _a : '';
15
16
  const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(course.Attributvarden);
16
17
  const omfattning = {
17
18
  number: omfattningRaw,
@@ -22,7 +23,7 @@ const extractBasicData = (course, language) => {
22
23
  benamning: benamningMultiLingual[language],
23
24
  omfattning,
24
25
  uid: course.instans_uid,
25
- versionsnummer: course.index.versionsnummer,
26
+ versionsnummer: (0, ladok_attributvarde_utils_1.extractVersionNumber)(course.Attributvarden),
26
27
  };
27
28
  };
28
29
  const extractDiscontinuationData = (course, language, statusCode) => {
@@ -1 +1 @@
1
- {"version":3,"file":"mapCourse.js","sourceRoot":"","sources":["../src/mapCourse.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mapCourse.js","sourceRoot":"","sources":["../src/mapCourse.ts"],"names":[],"mappings":"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"}
@@ -20,11 +20,12 @@ const extractString = (syllabus, attributeName, language) => {
20
20
  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]);
21
21
  };
22
22
  const mapCourseSyllabus = (syllabus, gradingScalesCodes, examinationModules, language) => {
23
- var _a;
23
+ var _a, _b;
24
24
  const kod = (0, ladok_attributvarde_utils_2.extractString)(syllabus.instans.Attributvarden, 'utbildning.attribut.kod');
25
25
  const betygsskala = (0, ladok_attributvarde_utils_2.extractGrunddata)(syllabus.instans.Attributvarden, 'utbildning.attribut.betygsskala');
26
26
  if (!(betygsskala === null || betygsskala === void 0 ? void 0 : betygsskala.code))
27
27
  throw new Error(`"utbildning.attribut.betygsskala.kod" does not have any value for ${kod}`);
28
+ const omfattning = (_a = (0, ladok_attributvarde_utils_2.extractString)(syllabus.instans.Attributvarden, 'utbildning.attribut.omfattning', 'omfattning')) !== null && _a !== void 0 ? _a : '';
28
29
  return {
29
30
  course: {
30
31
  kod: kod,
@@ -33,8 +34,8 @@ const mapCourseSyllabus = (syllabus, gradingScalesCodes, examinationModules, lan
33
34
  en: (0, ladok_attributvarde_utils_2.extractString)(syllabus.instans.Attributvarden, 'utbildning.attribut.engelsk.benamning'),
34
35
  },
35
36
  omfattning: {
36
- number: syllabus.index['utbildning.attribut.omfattning'],
37
- formattedWithUnit: (0, creditsUtil_1.formatCreditsWithUnitLabel)(syllabus.index['utbildning.attribut.omfattning'], (0, ladok_attributvarde_utils_2.extractUtbildningstyp)(syllabus.instans.Attributvarden), language),
37
+ number: omfattning,
38
+ formattedWithUnit: (0, creditsUtil_1.formatCreditsWithUnitLabel)(omfattning, (0, ladok_attributvarde_utils_2.extractUtbildningstyp)(syllabus.instans.Attributvarden), language),
38
39
  },
39
40
  betygsskala: gradingScalesCodes[betygsskala === null || betygsskala === void 0 ? void 0 : betygsskala.code],
40
41
  nivainomstudieordning: (0, ladok_attributvarde_utils_2.extractUtbildningstyp)(syllabus.instans.Attributvarden),
@@ -43,7 +44,7 @@ const mapCourseSyllabus = (syllabus, gradingScalesCodes, examinationModules, lan
43
44
  },
44
45
  kursplan: {
45
46
  giltigfrom: (0, courseSyllabusUtil_1.getSemester)(syllabus.GiltigFran),
46
- 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],
47
+ utgava: (_b = syllabus.AktuellaAttributvarden.find(item => { var _a; return ((_a = item.Attributdefinition) === null || _a === void 0 ? void 0 : _a.Kod) === `utbildning.lokalt.attribut.29.utgava`; })) === null || _b === void 0 ? void 0 : _b.Varden[0],
47
48
  undervisningssprak: extractString(syllabus, 'undervisningssprak', language),
48
49
  larandemal: extractString(syllabus, 'larandemal', language),
49
50
  kursinnehall: extractString(syllabus, 'kursinnehall', language),
@@ -1 +1 @@
1
- {"version":3,"file":"mapCourseSyllabus.js","sourceRoot":"","sources":["../src/mapCourseSyllabus.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mapCourseSyllabus.js","sourceRoot":"","sources":["../src/mapCourseSyllabus.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,7 @@ export type ProgramInstans = {
19
19
  lokalmarkning?: Lokalmarkning[];
20
20
  giltigFrom?: GiltigFromType;
21
21
  utbildningstillfalleskod?: string;
22
- versionsnummer: string;
22
+ versionsnummer: number;
23
23
  sistaAntagningstermin?: string;
24
24
  };
25
25
  export declare const mapProgramInstans: (item: SokUtbildningsInstansItem | SokUtbildningsInstansSlimItem, language: Language) => ProgramInstans;
@@ -5,12 +5,13 @@ const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
5
5
  const utils_1 = require("./utils");
6
6
  const creditsUtil_1 = require("./utils/creditsUtil");
7
7
  const mapProgramInstans = (item, language) => {
8
+ var _a;
8
9
  const attributeValues = item.Attributvarden;
9
10
  const benamning = {
10
11
  sv: (0, ladok_attributvarde_utils_1.extractString)(item.Attributvarden, 'utbildning.attribut.svensk.benamning'),
11
12
  en: (0, ladok_attributvarde_utils_1.extractString)(item.Attributvarden, 'utbildning.attribut.engelsk.benamning'),
12
13
  };
13
- const omfattning = item.index['utbildning.attribut.omfattning'];
14
+ const omfattning = (_a = (0, ladok_attributvarde_utils_1.extractString)(item.Attributvarden, 'utbildning.attribut.omfattning', 'omfattning')) !== null && _a !== void 0 ? _a : '';
14
15
  const organisation = (0, ladok_attributvarde_utils_1.extractOrganisation)(item.Attributvarden);
15
16
  const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(item.Attributvarden);
16
17
  const tilltradesniva = (0, ladok_attributvarde_utils_1.extractTilltradesniva)(item.Attributvarden);
@@ -31,7 +32,7 @@ const mapProgramInstans = (item, language) => {
31
32
  tilltradesniva: tilltradesniva && (0, utils_1.translatedTilltradesniva)(tilltradesniva, language),
32
33
  kod: (0, ladok_attributvarde_utils_1.extractString)(item.Attributvarden, 'utbildning.attribut.kod'),
33
34
  giltigFrom: (0, ladok_attributvarde_utils_1.extractGiltigFrom)(attributeValues),
34
- versionsnummer: item.index['versionsnummer'],
35
+ versionsnummer: (0, ladok_attributvarde_utils_1.extractVersionNumber)(attributeValues),
35
36
  sistaAntagningstermin: (0, ladok_attributvarde_utils_1.extractString)(attributeValues, 'utbildning.lokalt.attribut.29.sista.antagningstermin.en', 'markdown'),
36
37
  };
37
38
  };
@@ -1 +1 @@
1
- {"version":3,"file":"mapProgramInstans.js","sourceRoot":"","sources":["../src/mapProgramInstans.ts"],"names":[],"mappings":";;;AAAA,8EAUuC;AAEvC,mCAQgB;AAChB,qDAAgF;AA2BzE,MAAM,iBAAiB,GAAG,CAC/B,IAA+D,EAC/D,QAAkB,EACF,EAAE;IAClB,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAA;IAE3C,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAA,yCAAa,EAAC,IAAI,CAAC,cAAc,EAAE,sCAAsC,CAAC;QAC9E,EAAE,EAAE,IAAA,yCAAa,EAAC,IAAI,CAAC,cAAc,EAAE,uCAAuC,CAAC;KAChF,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,cAAc,CAAC,CAAA;IAEjE,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,WAAW;QACrB,MAAM,EAAE,IAAA,8CAAkB,EAAC,IAAI,CAAC,cAAc,CAAC;QAC/C,wBAAwB,EAAE,IAAA,yCAAa,EAAC,eAAe,EAAE,8CAA8C,CAAC;QACxG,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC;QAC9B,cAAc,EAAE,SAAS,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAE1D,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,IAAA,yCAAa,EAAC,IAAI,CAAC,cAAc,EAAE,yBAAyB,CAAE;QAEnE,UAAU,EAAE,IAAA,6CAAiB,EAAC,eAAe,CAAC;QAC9C,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC;QAC5C,qBAAqB,EAAE,IAAA,yCAAa,EAClC,eAAe,EACf,yDAAyD,EACzD,UAAU,CACX;KACF,CAAA;AACH,CAAC,CAAA;AA5CY,QAAA,iBAAiB,qBA4C7B"}
1
+ {"version":3,"file":"mapProgramInstans.js","sourceRoot":"","sources":["../src/mapProgramInstans.ts"],"names":[],"mappings":";;;AAAA,8EAWuC;AAEvC,mCAQgB;AAChB,qDAAgF;AA2BzE,MAAM,iBAAiB,GAAG,CAC/B,IAA+D,EAC/D,QAAkB,EACF,EAAE;;IAClB,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAA;IAE3C,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAA,yCAAa,EAAC,IAAI,CAAC,cAAc,EAAE,sCAAsC,CAAC;QAC9E,EAAE,EAAE,IAAA,yCAAa,EAAC,IAAI,CAAC,cAAc,EAAE,uCAAuC,CAAC;KAChF,CAAA;IAED,MAAM,UAAU,GAAG,MAAA,IAAA,yCAAa,EAAC,IAAI,CAAC,cAAc,EAAE,gCAAgC,EAAE,YAAY,CAAC,mCAAI,EAAE,CAAA;IAC3G,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,cAAc,CAAC,CAAA;IAEjE,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,WAAW;QACrB,MAAM,EAAE,IAAA,8CAAkB,EAAC,IAAI,CAAC,cAAc,CAAC;QAC/C,wBAAwB,EAAE,IAAA,yCAAa,EAAC,eAAe,EAAE,8CAA8C,CAAC;QACxG,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC;QAC9B,cAAc,EAAE,SAAS,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAE1D,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,IAAA,yCAAa,EAAC,IAAI,CAAC,cAAc,EAAE,yBAAyB,CAAE;QAEnE,UAAU,EAAE,IAAA,6CAAiB,EAAC,eAAe,CAAC;QAC9C,cAAc,EAAE,IAAA,gDAAoB,EAAC,eAAe,CAAC;QACrD,qBAAqB,EAAE,IAAA,yCAAa,EAClC,eAAe,EACf,yDAAyD,EACzD,UAAU,CACX;KACF,CAAA;AACH,CAAC,CAAA;AA5CY,QAAA,iBAAiB,qBA4C7B"}
@@ -63,7 +63,7 @@ const mapProgramSyllabus = (syllabus, periods, language) => {
63
63
  kurslistaar5: findAndConvertMarkdownValue('kurslistaar5'),
64
64
  utbildningensgenomforande: findAndConvertMarkdownValue('utbildningensgenomforande'),
65
65
  utbildningensupplagg: findAndConvertMarkdownValue('utbildningensupplagg'),
66
- inriktningar: findStringValues('inriktningar', true),
66
+ inriktningar: findStringValues('program.inriktningar', true),
67
67
  fardigheterOchFormagor: findAndConvertMarkdownValue('fardigheter.och.formagor'),
68
68
  varderingsformagaOchForhallningssatt: findAndConvertMarkdownValue('varderingsformaga.och.forhallningssatt'),
69
69
  arskursinformationAr1: findAndConvertMarkdownValue('arskursinformation.ar1'),
@@ -1 +1 @@
1
- {"version":3,"file":"mapProgramSyllabus.js","sourceRoot":"","sources":["../src/mapProgramSyllabus.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mapProgramSyllabus.js","sourceRoot":"","sources":["../src/mapProgramSyllabus.ts"],"names":[],"mappings":"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"}
@@ -5,13 +5,13 @@ const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
5
5
  const utils_1 = require("./utils");
6
6
  const creditsUtil_1 = require("./utils/creditsUtil");
7
7
  const mapProgramTillfalle = (item, language) => {
8
- var _a;
8
+ var _a, _b;
9
9
  const attributeValues = item.Attributvarden;
10
10
  const benamning = {
11
11
  sv: (0, ladok_attributvarde_utils_1.extractString)(item.instans.Attributvarden, 'utbildning.attribut.svensk.benamning'),
12
12
  en: (0, ladok_attributvarde_utils_1.extractString)(item.instans.Attributvarden, 'utbildning.attribut.engelsk.benamning'),
13
13
  };
14
- const omfattning = item.index['utbildning.attribut.omfattning'];
14
+ const omfattning = (_a = (0, ladok_attributvarde_utils_1.extractString)(item.instans.Attributvarden, 'utbildning.attribut.omfattning', 'omfattning')) !== null && _a !== void 0 ? _a : '';
15
15
  const organisation = (0, ladok_attributvarde_utils_1.extractOrganisation)(item.Attributvarden);
16
16
  const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(item.Attributvarden);
17
17
  const tilltradesniva = (0, ladok_attributvarde_utils_1.extractTilltradesniva)(item.instans.Attributvarden);
@@ -19,7 +19,7 @@ const mapProgramTillfalle = (item, language) => {
19
19
  return {
20
20
  uid: item.tillfalle_uid,
21
21
  status: (0, ladok_attributvarde_utils_1.extractLadokStatus)(item.Attributvarden),
22
- installt: (_a = (0, ladok_attributvarde_utils_1.extractBoolean)(item.Attributvarden, 'installt')) !== null && _a !== void 0 ? _a : false,
22
+ installt: (_b = (0, ladok_attributvarde_utils_1.extractBoolean)(item.Attributvarden, 'installt')) !== null && _b !== void 0 ? _b : false,
23
23
  utbildningstillfalleskod: (0, ladok_attributvarde_utils_1.extractString)(attributeValues, 'utbildning.attribut.utbildningstillfalleskod'),
24
24
  benamning: benamning[language],
25
25
  omfattning: {
@@ -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,CACjC,IAAmE,EACnE,QAAkB,EACA,EAAE;;IACpB,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAA;IAE3C,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAA,yCAAa,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,sCAAsC,CAAC;QACtF,EAAE,EAAE,IAAA,yCAAa,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,uCAAuC,CAAC;KACxF,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,IAAA,yCAAa,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,yBAAyB,CAAE;QAC3E,aAAa,EAAE,aAAa;KAC7B,CAAA;AACH,CAAC,CAAA;AAvCY,QAAA,mBAAmB,uBAuC/B"}
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,IAAA,yCAAa,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,sCAAsC,CAAC;QACtF,EAAE,EAAE,IAAA,yCAAa,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,uCAAuC,CAAC;KACxF,CAAA;IAED,MAAM,UAAU,GAAG,MAAA,IAAA,yCAAa,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,gCAAgC,EAAE,YAAY,CAAC,mCAAI,EAAE,CAAA;IACnH,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,IAAA,yCAAa,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,yBAAyB,CAAE;QAC3E,aAAa,EAAE,aAAa;KAC7B,CAAA;AACH,CAAC,CAAA;AAvCY,QAAA,mBAAmB,uBAuC/B"}
@@ -17,7 +17,7 @@ export type SearchResultPeriod = {
17
17
  tillfallesperioderNummer: number;
18
18
  };
19
19
  export type CourseSearchResult = {
20
- versionsnummer: string;
20
+ versionsnummer: number;
21
21
  kod: string;
22
22
  benamning: string;
23
23
  omfattning: {
@@ -8,7 +8,7 @@ const creditsUtil_1 = require("./utils/creditsUtil");
8
8
  const schoolUtil_1 = require("./utils/schoolUtil");
9
9
  // TODO Benni this should be refactored together with mapCourseRound
10
10
  const mapKursTillfalleResult = (courseRound, language) => {
11
- var _a, _b, _c, _d, _e, _f, _g, _h;
11
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
12
12
  const benamning = {
13
13
  sv: (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.svensk.benamning'),
14
14
  en: (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.engelsk.benamning'),
@@ -24,12 +24,12 @@ const mapKursTillfalleResult = (courseRound, language) => {
24
24
  const startperiod = (0, ladok_attributvarde_utils_1.extractStartPeriod)(courseRound.Attributvarden);
25
25
  const studietakt = (0, ladok_attributvarde_utils_1.extractStudietakt)(courseRound.Attributvarden);
26
26
  const schoolCode = (0, schoolUtil_1.extractSchoolCodeFromOrganisation)(organisation, language);
27
- const omfattning = courseRound.index['utbildning.attribut.omfattning'];
27
+ const omfattning = (_b = (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.omfattning', 'omfattning')) !== null && _b !== void 0 ? _b : '';
28
28
  const isMiljo = (0, ladok_attributvarde_utils_1.extractIsMiljo)(courseRound.instans.Attributvarden);
29
29
  return {
30
- versionsnummer: courseRound.index.versionsnummer,
30
+ versionsnummer: (0, ladok_attributvarde_utils_1.extractVersionNumber)(courseRound.instans.Attributvarden),
31
31
  kod: (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.kod'),
32
- benamning: (_b = benamning[language]) !== null && _b !== void 0 ? _b : '',
32
+ benamning: (_c = benamning[language]) !== null && _c !== void 0 ? _c : '',
33
33
  omfattning: {
34
34
  number: omfattning,
35
35
  formattedWithUnit: (0, creditsUtil_1.formatCreditsWithUnitLabel)(omfattning, utbildningstyp, language),
@@ -46,16 +46,16 @@ const mapKursTillfalleResult = (courseRound, language) => {
46
46
  },
47
47
  period: {
48
48
  startperiod: (startperiod === null || startperiod === void 0 ? void 0 : startperiod.code) || '',
49
- forstaUndervisningsdatum: Object.assign({ date: (_c = courseRound.Tillfallesperioder.at(0)) === null || _c === void 0 ? void 0 : _c.ForstaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_d = courseRound.Tillfallesperioder.at(0)) === null || _d === void 0 ? void 0 : _d.ForstaUndervisningsdatum), {
49
+ forstaUndervisningsdatum: Object.assign({ date: (_d = courseRound.Tillfallesperioder.at(0)) === null || _d === void 0 ? void 0 : _d.ForstaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_e = courseRound.Tillfallesperioder.at(0)) === null || _e === void 0 ? void 0 : _e.ForstaUndervisningsdatum), {
50
50
  code: startperiod === null || startperiod === void 0 ? void 0 : startperiod.code,
51
51
  startDate: startperiod && new Date(startperiod.startDay),
52
52
  endDate: startperiod && new Date(startperiod.lastDay),
53
- }, 'start') }, (0, utils_1.getYearAndWeek)((_e = courseRound.Tillfallesperioder.at(0)) === null || _e === void 0 ? void 0 : _e.ForstaUndervisningsdatum)),
54
- sistaUndervisningsdatum: Object.assign({ date: (_f = courseRound.Tillfallesperioder.at(-1)) === null || _f === void 0 ? void 0 : _f.SistaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_g = courseRound.Tillfallesperioder.at(-1)) === null || _g === void 0 ? void 0 : _g.SistaUndervisningsdatum), {
53
+ }, 'start') }, (0, utils_1.getYearAndWeek)((_f = courseRound.Tillfallesperioder.at(0)) === null || _f === void 0 ? void 0 : _f.ForstaUndervisningsdatum)),
54
+ sistaUndervisningsdatum: Object.assign({ date: (_g = courseRound.Tillfallesperioder.at(-1)) === null || _g === void 0 ? void 0 : _g.SistaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_h = courseRound.Tillfallesperioder.at(-1)) === null || _h === void 0 ? void 0 : _h.SistaUndervisningsdatum), {
55
55
  code: startperiod === null || startperiod === void 0 ? void 0 : startperiod.code,
56
56
  startDate: startperiod && new Date(startperiod.startDay),
57
57
  endDate: startperiod && new Date(startperiod.lastDay),
58
- }, 'end') }, (0, utils_1.getYearAndWeek)((_h = courseRound.Tillfallesperioder.at(-1)) === null || _h === void 0 ? void 0 : _h.SistaUndervisningsdatum)),
58
+ }, 'end') }, (0, utils_1.getYearAndWeek)((_j = courseRound.Tillfallesperioder.at(-1)) === null || _j === void 0 ? void 0 : _j.SistaUndervisningsdatum)),
59
59
  tillfallesperioderNummer: courseRound.Tillfallesperioder.length,
60
60
  },
61
61
  schoolCode,
@@ -1 +1 @@
1
- {"version":3,"file":"mapSearchResult.js","sourceRoot":"","sources":["../src/mapSearchResult.ts"],"names":[],"mappings":";;;AAAA,8EAQuC;AAGvC,uDAS6B;AAC7B,mCAAoF;AACpF,qDAAgE;AAChE,mDAAsE;AA2CtE,oEAAoE;AAC7D,MAAM,sBAAsB,GAAG,CACpC,WAA0E,EAC1E,QAAkB,EACE,EAAE;;IACtB,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAA,yCAAa,EAAC,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,sCAAsC,CAAC;QAC7F,EAAE,EAAE,IAAA,yCAAa,EAAC,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,uCAAuC,CAAC;KAC/F,CAAA;IACD,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,WAAW,CAAC,cAAc,CAAC,CAAA;IACpE,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,CAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,cAAc,KAAI,WAAW,CAAC,cAAc,CAAC,CAAA;IAE/G,MAAM,SAAS,GAAG,IAAA,4CAAgB,EAAC,WAAW,CAAC,cAAc,EAAE,+BAA+B,CAAC,CAAA;IAE/F,MAAM,kBAAkB,GAAG,IAAA,4CAAgB,EAAC,WAAW,CAAC,cAAc,EAAE,wCAAwC,CAAC,CAAA;IAEjH,MAAM,QAAQ,GAAG;QACf,EAAE,EAAE,IAAA,yCAAa,EAAC,WAAW,CAAC,cAAc,EAAE,2CAA2C,EAAE,MAAM,CAAC;QAClG,EAAE,EAAE,IAAA,yCAAa,EAAC,WAAW,CAAC,cAAc,EAAE,2CAA2C,EAAE,MAAM,CAAC;KACnG,CAAA;IAED,MAAM,WAAW,GAAG,IAAA,8CAAkB,EAAC,WAAW,CAAC,cAAc,CAAC,CAAA;IAElE,MAAM,UAAU,GAAG,IAAA,6CAAiB,EAAC,WAAW,CAAC,cAAc,CAAC,CAAA;IAEhE,MAAM,UAAU,GAAG,IAAA,8CAAiC,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;IAE5E,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;IAEtE,MAAM,OAAO,GAAG,IAAA,0CAAc,EAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAElE,OAAO;QACL,cAAc,EAAE,WAAW,CAAC,KAAK,CAAC,cAAc;QAChD,GAAG,EAAE,IAAA,yCAAa,EAAC,WAAW,CAAC,OAAO,CAAC,cAAc,EAAE,yBAAyB,CAAE;QAClF,SAAS,EAAE,MAAA,SAAS,CAAC,QAAQ,CAAC,mCAAI,EAAE;QACpC,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,SAAS,EAAE,SAAS,IAAI,IAAA,iCAAkB,EAAC,SAAS,EAAE,QAAQ,CAAC;QAC/D,cAAc,EAAE,cAAc,IAAI,IAAA,sCAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;QACnF,kBAAkB,EAAE,kBAAkB,IAAI,IAAA,iCAAkB,EAAC,kBAAkB,EAAE,QAAQ,CAAC;QAC1F,UAAU,EAAE,UAAU,IAAI,IAAA,kCAAmB,EAAC,UAAU,EAAE,QAAQ,CAAC;QACnE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC;QAC5B,WAAW,EAAE,WAAW,IAAI;YAC1B,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,QAAQ,EAAE,IAAA,+BAAuB,EAAC,WAAW,CAAC,IAAI,CAAC;SACpD;QACD,MAAM,EAAE;YACN,WAAW,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,KAAI,EAAE;YACpC,wBAAwB,kBACtB,IAAI,EAAE,MAAA,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,0CAAE,wBAAkC,EAC9E,MAAM,EAAE,IAAA,yBAAiB,EACvB,IAAI,IAAI,CAAC,MAAA,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,0CAAE,wBAAkC,CAAC,EAClF;oBACE,IAAI,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI;oBACvB,SAAS,EAAE,WAAW,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;oBACxD,OAAO,EAAE,WAAW,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;iBACtD,EACD,OAAO,CACR,IACE,IAAA,sBAAc,EAAC,MAAA,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,0CAAE,wBAAkC,CAAC,CAC5F;YACD,uBAAuB,kBACrB,IAAI,EAAE,MAAA,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,0CAAE,uBAAiC,EAC9E,MAAM,EAAE,IAAA,yBAAiB,EACvB,IAAI,IAAI,CAAC,MAAA,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,0CAAE,uBAAiC,CAAC,EAClF;oBACE,IAAI,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI;oBACvB,SAAS,EAAE,WAAW,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;oBACxD,OAAO,EAAE,WAAW,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;iBACtD,EACD,KAAK,CACN,IACE,IAAA,sBAAc,EAAC,MAAA,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,0CAAE,uBAAiC,CAAC,CAC5F;YACD,wBAAwB,EAAE,WAAW,CAAC,kBAAkB,CAAC,MAAM;SAChE;QACD,UAAU;QACV,OAAO;KACR,CAAA;AACH,CAAC,CAAA;AAjFY,QAAA,sBAAsB,0BAiFlC"}
1
+ {"version":3,"file":"mapSearchResult.js","sourceRoot":"","sources":["../src/mapSearchResult.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,7 @@ const mapStructurePartVersions = (course, language) => {
12
12
  };
13
13
  const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(Attributvarden);
14
14
  const kod = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.kod');
15
- const omfattning = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.omfattning');
15
+ const omfattning = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.omfattning', 'omfattning');
16
16
  return {
17
17
  kod: kod,
18
18
  benamning: benamning[language],
@@ -1 +1 @@
1
- {"version":3,"file":"mapStructurePartVersions.js","sourceRoot":"","sources":["../src/mapStructurePartVersions.ts"],"names":[],"mappings":";;;AAAA,8EAAqF;AAGrF,uDAAkG;AAClG,qDAAgE;AAazD,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;IACpE,MAAM,UAAU,GAAG,IAAA,yCAAa,EAAC,cAAc,EAAE,gCAAgC,CAAC,CAAA;IAElF,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;QACnF,qBAAqB,EAAE,MAAM,CAAC,GAAG;QACjC,UAAU,EAAE;YACV,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC;YAC1B,iBAAiB,EAAE,IAAA,wCAA0B,EAAC,UAAW,EAAE,cAAc,EAAE,QAAQ,CAAC;SACrF;KACF,CAAA;AACH,CAAC,CAAA;AA1BY,QAAA,wBAAwB,4BA0BpC"}
1
+ {"version":3,"file":"mapStructurePartVersions.js","sourceRoot":"","sources":["../src/mapStructurePartVersions.ts"],"names":[],"mappings":";;;AAAA,8EAAqF;AAGrF,uDAAkG;AAClG,qDAAgE;AAazD,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;IACpE,MAAM,UAAU,GAAG,IAAA,yCAAa,EAAC,cAAc,EAAE,gCAAgC,EAAE,YAAY,CAAC,CAAA;IAEhG,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;QACnF,qBAAqB,EAAE,MAAM,CAAC,GAAG;QACjC,UAAU,EAAE;YACV,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC;YAC1B,iBAAiB,EAAE,IAAA,wCAA0B,EAAC,UAAW,EAAE,cAAc,EAAE,QAAQ,CAAC;SACrF;KACF,CAAA;AACH,CAAC,CAAA;AA1BY,QAAA,wBAAwB,4BA0BpC"}
@@ -0,0 +1 @@
1
+ export declare const MAX_ANTAL_TRAFFAR = "100";
@@ -0,0 +1,5 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MAX_ANTAL_TRAFFAR = void 0;
4
+ exports.MAX_ANTAL_TRAFFAR = '100';
5
+ //# sourceMappingURL=queryConstants.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"queryConstants.js","sourceRoot":"","sources":["../src/queryConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG,KAAK,CAAA"}
@@ -10,7 +10,7 @@ const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
10
10
  */
11
11
  const getLatestCompletedCourseVersions = (courseVersions) => {
12
12
  return courseVersions.filter(course => {
13
- const versionsnummer = parseInt(course.versionsnummer, 10);
13
+ const { versionsnummer } = course;
14
14
  if (course.ladokStatusCode === ladok_attributvarde_utils_1.LadokStatusCode.Complete)
15
15
  return true;
16
16
  return versionsnummer > 1; // If a versionnummer is greater than 1, there once has been at least one completed version
@@ -1 +1 @@
1
- {"version":3,"file":"getLatestCompletedCourseVersions.js","sourceRoot":"","sources":["../../../src/search/utils/getLatestCompletedCourseVersions.ts"],"names":[],"mappings":";;;AAAA,8EAAgE;AAGhE;;;;;GAKG;AACI,MAAM,gCAAgC,GAAG,CAC9C,cAAmB,EACd,EAAE;IACP,OAAO,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QACpC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA;QAE1D,IAAI,MAAM,CAAC,eAAe,KAAK,2CAAe,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAA;QAEpE,OAAO,cAAc,GAAG,CAAC,CAAA,CAAC,2FAA2F;IACvH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAVY,QAAA,gCAAgC,oCAU5C"}
1
+ {"version":3,"file":"getLatestCompletedCourseVersions.js","sourceRoot":"","sources":["../../../src/search/utils/getLatestCompletedCourseVersions.ts"],"names":[],"mappings":";;;AAAA,8EAAgE;AAGhE;;;;;GAKG;AACI,MAAM,gCAAgC,GAAG,CAC9C,cAAmB,EACd,EAAE;IACP,OAAO,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QACpC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAA;QAEjC,IAAI,MAAM,CAAC,eAAe,KAAK,2CAAe,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAA;QAEpE,OAAO,cAAc,GAAG,CAAC,CAAA,CAAC,2FAA2F;IACvH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAVY,QAAA,gCAAgC,oCAU5C"}
@@ -8,6 +8,7 @@ const utbildningsTypIdConstants_1 = require("../utbildningsTypIdConstants");
8
8
  const attributVardenConstants_1 = require("../../attributVardenConstants");
9
9
  const educationalTypeUtils_1 = require("./educationalTypeUtils");
10
10
  const typeChecking_1 = require("../../utils/typeChecking");
11
+ const queryConstants_1 = require("../../queryConstants");
11
12
  /**
12
13
  * Validates and cleans the search parameters for the search API.
13
14
  * Throws an error if the searchParams are invalid.
@@ -56,13 +57,12 @@ const mapUtbildningsniva = (utbildningsniva) => {
56
57
  return undefined;
57
58
  }
58
59
  };
59
- const MAX_ANTAL_TRAFFAR = '100';
60
60
  // TODO Benni, maybe this does not make things cleaner, observe
61
61
  // TODO Benni don't forget this when cleaning up types on query object
62
62
  const DEFAULT_INSTANCE_QUERY_PARAMS = {
63
63
  attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH,
64
64
  instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH,
65
- antalTraffar: MAX_ANTAL_TRAFFAR,
65
+ antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
66
66
  };
67
67
  const prepareSearchRequestQueryForKursTillfallen = (searchParams, schoolsWithDepartments) => {
68
68
  const { kodEllerBenamning, organisation, sprak, startPeriod, utbildningsniva, avvecklad } = searchParams;
@@ -109,7 +109,7 @@ const getOrganisationsFilter = (organisationer, organisation) => {
109
109
  const prepareSearchRequestQueryForKursInstans = (searchParams, schoolsWithDepartments) => {
110
110
  const { kodEllerBenamning, avvecklad, organisation, utbildningsniva } = searchParams;
111
111
  const organisationsFilter = getOrganisationsFilter(schoolsWithDepartments, organisation);
112
- return Object.assign(Object.assign(Object.assign({ kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*', antalTraffar: MAX_ANTAL_TRAFFAR }, (avvecklad && { avvecklad })), (organisationsFilter && { organisation: organisationsFilter })), { utbildningstypgrundtyp: 'KURS', utbildningstypid: getUtbildningsnivaParameterForKursInstans(utbildningsniva), instansAttributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS, senasteversion: 'true' });
112
+ return Object.assign(Object.assign(Object.assign({ kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*', antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR }, (avvecklad && { avvecklad })), (organisationsFilter && { organisation: organisationsFilter })), { utbildningstypgrundtyp: 'KURS', utbildningstypid: getUtbildningsnivaParameterForKursInstans(utbildningsniva), instansAttributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS, senasteversion: 'true' });
113
113
  };
114
114
  exports.prepareSearchRequestQueryForKursInstans = prepareSearchRequestQueryForKursInstans;
115
115
  /**
@@ -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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"}
@@ -4,6 +4,7 @@ exports.getSemester = void 0;
4
4
  exports.sortSyllabuses = sortSyllabuses;
5
5
  exports.getSyllabusForSemester = getSyllabusForSemester;
6
6
  const periodUtil_1 = require("./periodUtil");
7
+ const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
7
8
  const getSemester = (dateStr) => {
8
9
  const [yearStr, monthStr] = dateStr.split('-');
9
10
  const year = parseInt(yearStr, 10);
@@ -26,8 +27,8 @@ function sortSyllabuses(syllabuses) {
26
27
  return dateB - dateA;
27
28
  }
28
29
  // Step 2: If same GiltigFran date, sort by latest course version (descending)
29
- const versionA = parseInt(a.index.versionsnummer, 10);
30
- const versionB = parseInt(b.index.versionsnummer, 10);
30
+ const versionA = (0, ladok_attributvarde_utils_1.extractVersionNumber)(a.instans.Attributvarden);
31
+ const versionB = (0, ladok_attributvarde_utils_1.extractVersionNumber)(b.instans.Attributvarden);
31
32
  if (versionA !== versionB) {
32
33
  return versionB - versionA;
33
34
  }
@@ -1 +1 @@
1
- {"version":3,"file":"courseSyllabusUtil.js","sourceRoot":"","sources":["../../src/utils/courseSyllabusUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"courseSyllabusUtil.js","sourceRoot":"","sources":["../../src/utils/courseSyllabusUtil.ts"],"names":[],"mappings":";;;AAmBA,wCAoCC;AAED,wDA4BC;AApFD,6CAAsD;AAEtD,8EAAqE;AAE9D,MAAM,WAAW,GAAG,CAAC,OAAe,EAAU,EAAE;IACrD,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC9C,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IAClC,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IAEpC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,IAAI,EAAE,CAAA;IACpB,CAAC;SAAM,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;QACrC,OAAO,KAAK,IAAI,EAAE,CAAA;IACpB,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;AACjD,CAAC,CAAA;AAZY,QAAA,WAAW,eAYvB;AAED,SAAgB,cAAc,CAAC,UAA6C;IAC1E,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC9B,2DAA2D;QAC3D,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAA;QAC9C,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAA;QAC9C,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,OAAO,KAAK,GAAG,KAAK,CAAA;QACtB,CAAC;QAED,8EAA8E;QAC9E,MAAM,QAAQ,GAAG,IAAA,gDAAoB,EAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC/D,MAAM,QAAQ,GAAG,IAAA,gDAAoB,EAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC/D,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,OAAO,QAAQ,GAAG,QAAQ,CAAA;QAC5B,CAAC;QAED,oFAAoF;QACpF,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAU,EAAE;;YACtC,MAAM,GAAG,GAAG,MAAA,MAAA,GAAG,CAAC,sBAAsB,CAAC,IAAI,CACzC,CAAC,aAAkB,EAAE,EAAE,CAAC,aAAa,CAAC,kBAAkB,CAAC,GAAG,KAAK,sCAAsC,CACxG,0CAAE,MAAM,0CAAG,CAAC,CAAC,CAAA;YACd,OAAO,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA,CAAC,yCAAyC;QACtF,CAAC,CAAA;QAED,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;QAE9B,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,OAAO,QAAQ,GAAG,QAAQ,CAAA,CAAC,iCAAiC;QAC9D,CAAC;QAED,kFAAkF;QAClF,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAA;QACnG,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAA;QACnG,OAAO,UAAU,GAAG,UAAU,CAAA;IAChC,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAgB,sBAAsB,CACpC,QAAgB,EAChB,UAA6C,EAC7C,OAAqB;IAErB,MAAM,qBAAqB,GAAG,IAAA,oCAAuB,EAAC,QAAQ,CAAC,CAAA;IAC/D,MAAM,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAC7D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAA;IAC5E,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,qBAAqB,CAAC,CAAA;IAChF,IAAI,WAAiB,CAAA;IAErB,IAAI,WAAW,EAAE,CAAC;QAChB,WAAW,GAAG,IAAI,IAAI,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,gBAAgB,CAAC,SAAS,CAAC,CAAA;IACjE,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,2DAA2D,qBAAqB,EAAE,CAAC,CAAA;IACrG,CAAC;IAED,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,QAAuC,EAAE,EAAE;QACpF,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QAC/C,OAAO,SAAS,IAAI,WAAW,CAAA;IACjC,CAAC,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAAG,cAAc,CAAC,eAAe,CAAC,CAAA;IAExD,OAAO,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AACjE,CAAC"}
@@ -136,7 +136,6 @@ function fetchStructurePartsByType(categorizedStrukturDelar, language, ladokClie
136
136
  return results;
137
137
  });
138
138
  }
139
- const SPECIALIZATION_INSTANCE_TYPE = 'Inriktningstillfälle';
140
139
  function isSpecializationInstance(instance) {
141
140
  if (instance.type === 'instance') {
142
141
  const utbildningstyp = instance.data.utbildningstyp;
@@ -145,6 +144,14 @@ function isSpecializationInstance(instance) {
145
144
  else
146
145
  return false;
147
146
  }
147
+ function isInvalidData(instance) {
148
+ if (instance.type === 'instance') {
149
+ const utbildningstyp = instance.data.utbildningstyp;
150
+ return (utbildningstyp === null || utbildningstyp === void 0 ? void 0 : utbildningstyp.id) === ladok_attributvarde_utils_1.EducationalTypeID.UTBSAM; // more invalid instances can be added here
151
+ }
152
+ else
153
+ return false;
154
+ }
148
155
  function separateSpecializations(structureParts) {
149
156
  const filteredMappedStructurePartsDividedByType = [];
150
157
  const specializationListFromStructure = [];
@@ -156,7 +163,8 @@ function separateSpecializations(structureParts) {
156
163
  }
157
164
  }
158
165
  else {
159
- filteredMappedStructurePartsDividedByType.push(structurePart);
166
+ if (!isInvalidData(structurePart))
167
+ filteredMappedStructurePartsDividedByType.push(structurePart);
160
168
  }
161
169
  });
162
170
  return { filteredMappedStructurePartsDividedByType, specializationListFromStructure };
@@ -1 +1 @@
1
- {"version":3,"file":"programStrukturUtil.js","sourceRoot":"","sources":["../../src/utils/programStrukturUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"programStrukturUtil.js","sourceRoot":"","sources":["../../src/utils/programStrukturUtil.ts"],"names":[],"mappings":"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"}
@@ -24,6 +24,7 @@ const versionUtils_1 = require("./versionUtils");
24
24
  const programStrukturUtil_1 = require("./programStrukturUtil");
25
25
  const courseSyllabusUtil_1 = require("./courseSyllabusUtil");
26
26
  const mapProgramSyllabus_1 = require("../mapProgramSyllabus");
27
+ const attributVardenConstants_1 = require("../attributVardenConstants");
27
28
  const SEMESTER_FOR_START_READING_STRUCTURES = {
28
29
  code: 'HT2025', // we will increase 2025 by {lengthInStudyYear} (maximum study year that we have for a program) since there can be ongoing programs until 2025
29
30
  year: 2025,
@@ -33,7 +34,6 @@ const SEMESTER_FOR_END_READING_SYLLABUSES = {
33
34
  code: 'VT2025',
34
35
  date: '2025-06-02',
35
36
  }; // Based on the follwoing document: https://confluence.sys.kth.se/confluence/pages/viewpage.action?pageId=262933569
36
- const ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE = 'utbildning.attribut.organisation,utbildningstyp,utbildning.attribut.lokalmarkning,status,installt,utbildning.attribut.utbildningstillfalleskod';
37
37
  const filterAndMapProgramTillfalle = (response, language) => {
38
38
  if (response.type === 'error') {
39
39
  throw new Error(`API error: ${response.responseInfo.message}`);
@@ -159,7 +159,7 @@ const findProgramVersion = (programCode, semester, language, ladokClient) => __a
159
159
  kodEllerBenamning: programCode,
160
160
  striktKod: 'true',
161
161
  // typ: 'program', TODO: we should un-comment this when the issue in prod is fixed
162
- instansAttributVarden: 'utbildning.attribut.organisation,utbildningstyp,utbildning.attribut.giltig.from,utbildning.attribut.tilltradesniva,utbildning.lokalt.attribut.29.sista.antagningstermin.en,utbildning.attribut.svensk.benamning,utbildning.attribut.engelsk.benamning,utbildning.attribut.kod',
162
+ instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAM_VERSION,
163
163
  };
164
164
  const response = yield ladokClient.sokUtbildningsInstansSlim(requestObject);
165
165
  const periods = yield ladokClient.period(); // TODO: Use cached values
@@ -179,8 +179,8 @@ const findProgramInstance = (programCode, semester, language, ladokClient) => __
179
179
  startPeriod: semester,
180
180
  striktKod: 'true',
181
181
  baraSistaVersion: 'false',
182
- attributVarden: ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE,
183
- instansAttributVarden: 'utbildning.attribut.tilltradesniva,utbildning.attribut.svensk.benamning,utbildning.attribut.engelsk.benamning,utbildning.attribut.kod',
182
+ attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE,
183
+ instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE,
184
184
  };
185
185
  const response = yield ladokClient.sokProgramTillfalleSlim(requestObject);
186
186
  const programTillfalleList = (0, exports.filterAndMapProgramTillfalle)(response, language);
@@ -256,7 +256,7 @@ function enrichCurriculumsInformationDataWithSyllabusData(curriculums, syllabusD
256
256
  const specCode = (_a = curriculum.programmeSpecialization) === null || _a === void 0 ? void 0 : _a.programmeSpecializationCode;
257
257
  const dataSource = isSpecialization ? specializationDataMap.get(specCode) : syllabusData;
258
258
  if (isSpecialization)
259
- curriculum.programmeSpecialization.description = dataSource.beskrivning;
259
+ curriculum.programmeSpecialization.description = dataSource === null || dataSource === void 0 ? void 0 : dataSource.beskrivning;
260
260
  const enrichedStudyYears = curriculum.studyYears.map(studyYear => {
261
261
  const year = studyYear.yearNumber;
262
262
  return Object.assign(Object.assign({}, studyYear), { supplementaryInfo: (dataSource === null || dataSource === void 0 ? void 0 : dataSource[`arskursinformationAr${year}`]) || undefined, conditionallyElectiveCoursesInfo: (dataSource === null || dataSource === void 0 ? void 0 : dataSource[`infoVvkurserAr${year}`]) || undefined });
@@ -1 +1 @@
1
- {"version":3,"file":"programUtil.js","sourceRoot":"","sources":["../../src/utils/programUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"programUtil.js","sourceRoot":"","sources":["../../src/utils/programUtil.ts"],"names":[],"mappings":"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"}
@@ -62,6 +62,8 @@ const generateStudyYearData = (coursesData, freeTexts, periodDetails, mainStartP
62
62
  const baseYear = (0, exports.extractYear)(mainStartPeriod);
63
63
  // Step 1: Map Fritexts to study years
64
64
  freeTexts.forEach(ft => {
65
+ if (!ft.PlaneradPeriodStartDatum)
66
+ return;
65
67
  const studyYear = (0, exports.getStudyYearFromDate)(ft.PlaneradPeriodStartDatum, periodDetails, mainStartPeriod);
66
68
  if (studyYear && studyYear >= 1 && studyYear <= lengthStudyYear) {
67
69
  if (!studyYearFreeTexts[studyYear]) {
@@ -1 +1 @@
1
- {"version":3,"file":"studyYearUtil.js","sourceRoot":"","sources":["../../src/utils/studyYearUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"studyYearUtil.js","sourceRoot":"","sources":["../../src/utils/studyYearUtil.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  type EntityWithVersionsnummer = {
2
- versionsnummer: string;
2
+ versionsnummer: number;
3
3
  };
4
4
  /**
5
5
  * For an array of entities with versionsnummer, this function returns the entity with the latest version (i.e. the highest versionsnummer).
@@ -29,8 +29,8 @@ const sortByVersionsnummerDesc = (entities) => {
29
29
  };
30
30
  exports.sortByVersionsnummerDesc = sortByVersionsnummerDesc;
31
31
  const compareVersionsnummerDesc = (a, b) => {
32
- const versionsnummerA = parseInt(a.versionsnummer, 10);
33
- const versionsnummerB = parseInt(b.versionsnummer, 10);
32
+ const versionsnummerA = a.versionsnummer;
33
+ const versionsnummerB = b.versionsnummer;
34
34
  if (isNaN(versionsnummerA))
35
35
  return 1;
36
36
  if (isNaN(versionsnummerB))
@@ -47,8 +47,8 @@ const sortByVersionsnummerAsc = (entities) => {
47
47
  };
48
48
  exports.sortByVersionsnummerAsc = sortByVersionsnummerAsc;
49
49
  const compareVersionsnummerAsc = (a, b) => {
50
- const versionsnummerA = parseInt(a.versionsnummer, 10);
51
- const versionsnummerB = parseInt(b.versionsnummer, 10);
50
+ const versionsnummerA = a.versionsnummer;
51
+ const versionsnummerB = b.versionsnummer;
52
52
  if (isNaN(versionsnummerA))
53
53
  return 1;
54
54
  if (isNaN(versionsnummerB))
@@ -1 +1 @@
1
- {"version":3,"file":"versionUtils.js","sourceRoot":"","sources":["../../src/utils/versionUtils.ts"],"names":[],"mappings":";;;AAIA;;;;GAIG;AACI,MAAM,iBAAiB,GAAG,CAAqC,QAAa,EAAE,EAAE;IACrF,OAAO,IAAA,gCAAwB,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AACjD,CAAC,CAAA;AAFY,QAAA,iBAAiB,qBAE7B;AAED;;;;GAIG;AACI,MAAM,iBAAiB,GAAG,CAAqC,QAAa,EAAE,EAAE;IACrF,OAAO,IAAA,+BAAuB,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAChD,CAAC,CAAA;AAFY,QAAA,iBAAiB,qBAE7B;AAED;;;;GAIG;AACI,MAAM,wBAAwB,GAAG,CAAqC,QAAa,EAAE,EAAE;IAC5F,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA,CAAC,oEAAoE;AAC3H,CAAC,CAAA;AAFY,QAAA,wBAAwB,4BAEpC;AAED,MAAM,yBAAyB,GAAG,CAAqC,CAAI,EAAE,CAAI,EAAE,EAAE;IACnF,MAAM,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA;IACtD,MAAM,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA;IACtD,IAAI,KAAK,CAAC,eAAe,CAAC;QAAE,OAAO,CAAC,CAAA;IACpC,IAAI,KAAK,CAAC,eAAe,CAAC;QAAE,OAAO,CAAC,CAAC,CAAA;IAErC,OAAO,eAAe,GAAG,eAAe,CAAA;AAC1C,CAAC,CAAA;AAED;;;;GAIG;AACI,MAAM,uBAAuB,GAAG,CAAqC,QAAa,EAAE,EAAE;IAC3F,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA,CAAC,oEAAoE;AAC1H,CAAC,CAAA;AAFY,QAAA,uBAAuB,2BAEnC;AAED,MAAM,wBAAwB,GAAG,CAAqC,CAAI,EAAE,CAAI,EAAE,EAAE;IAClF,MAAM,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA;IACtD,MAAM,eAAe,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA;IACtD,IAAI,KAAK,CAAC,eAAe,CAAC;QAAE,OAAO,CAAC,CAAA;IACpC,IAAI,KAAK,CAAC,eAAe,CAAC;QAAE,OAAO,CAAC,CAAC,CAAA;IAErC,OAAO,eAAe,GAAG,eAAe,CAAA;AAC1C,CAAC,CAAA"}
1
+ {"version":3,"file":"versionUtils.js","sourceRoot":"","sources":["../../src/utils/versionUtils.ts"],"names":[],"mappings":";;;AAIA;;;;GAIG;AACI,MAAM,iBAAiB,GAAG,CAAqC,QAAa,EAAE,EAAE;IACrF,OAAO,IAAA,gCAAwB,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AACjD,CAAC,CAAA;AAFY,QAAA,iBAAiB,qBAE7B;AAED;;;;GAIG;AACI,MAAM,iBAAiB,GAAG,CAAqC,QAAa,EAAE,EAAE;IACrF,OAAO,IAAA,+BAAuB,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAChD,CAAC,CAAA;AAFY,QAAA,iBAAiB,qBAE7B;AAED;;;;GAIG;AACI,MAAM,wBAAwB,GAAG,CAAqC,QAAa,EAAE,EAAE;IAC5F,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA,CAAC,oEAAoE;AAC3H,CAAC,CAAA;AAFY,QAAA,wBAAwB,4BAEpC;AAED,MAAM,yBAAyB,GAAG,CAAqC,CAAI,EAAE,CAAI,EAAE,EAAE;IACnF,MAAM,eAAe,GAAG,CAAC,CAAC,cAAc,CAAA;IACxC,MAAM,eAAe,GAAG,CAAC,CAAC,cAAc,CAAA;IACxC,IAAI,KAAK,CAAC,eAAe,CAAC;QAAE,OAAO,CAAC,CAAA;IACpC,IAAI,KAAK,CAAC,eAAe,CAAC;QAAE,OAAO,CAAC,CAAC,CAAA;IAErC,OAAO,eAAe,GAAG,eAAe,CAAA;AAC1C,CAAC,CAAA;AAED;;;;GAIG;AACI,MAAM,uBAAuB,GAAG,CAAqC,QAAa,EAAE,EAAE;IAC3F,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA,CAAC,oEAAoE;AAC1H,CAAC,CAAA;AAFY,QAAA,uBAAuB,2BAEnC;AAED,MAAM,wBAAwB,GAAG,CAAqC,CAAI,EAAE,CAAI,EAAE,EAAE;IAClF,MAAM,eAAe,GAAG,CAAC,CAAC,cAAc,CAAA;IACxC,MAAM,eAAe,GAAG,CAAC,CAAC,cAAc,CAAA;IACxC,IAAI,KAAK,CAAC,eAAe,CAAC;QAAE,OAAO,CAAC,CAAA;IACpC,IAAI,KAAK,CAAC,eAAe,CAAC;QAAE,OAAO,CAAC,CAAC,CAAA;IAErC,OAAO,eAAe,GAAG,eAAe,CAAA;AAC1C,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kth/om-kursen-ladok-client",
3
- "version": "2.0.1",
3
+ "version": "2.0.2",
4
4
  "description": "Om kursen specific logic and mappings, uses both @kth/ladok-mellanlager-client and @kth/ladok-attributevarde-utils.",
5
5
  "main": "dist/index.js",
6
6
  "files": [
@@ -21,8 +21,8 @@
21
21
  "build:publish": "npm install --no-workspaces && npm run build"
22
22
  },
23
23
  "dependencies": {
24
- "@kth/ladok-attributvarde-utils": "1.0.0",
25
- "@kth/ladok-mellanlager-client": "1.0.0",
24
+ "@kth/ladok-attributvarde-utils": "1.0.1",
25
+ "@kth/ladok-mellanlager-client": "1.0.1",
26
26
  "date-fns": "^4.1.0",
27
27
  "showdown": "^2.1.0"
28
28
  }