@kth/om-kursen-ladok-client 1.3.6 → 1.3.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/attributVardenConstants.d.ts +3 -0
- package/dist/attributVardenConstants.js +46 -0
- package/dist/attributVardenConstants.js.map +1 -0
- package/dist/createApiClient.js +32 -34
- package/dist/createApiClient.js.map +1 -1
- package/dist/groupSearchResults.d.ts +2 -2
- package/dist/index.d.ts +1 -0
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/mapCourse.d.ts +6 -0
- package/dist/mapCourse.js +28 -2
- package/dist/mapCourse.js.map +1 -1
- package/dist/mapCourseRound.js +2 -1
- package/dist/mapCourseRound.js.map +1 -1
- package/dist/mapCourseSyllabus.d.ts +1 -0
- package/dist/mapCourseSyllabus.js.map +1 -1
- package/dist/mapSearchResult.js.map +1 -1
- package/dist/search/createSearchApi.js +24 -20
- package/dist/search/createSearchApi.js.map +1 -1
- package/dist/search/types.d.ts +44 -10
- package/dist/search/utbildningsTypIdConstants.d.ts +8 -0
- package/dist/search/utbildningsTypIdConstants.js +39 -0
- package/dist/search/utbildningsTypIdConstants.js.map +1 -0
- package/dist/search/utils/getAllEntitiesByUseOfContinuation.d.ts +3 -17
- package/dist/search/utils/getAllEntitiesByUseOfContinuation.js +1 -1
- package/dist/search/utils/getAllEntitiesByUseOfContinuation.js.map +1 -1
- package/dist/search/utils/mapCourseRoundSearchDTO.d.ts +3 -0
- package/dist/search/utils/mapCourseRoundSearchDTO.js +42 -0
- package/dist/search/utils/mapCourseRoundSearchDTO.js.map +1 -0
- package/dist/search/utils/mapCourseVersionDTO.d.ts +3 -0
- package/dist/search/utils/mapCourseVersionDTO.js +14 -0
- package/dist/search/utils/mapCourseVersionDTO.js.map +1 -0
- package/dist/search/utils/searchUtils.d.ts +3 -9
- package/dist/search/utils/searchUtils.js +17 -13
- package/dist/search/utils/searchUtils.js.map +1 -1
- package/dist/types/OmKursenLadokApiClient.d.ts +1 -0
- package/package.json +3 -3
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH = exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS = exports.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS = void 0;
|
|
4
|
+
exports.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS = [
|
|
5
|
+
'utbildning.attribut.betygsskala',
|
|
6
|
+
'utbildning.attribut.huvudomrade.och.successiv.fordjupning',
|
|
7
|
+
'utbildning.attribut.organisation',
|
|
8
|
+
'utbildningstyp',
|
|
9
|
+
'status',
|
|
10
|
+
'avvecklad',
|
|
11
|
+
'utbildning.lokalt.attribut.29.kursstatus.sv',
|
|
12
|
+
'utbildning.lokalt.attribut.29.kursstatus.en',
|
|
13
|
+
'utbildning.lokalt.attribut.29.avvecklingsbeslut.sv',
|
|
14
|
+
'utbildning.lokalt.attribut.29.avvecklingsbeslut.en',
|
|
15
|
+
'utbildning.lokalt.attribut.29.avvecklad.status',
|
|
16
|
+
'utbildning.lokalt.attribut.29.avvecklingsbeslut2.sv',
|
|
17
|
+
'utbildning.lokalt.attribut.29.avvecklingsbeslut2.en',
|
|
18
|
+
'utbildning.lokalt.attribut.29.sista.examinationstermin1.sv',
|
|
19
|
+
'utbildning.lokalt.attribut.29.sista.examinationstermin1.en',
|
|
20
|
+
].join(',');
|
|
21
|
+
exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS = [
|
|
22
|
+
'utbildning.lokalt.attribut.29.malgrupp.sv',
|
|
23
|
+
'utbildning.lokalt.attribut.29.malgrupp.en',
|
|
24
|
+
'utbildning.lokalt.attribut.29.kortnamn.sv',
|
|
25
|
+
'utbildning.lokalt.attribut.29.kortnamn.en',
|
|
26
|
+
'utbildning.lokalt.attribut.29.urvalskriterier.sv',
|
|
27
|
+
'utbildning.lokalt.attribut.29.urvalskriterier.en',
|
|
28
|
+
'utbildning.attribut.undervisningsform',
|
|
29
|
+
'utbildning.attribut.undervisningstid',
|
|
30
|
+
'utbildning.attribut.undervisningssprak',
|
|
31
|
+
'utbildning.attribut.studieort',
|
|
32
|
+
'utbildning.attribut.finansieringsform',
|
|
33
|
+
'utbildning.attribut.studietakt',
|
|
34
|
+
'status',
|
|
35
|
+
'installt',
|
|
36
|
+
'utbildning.attribut.utbildningstillfalleskod',
|
|
37
|
+
'utbildning.lokalt.attribut.29.minantalplatser',
|
|
38
|
+
'utbildning.attribut.utbildningsplatser',
|
|
39
|
+
'utbildning.lokalt.attribut.29.fullsatt',
|
|
40
|
+
].join(',');
|
|
41
|
+
exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH = [
|
|
42
|
+
...exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS.split(','),
|
|
43
|
+
'utbildning.attribut.organisation',
|
|
44
|
+
'utbildning.attribut.startperiod',
|
|
45
|
+
].join(',');
|
|
46
|
+
//# sourceMappingURL=attributVardenConstants.js.map
|
|
@@ -0,0 +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;CAC7D,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;CACzC,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"}
|
package/dist/createApiClient.js
CHANGED
|
@@ -24,6 +24,7 @@ const gradingScalesUtils_1 = require("./utils/gradingScalesUtils");
|
|
|
24
24
|
const partOfProgrammeUtil_1 = require("./utils/partOfProgrammeUtil");
|
|
25
25
|
const programUtil_1 = require("./utils/programUtil");
|
|
26
26
|
const createSearchApi_1 = require("./search/createSearchApi");
|
|
27
|
+
const attributVardenConstants_1 = require("./attributVardenConstants");
|
|
27
28
|
const mergeApiResponses = (a, b, uniqueItemKey) => {
|
|
28
29
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
29
30
|
if (a.type === 'error')
|
|
@@ -62,34 +63,6 @@ const filterAndMapCourseRounds = (response, language, partOfProgrammes) => {
|
|
|
62
63
|
.filter(utils_1.removeCourseRoundsBasedOnTillfalleskod)
|
|
63
64
|
.filter(utils_1.removeCourseRoundsBasedOnFinansieringsform);
|
|
64
65
|
};
|
|
65
|
-
const ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS = [
|
|
66
|
-
'utbildning.attribut.betygsskala',
|
|
67
|
-
'utbildning.attribut.huvudomrade.och.successiv.fordjupning',
|
|
68
|
-
'utbildning.attribut.organisation',
|
|
69
|
-
'utbildningstyp',
|
|
70
|
-
'status',
|
|
71
|
-
'avvecklad',
|
|
72
|
-
].join(',');
|
|
73
|
-
const ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS = [
|
|
74
|
-
'utbildning.lokalt.attribut.29.malgrupp.sv',
|
|
75
|
-
'utbildning.lokalt.attribut.29.malgrupp.en',
|
|
76
|
-
'utbildning.lokalt.attribut.29.kortnamn.sv',
|
|
77
|
-
'utbildning.lokalt.attribut.29.kortnamn.en',
|
|
78
|
-
'utbildning.lokalt.attribut.29.urvalskriterier.sv',
|
|
79
|
-
'utbildning.lokalt.attribut.29.urvalskriterier.en',
|
|
80
|
-
'utbildning.attribut.undervisningsform',
|
|
81
|
-
'utbildning.attribut.undervisningstid',
|
|
82
|
-
'utbildning.attribut.undervisningssprak',
|
|
83
|
-
'utbildning.attribut.studieort',
|
|
84
|
-
'utbildning.attribut.finansieringsform',
|
|
85
|
-
'utbildning.attribut.studietakt',
|
|
86
|
-
'status',
|
|
87
|
-
'installt',
|
|
88
|
-
'utbildning.attribut.utbildningstillfalleskod',
|
|
89
|
-
'utbildning.lokalt.attribut.29.minantalplatser',
|
|
90
|
-
'utbildning.attribut.utbildningsplatser',
|
|
91
|
-
'utbildning.lokalt.attribut.29.fullsatt',
|
|
92
|
-
].join(',');
|
|
93
66
|
const createApiClient = (config) => {
|
|
94
67
|
const ladokClient = (0, ladok_mellanlager_client_1.createClient)(config);
|
|
95
68
|
return {
|
|
@@ -97,7 +70,7 @@ const createApiClient = (config) => {
|
|
|
97
70
|
const result = yield ladokClient.sokUtbildningsInstansSlim({
|
|
98
71
|
kodEllerBenamning: courseCode,
|
|
99
72
|
striktKod: 'true',
|
|
100
|
-
instansAttributVarden: ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS,
|
|
73
|
+
instansAttributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS,
|
|
101
74
|
});
|
|
102
75
|
if (result.type === 'error') {
|
|
103
76
|
return Object.assign({}, result.responseInfo);
|
|
@@ -112,6 +85,31 @@ const createApiClient = (config) => {
|
|
|
112
85
|
const mappedCourse = (0, mapCourse_1.mapCourse)(course, language, gradingScalesCodes);
|
|
113
86
|
return Object.assign(Object.assign({}, result.responseInfo), mappedCourse);
|
|
114
87
|
}),
|
|
88
|
+
getLatestCourseVersionIncludingCancelled: (courseCode, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
89
|
+
const requestObject = {
|
|
90
|
+
kodEllerBenamning: courseCode,
|
|
91
|
+
striktKod: 'true',
|
|
92
|
+
instansAttributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS,
|
|
93
|
+
};
|
|
94
|
+
const [resultActive, resultCancelled] = yield Promise.all([
|
|
95
|
+
ladokClient.sokUtbildningsInstansSlim(Object.assign({}, requestObject)),
|
|
96
|
+
ladokClient.sokUtbildningsInstansSlim(Object.assign(Object.assign({}, requestObject), { avvecklad: 'true' })),
|
|
97
|
+
]);
|
|
98
|
+
const resultActiveAndCancelledVersions = mergeApiResponses(resultActive, resultCancelled, item => item.instans_uid);
|
|
99
|
+
if (resultActiveAndCancelledVersions.type === 'error') {
|
|
100
|
+
return Object.assign({}, resultActiveAndCancelledVersions.responseInfo);
|
|
101
|
+
}
|
|
102
|
+
if (resultActiveAndCancelledVersions.searchMeta.pageResultSize === 0) {
|
|
103
|
+
return Object.assign(Object.assign({}, resultActiveAndCancelledVersions.responseInfo), { statusCode: 404, message: 'not found' });
|
|
104
|
+
}
|
|
105
|
+
const course = resultActiveAndCancelledVersions.items
|
|
106
|
+
.sort((a, b) => parseInt(b.index.versionsnummer) - parseInt(a.index.versionsnummer))
|
|
107
|
+
.at(0);
|
|
108
|
+
const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient);
|
|
109
|
+
const mappedCourse = (0, mapCourse_1.mapCourse)(course, language, gradingScalesCodes);
|
|
110
|
+
console.log(mappedCourse);
|
|
111
|
+
return Object.assign(Object.assign({}, resultActiveAndCancelledVersions.responseInfo), mappedCourse);
|
|
112
|
+
}),
|
|
115
113
|
Search: (0, createSearchApi_1.createSearchApi)(ladokClient),
|
|
116
114
|
getActiveCourseRounds: (courseCode, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
117
115
|
const currentDate = (0, utils_1.getFormattedCurrentDate)();
|
|
@@ -119,7 +117,7 @@ const createApiClient = (config) => {
|
|
|
119
117
|
kodEllerBenamning: courseCode,
|
|
120
118
|
pagaendeDatum: currentDate,
|
|
121
119
|
striktKod: 'true',
|
|
122
|
-
attributVarden: ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
|
|
120
|
+
attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
|
|
123
121
|
instansAttributVarden: 'utbildningstyp,',
|
|
124
122
|
});
|
|
125
123
|
return filterAndMapCourseRounds(result, language);
|
|
@@ -129,7 +127,7 @@ const createApiClient = (config) => {
|
|
|
129
127
|
const requestObject = {
|
|
130
128
|
kodEllerBenamning: courseCode,
|
|
131
129
|
striktKod: 'true',
|
|
132
|
-
attributVarden: ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
|
|
130
|
+
attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
|
|
133
131
|
instansAttributVarden: 'utbildningstyp,',
|
|
134
132
|
};
|
|
135
133
|
const [resultPagaendeDatum, resultTerminsKodStart] = yield Promise.all([
|
|
@@ -155,7 +153,7 @@ const createApiClient = (config) => {
|
|
|
155
153
|
kodEllerBenamning: courseCode,
|
|
156
154
|
terminkodStart: fromPeriod,
|
|
157
155
|
striktKod: 'true',
|
|
158
|
-
attributVarden: ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
|
|
156
|
+
attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
|
|
159
157
|
instansAttributVarden: 'utbildningstyp,',
|
|
160
158
|
});
|
|
161
159
|
return filterAndMapCourseRounds(result, language);
|
|
@@ -165,7 +163,7 @@ const createApiClient = (config) => {
|
|
|
165
163
|
kodEllerBenamning: courseCode,
|
|
166
164
|
startPeriod: startPeriod,
|
|
167
165
|
striktKod: 'true',
|
|
168
|
-
attributVarden: ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
|
|
166
|
+
attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS,
|
|
169
167
|
instansAttributVarden: 'utbildningstyp,',
|
|
170
168
|
});
|
|
171
169
|
return filterAndMapCourseRounds(result, language);
|
|
@@ -213,7 +211,7 @@ const createApiClient = (config) => {
|
|
|
213
211
|
const requestObject = {
|
|
214
212
|
kodEllerBenamning: programCode,
|
|
215
213
|
striktKod: 'true',
|
|
216
|
-
typ: 'program',
|
|
214
|
+
// typ: 'program', TODO: we should revert this back when it is fixed in prod
|
|
217
215
|
instansAttributVarden: 'utbildning.attribut.organisation,utbildningstyp,utbildning.attribut.giltig.from,utbildning.attribut.tilltradesniva,utbildning.lokalt.attribut.29.sista.antagningstermin.en',
|
|
218
216
|
};
|
|
219
217
|
try {
|
|
@@ -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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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { CourseSearchResult, SearchResultPeriod } from './mapSearchResult';
|
|
2
|
-
import { TranslatedGrunddata, TranslatedUtbildningstyp } from './utils';
|
|
2
|
+
import { TranslatedGrunddata, TranslatedStudietakt, TranslatedUtbildningstyp } from './utils';
|
|
3
3
|
export type GroupedCourseSearchResult = Omit<CourseSearchResult, 'studieort' | 'undervisningssprak' | 'utbildningstyp' | 'studietakt' | 'startperiod' | 'period'> & {
|
|
4
4
|
studieort: TranslatedGrunddata[];
|
|
5
5
|
undervisningssprak: TranslatedGrunddata[];
|
|
6
6
|
utbildningstyp: TranslatedUtbildningstyp[];
|
|
7
|
-
studietakt:
|
|
7
|
+
studietakt: TranslatedStudietakt[];
|
|
8
8
|
startperiod: {
|
|
9
9
|
code: string;
|
|
10
10
|
inDigits: string | null;
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -14,9 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.LadokStatusCode = exports.EducationalLevelCode = void 0;
|
|
17
|
+
exports.SearchErrorCode = exports.LadokStatusCode = exports.EducationalLevelCode = void 0;
|
|
18
18
|
__exportStar(require("./createApiClient"), exports);
|
|
19
19
|
var ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
|
|
20
20
|
Object.defineProperty(exports, "EducationalLevelCode", { enumerable: true, get: function () { return ladok_attributvarde_utils_1.EducationalLevelCode; } });
|
|
21
21
|
Object.defineProperty(exports, "LadokStatusCode", { enumerable: true, get: function () { return ladok_attributvarde_utils_1.LadokStatusCode; } });
|
|
22
|
+
var SearchError_1 = require("./search/SearchError");
|
|
23
|
+
Object.defineProperty(exports, "SearchErrorCode", { enumerable: true, get: function () { return SearchError_1.SearchErrorCode; } });
|
|
22
24
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAiC;AACjC,4EAAsF;AAA7E,iIAAA,oBAAoB,OAAA;AAAE,4HAAA,eAAe,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAiC;AACjC,4EAAsF;AAA7E,iIAAA,oBAAoB,OAAA;AAAE,4HAAA,eAAe,OAAA;AAC9C,oDAAsD;AAA7C,8GAAA,eAAe,OAAA"}
|
package/dist/mapCourse.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { LadokStatusCode } from '@kth/ladok-attributvarde-utils';
|
|
1
2
|
import { SokUtbildningsInstansItem, SokUtbildningsInstansSlimItem } from '@kth/ladok-mellanlager-client';
|
|
2
3
|
import { Language, TranslatedGrunddata, TranslatedOrganisation, TranslatedUtbildningstyp } from './utils/languageUtil';
|
|
3
4
|
import { GradingScalesCodes } from './mapGradingScales';
|
|
@@ -9,6 +10,11 @@ export type Course = BasicCourse & {
|
|
|
9
10
|
};
|
|
10
11
|
huvudomraden?: TranslatedGrunddata[];
|
|
11
12
|
schoolCode: string;
|
|
13
|
+
avvecklad?: boolean;
|
|
14
|
+
underavveckling?: boolean;
|
|
15
|
+
avvecklingsbeslut?: string;
|
|
16
|
+
sistaexaminationstermin?: string;
|
|
17
|
+
ladokStatusCode?: LadokStatusCode;
|
|
12
18
|
};
|
|
13
19
|
export type BasicCourse = {
|
|
14
20
|
uid?: string;
|
package/dist/mapCourse.js
CHANGED
|
@@ -25,13 +25,34 @@ const extractBasicData = (course, language) => {
|
|
|
25
25
|
versionsnummer: course.index.versionsnummer,
|
|
26
26
|
};
|
|
27
27
|
};
|
|
28
|
+
const extractDiscontinuationData = (course, language, statusCode) => {
|
|
29
|
+
var _a, _b, _c, _d;
|
|
30
|
+
if (statusCode !== ladok_attributvarde_utils_1.LadokStatusCode.Complete)
|
|
31
|
+
return {};
|
|
32
|
+
const underavvecklingLadok = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(course.Attributvarden, 'avvecklad.status', ladok_attributvarde_utils_1.LokaltAttributType.Boolean);
|
|
33
|
+
const avvecklingsbeslutLadok = (_a = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(course.Attributvarden, 'avvecklingsbeslut2', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _a === void 0 ? void 0 : _a[language];
|
|
34
|
+
const underavvecklingMigrated = ((_b = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(course.Attributvarden, 'kursstatus', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _b === void 0 ? void 0 : _b.en) === 'DEACTIVATED';
|
|
35
|
+
const avvecklingsbeslutMigrated = (_c = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(course.Attributvarden, 'avvecklingsbeslut', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _c === void 0 ? void 0 : _c[language];
|
|
36
|
+
const sistaexaminationstermin = (_d = (0, ladok_attributvarde_utils_1.extractLokaltAttribut)(course.Attributvarden, 'sista.examinationstermin1', ladok_attributvarde_utils_1.LokaltAttributType.LocalizedString)) === null || _d === void 0 ? void 0 : _d[language];
|
|
37
|
+
if (underavvecklingLadok || underavvecklingMigrated) {
|
|
38
|
+
return {
|
|
39
|
+
underavveckling: true,
|
|
40
|
+
avvecklingsbeslut: underavvecklingLadok
|
|
41
|
+
? (avvecklingsbeslutLadok !== null && avvecklingsbeslutLadok !== void 0 ? avvecklingsbeslutLadok : avvecklingsbeslutMigrated)
|
|
42
|
+
: avvecklingsbeslutMigrated,
|
|
43
|
+
sistaexaminationstermin,
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
return {};
|
|
47
|
+
};
|
|
28
48
|
const mapCourse = (course, language, gradingScalesCodes) => {
|
|
49
|
+
const status = (0, ladok_attributvarde_utils_1.extractLadokStatus)(course.Attributvarden);
|
|
29
50
|
const { kod, benamning, omfattning, uid, versionsnummer } = extractBasicData(course, language);
|
|
30
51
|
const betygsskala = (0, ladok_attributvarde_utils_1.extractGrunddata)(course.Attributvarden, 'utbildning.attribut.betygsskala');
|
|
31
52
|
const huvudomraden = (0, ladok_attributvarde_utils_1.extractHuvudomraden)(course.Attributvarden);
|
|
32
53
|
const organisation = (0, ladok_attributvarde_utils_1.extractOrganisation)(course.Attributvarden);
|
|
33
54
|
const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(course.Attributvarden);
|
|
34
|
-
const
|
|
55
|
+
const { underavveckling, avvecklingsbeslut, sistaexaminationstermin } = extractDiscontinuationData(course, language, status === null || status === void 0 ? void 0 : status.code);
|
|
35
56
|
return {
|
|
36
57
|
uid,
|
|
37
58
|
versionsnummer,
|
|
@@ -42,7 +63,12 @@ const mapCourse = (course, language, gradingScalesCodes) => {
|
|
|
42
63
|
utbildningstyp: utbildningstyp && (0, languageUtil_1.translateUtbildningstyp)(utbildningstyp, language),
|
|
43
64
|
betygsskala: betygsskala && Object.assign(Object.assign({}, (0, languageUtil_1.translateGrunddata)(betygsskala, language)), { formatted: gradingScalesCodes[betygsskala.code] }),
|
|
44
65
|
huvudomraden: huvudomraden === null || huvudomraden === void 0 ? void 0 : huvudomraden.map(x => (0, languageUtil_1.translateGrunddata)(x, language)),
|
|
45
|
-
schoolCode,
|
|
66
|
+
schoolCode: (0, schoolUtil_1.extractSchoolCodeFromOrganisation)(organisation, language),
|
|
67
|
+
avvecklad: (0, ladok_attributvarde_utils_1.extractBoolean)(course.Attributvarden, 'avvecklad'),
|
|
68
|
+
underavveckling,
|
|
69
|
+
avvecklingsbeslut,
|
|
70
|
+
sistaexaminationstermin,
|
|
71
|
+
ladokStatusCode: status === null || status === void 0 ? void 0 : status.code,
|
|
46
72
|
};
|
|
47
73
|
};
|
|
48
74
|
exports.mapCourse = mapCourse;
|
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":"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"}
|
package/dist/mapCourseRound.js
CHANGED
|
@@ -27,11 +27,12 @@ const mapCourseRound = (item, language, partOfProgramme) => {
|
|
|
27
27
|
const studietakt = (0, ladok_attributvarde_utils_1.extractStudietakt)(attributeValues);
|
|
28
28
|
return {
|
|
29
29
|
uid: item.tillfalle_uid,
|
|
30
|
-
utbildningstyp: (0, creditsUtil_1.getCreditsUnit)((0, ladok_attributvarde_utils_1.extractUtbildningstyp)(item.instans.Attributvarden), language),
|
|
30
|
+
utbildningstyp: (0, creditsUtil_1.getCreditsUnit)((0, ladok_attributvarde_utils_1.extractUtbildningstyp)(item.instans.Attributvarden), language), // TODO Benni why is this creditUnit and not utbildningstyp?
|
|
31
31
|
status: (0, ladok_attributvarde_utils_1.extractLadokStatus)(item.Attributvarden),
|
|
32
32
|
installt: (_a = (0, ladok_attributvarde_utils_1.extractBoolean)(item.Attributvarden, 'installt')) !== null && _a !== void 0 ? _a : false,
|
|
33
33
|
tillfalleskod: (0, ladok_attributvarde_utils_1.extractString)(attributeValues, 'utbildning.attribut.utbildningstillfalleskod'),
|
|
34
34
|
startperiod: {
|
|
35
|
+
// TODO this uses a different function than startperiod in mapSearchResult
|
|
35
36
|
code: item.index['utbildning.attribut.startperiod.kod'],
|
|
36
37
|
inDigits: (0, utils_1.transformPeriodInDigits)(item.index['utbildning.attribut.startperiod.kod']),
|
|
37
38
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapCourseRound.js","sourceRoot":"","sources":["../src/mapCourseRound.ts"],"names":[],"mappings":";;;AAAA,8EAUuC;AAEvC,mCAOgB;AAChB,qDAAoD;AAoE7C,MAAM,cAAc,GAAG,CAC5B,IAAmE,EACnE,QAAkB,EAClB,eAAmC,EACtB,EAAE;;IACf,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAA;IAE3C,MAAM,QAAQ,GAAG;QACf,EAAE,EAAE,IAAA,yCAAa,EAAC,eAAe,EAAE,2CAA2C,EAAE,MAAM,CAAC;QACvF,EAAE,EAAE,IAAA,yCAAa,EAAC,eAAe,EAAE,2CAA2C,EAAE,MAAM,CAAC;KACxF,CAAA;IAED,MAAM,QAAQ,GAAG;QACf,EAAE,EAAE,IAAA,yCAAa,EAAC,eAAe,EAAE,2CAA2C,CAAC;QAC/E,EAAE,EAAE,IAAA,yCAAa,EAAC,eAAe,EAAE,2CAA2C,CAAC;KAChF,CAAA;IAED,MAAM,eAAe,GAAG;QACtB,EAAE,EAAE,IAAA,yCAAa,EAAC,eAAe,EAAE,kDAAkD,EAAE,MAAM,CAAC;QAC9F,EAAE,EAAE,IAAA,yCAAa,EAAC,eAAe,EAAE,kDAAkD,EAAE,MAAM,CAAC;KAC/F,CAAA;IAED,MAAM,iBAAiB,GAAG,IAAA,4CAAgB,EAAC,eAAe,EAAE,uCAAuC,CAAC,CAAA;IACpG,MAAM,gBAAgB,GAAG,IAAA,4CAAgB,EAAC,eAAe,EAAE,sCAAsC,CAAC,CAAA;IAClG,MAAM,kBAAkB,GAAG,IAAA,4CAAgB,EAAC,eAAe,EAAE,wCAAwC,CAAC,CAAA;IACtG,MAAM,SAAS,GAAG,IAAA,4CAAgB,EAAC,eAAe,EAAE,+BAA+B,CAAC,CAAA;IACpF,MAAM,iBAAiB,GAAG,IAAA,4CAAgB,EAAC,eAAe,EAAE,uCAAuC,CAAC,CAAA;IACpG,MAAM,UAAU,GAAG,IAAA,6CAAiB,EAAC,eAAe,CAAC,CAAA;IAErD,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,aAAa;QACvB,cAAc,EAAE,IAAA,4BAAc,EAAC,IAAA,iDAAqB,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAE,EAAE,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"mapCourseRound.js","sourceRoot":"","sources":["../src/mapCourseRound.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,7 @@ export type KursPlan = {
|
|
|
37
37
|
kursupplagg: string | undefined;
|
|
38
38
|
sarskildbehorighet: string | undefined;
|
|
39
39
|
gammalutrustning: string | undefined;
|
|
40
|
+
avvecklingsbeslut: string | undefined;
|
|
40
41
|
};
|
|
41
42
|
};
|
|
42
43
|
export declare const mapCourseSyllabus: (syllabus: SokPlanItem, gradingScalesCodes: GradingScalesCodes, examinationModules: FormattedExaminationModules, language: Language) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapCourseSyllabus.js","sourceRoot":"","sources":["../src/mapCourseSyllabus.ts"],"names":[],"mappings":";;;;;;AACA,8EAA+E;AAC/E,qDAAgE;AAChE,8EAAsE;AAGtE,mEAAwD;AACxD,wDAA+B;
|
|
1
|
+
{"version":3,"file":"mapCourseSyllabus.js","sourceRoot":"","sources":["../src/mapCourseSyllabus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapSearchResult.js","sourceRoot":"","sources":["../src/mapSearchResult.ts"],"names":[],"mappings":";;;AAAA,8EAOuC;AAGvC,uDAS6B;AAC7B,mCAAoF;AACpF,qDAAgE;AAChE,mDAAsE;
|
|
1
|
+
{"version":3,"file":"mapSearchResult.js","sourceRoot":"","sources":["../src/mapSearchResult.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,9 @@ const errorUtils_1 = require("../utils/errorUtils");
|
|
|
19
19
|
const mapCourse_1 = require("../mapCourse");
|
|
20
20
|
const gradingScalesUtils_1 = require("../utils/gradingScalesUtils");
|
|
21
21
|
const utils_1 = require("../utils");
|
|
22
|
+
const mapCourseRoundSearchDTO_1 = require("./utils/mapCourseRoundSearchDTO");
|
|
23
|
+
const mapCourseVersionDTO_1 = require("./utils/mapCourseVersionDTO");
|
|
24
|
+
const typeChecking_1 = require("../utils/typeChecking");
|
|
22
25
|
const createSearchApi = (ladokClient) => {
|
|
23
26
|
return {
|
|
24
27
|
searchCourses: (searchParams, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -29,7 +32,8 @@ const createSearchApi = (ladokClient) => {
|
|
|
29
32
|
const allCourses = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalleSlim, requestQuery);
|
|
30
33
|
const mappedCourses = allCourses.map(course => (0, mapSearchResult_1.mapKursTillfalleResult)(course, language));
|
|
31
34
|
const groupedCourses = (0, groupSearchResults_1.groupSearchResults)(mappedCourses, filterPeriod);
|
|
32
|
-
|
|
35
|
+
const courseRoundSearchDTOs = groupedCourses.map(mapCourseRoundSearchDTO_1.mapCourseRoundSearchDTO);
|
|
36
|
+
return { searchHits: courseRoundSearchDTOs };
|
|
33
37
|
}
|
|
34
38
|
catch (error) {
|
|
35
39
|
const searchError = (0, errorUtils_1.toSearchError)(error);
|
|
@@ -43,22 +47,15 @@ const createSearchApi = (ladokClient) => {
|
|
|
43
47
|
try {
|
|
44
48
|
(0, searchUtils_1.validateSearchParams)(searchParams);
|
|
45
49
|
const requestQueryForKursInstans = (0, searchUtils_1.prepareSearchRequestQueryForKursInstans)(searchParams);
|
|
46
|
-
const
|
|
50
|
+
const allCourseVersions = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokUtbildningsInstansSlim, requestQueryForKursInstans);
|
|
47
51
|
const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient); // TODO: Use cached values
|
|
48
|
-
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
// TODO Benni
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
versionsnummer: course === null || course === void 0 ? void 0 : course.versionsnummer,
|
|
56
|
-
kod: course.kod,
|
|
57
|
-
benamning: course.benamning,
|
|
58
|
-
omfattning: course.omfattning,
|
|
59
|
-
};
|
|
60
|
-
});
|
|
61
|
-
return { searchHits: basicCourses };
|
|
52
|
+
const allMappedCourseVersions = allCourseVersions.map(courseVersion => (0, mapCourse_1.mapCourse)(courseVersion, language, gradingScalesCodes));
|
|
53
|
+
const latestCourseVersions = findLatestCourseVersions(allMappedCourseVersions);
|
|
54
|
+
// TODO Benni filter out latestCourses if they only have one version
|
|
55
|
+
// TODO Benni add status to CourseVersion
|
|
56
|
+
const latestApprovedCourses = latestCourseVersions;
|
|
57
|
+
const courseVersionDTOs = latestApprovedCourses.map(mapCourseVersionDTO_1.mapCourseVersionDTO);
|
|
58
|
+
return { searchHits: courseVersionDTOs };
|
|
62
59
|
}
|
|
63
60
|
catch (error) {
|
|
64
61
|
const searchError = (0, errorUtils_1.toSearchError)(error);
|
|
@@ -85,10 +82,17 @@ const extractUtbildningstypItems = (utbildningstypApiCall) => __awaiter(void 0,
|
|
|
85
82
|
}
|
|
86
83
|
return utbildningstypResponse.data.Utbildningstyp;
|
|
87
84
|
});
|
|
88
|
-
// TODO Benni: refactor
|
|
89
|
-
|
|
85
|
+
// TODO Benni: refactor or remove this function if it is not needed anymore (basically a failsafe)
|
|
86
|
+
/**
|
|
87
|
+
* This function takes an array of courseVersions, groups them by their kod, and finds the latest version of each course.
|
|
88
|
+
* It returns an array of distinct courses (based on kod).
|
|
89
|
+
* This should not be needed anymore since we are using the "senasteversion" in the search.
|
|
90
|
+
* @param courseVersions
|
|
91
|
+
* @returns
|
|
92
|
+
*/
|
|
93
|
+
const findLatestCourseVersions = (courseVersions) => {
|
|
90
94
|
const coursesGroupedByKurskod = new Map();
|
|
91
|
-
for (const course of
|
|
95
|
+
for (const course of courseVersions) {
|
|
92
96
|
if (!coursesGroupedByKurskod.has(course.kod)) {
|
|
93
97
|
coursesGroupedByKurskod.set(course.kod, []);
|
|
94
98
|
}
|
|
@@ -97,7 +101,7 @@ const findLatestCourses = (mappedCourses) => {
|
|
|
97
101
|
const courseVersionsGroupedByKurskodArray = Array.from(coursesGroupedByKurskod.entries()).map(([, value]) => value);
|
|
98
102
|
const latestDefinedCourses = courseVersionsGroupedByKurskodArray
|
|
99
103
|
.map(courses => (0, utils_1.findLatestVersion)(courses))
|
|
100
|
-
.filter(
|
|
104
|
+
.filter(typeChecking_1.isDefined);
|
|
101
105
|
return latestDefinedCourses;
|
|
102
106
|
};
|
|
103
107
|
//# sourceMappingURL=createSearchApi.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":"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"}
|
package/dist/search/types.d.ts
CHANGED
|
@@ -1,15 +1,11 @@
|
|
|
1
|
-
import { GroupedCourseSearchResult } from '../groupSearchResults';
|
|
2
|
-
import { BasicCourse } from '../mapCourse';
|
|
3
1
|
import { Language } from '../utils';
|
|
4
2
|
export type SearchApi = {
|
|
5
|
-
searchCourses: (searchParams: SearchParams, language: Language) => Promise<
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
errorCode?: string;
|
|
12
|
-
} | string>;
|
|
3
|
+
searchCourses: (searchParams: SearchParams, language: Language) => Promise<SearchCourseResponse<CourseRoundSearchDTO>>;
|
|
4
|
+
searchCourseVersions: (searchParams: SearchParams, language: Language) => Promise<SearchCourseResponse<CourseVersionDTO>>;
|
|
5
|
+
};
|
|
6
|
+
export type SearchCourseResponse<T> = {
|
|
7
|
+
searchHits: T[];
|
|
8
|
+
errorCode?: string;
|
|
13
9
|
};
|
|
14
10
|
export type SearchParams = {
|
|
15
11
|
kodEllerBenamning?: string;
|
|
@@ -19,3 +15,41 @@ export type SearchParams = {
|
|
|
19
15
|
startPeriod?: string[];
|
|
20
16
|
utbildningsniva?: string[];
|
|
21
17
|
};
|
|
18
|
+
export type CourseVersionDTO = {
|
|
19
|
+
kod: string;
|
|
20
|
+
benamning: string;
|
|
21
|
+
omfattning: string;
|
|
22
|
+
utbildningstyp: string;
|
|
23
|
+
};
|
|
24
|
+
export type CourseRoundSearchDTO = {
|
|
25
|
+
kod: string;
|
|
26
|
+
benamning: string;
|
|
27
|
+
omfattning: string;
|
|
28
|
+
startTerm?: string;
|
|
29
|
+
perioder: {
|
|
30
|
+
startPeriod?: number;
|
|
31
|
+
startPeriodYear: string;
|
|
32
|
+
endPeriod?: number;
|
|
33
|
+
endPeriodYear: string;
|
|
34
|
+
tillfallesperioderNummer?: number;
|
|
35
|
+
}[];
|
|
36
|
+
utbildningstyper: string[];
|
|
37
|
+
studietakter: number[];
|
|
38
|
+
undervisningssprak: string[];
|
|
39
|
+
studieorter: string[];
|
|
40
|
+
};
|
|
41
|
+
export type RequestQuery = {
|
|
42
|
+
attributVarden?: string;
|
|
43
|
+
instansAttributVarden: string;
|
|
44
|
+
antalTraffar: string;
|
|
45
|
+
avvecklad?: string | undefined;
|
|
46
|
+
sprak?: string | undefined;
|
|
47
|
+
organisation?: string | undefined;
|
|
48
|
+
utbildningsniva: string;
|
|
49
|
+
kodEllerBenamning: string;
|
|
50
|
+
utbildningstypid?: string;
|
|
51
|
+
} & ({
|
|
52
|
+
startPeriod: string;
|
|
53
|
+
} | {
|
|
54
|
+
terminkodStart: string;
|
|
55
|
+
});
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The utbildningstyp Ids that we are interested in when searching for courseVersions.
|
|
3
|
+
*/
|
|
4
|
+
export declare const VERSION_UTBILDNINGSTYP_IDS: string;
|
|
5
|
+
/**
|
|
6
|
+
* The utbildningstyp Ids that we are interested in when searching for courseInstances.
|
|
7
|
+
*/
|
|
8
|
+
export declare const INSTANCE_UTBILDNINGSTYP_IDS: string;
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.INSTANCE_UTBILDNINGSTYP_IDS = exports.VERSION_UTBILDNINGSTYP_IDS = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* The utbildningstyp Ids that we are interested in when searching for courseVersions.
|
|
6
|
+
*/
|
|
7
|
+
exports.VERSION_UTBILDNINGSTYP_IDS = [
|
|
8
|
+
22, // 2007GKURS
|
|
9
|
+
24, // 2007AKURS
|
|
10
|
+
101378, // FUPKURS
|
|
11
|
+
101954, // 2007FKURS (forskar)
|
|
12
|
+
101992, // UPHPGKURS
|
|
13
|
+
101993, // UPHPAKURS
|
|
14
|
+
102006, // UPVKURS (veckor)
|
|
15
|
+
105630, // 0793GKURS
|
|
16
|
+
105631, // 0793AKURS
|
|
17
|
+
121910, // 20073KURS (forskar)
|
|
18
|
+
].join(',');
|
|
19
|
+
/**
|
|
20
|
+
* The utbildningstyp Ids that we are interested in when searching for courseInstances.
|
|
21
|
+
*/
|
|
22
|
+
exports.INSTANCE_UTBILDNINGSTYP_IDS = [
|
|
23
|
+
101382, // FUPKTF
|
|
24
|
+
52, // 2007KTF
|
|
25
|
+
101955, // 2007FKTF (forskar)
|
|
26
|
+
101994, // UPHPKTF
|
|
27
|
+
102008, // UPVKTF (veckor)
|
|
28
|
+
105632, // 0793KTF
|
|
29
|
+
121911, // 20073KTF (forskar)
|
|
30
|
+
].join(',');
|
|
31
|
+
const VERSION_UTBILDNINGSTYP_IDS_FORSKAR = [
|
|
32
|
+
101954, // 2007FKURS (forskar)
|
|
33
|
+
121910, // 20073KURS (forskar)
|
|
34
|
+
].join(',');
|
|
35
|
+
const INSTANCE_UTBILDNINGSTYP_IDS_FORSKAR = [
|
|
36
|
+
101955, // 2007FKTF (forskar),
|
|
37
|
+
121911, // 20073KTF (forskar)
|
|
38
|
+
].join(',');
|
|
39
|
+
//# sourceMappingURL=utbildningsTypIdConstants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utbildningsTypIdConstants.js","sourceRoot":"","sources":["../../src/search/utbildningsTypIdConstants.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,0BAA0B,GAAG;IACxC,EAAE,EAAE,YAAY;IAChB,EAAE,EAAE,YAAY;IAChB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,sBAAsB;IAC9B,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,oBAAoB;IAC5B,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,sBAAsB;CAC/B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEX;;GAEG;AACU,QAAA,2BAA2B,GAAG;IACzC,MAAM,EAAE,SAAS;IACjB,EAAE,EAAE,UAAU;IACd,MAAM,EAAE,qBAAqB;IAC7B,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,kBAAkB;IAC1B,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,qBAAqB;CAC9B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEX,MAAM,kCAAkC,GAAG;IACzC,MAAM,EAAE,sBAAsB;IAC9B,MAAM,EAAE,sBAAsB;CAC/B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEX,MAAM,mCAAmC,GAAG;IAC1C,MAAM,EAAE,sBAAsB;IAC9B,MAAM,EAAE,qBAAqB;CAC9B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA"}
|
|
@@ -1,18 +1,4 @@
|
|
|
1
|
-
import { MellanlagringSearchResponse } from '@kth/ladok-mellanlager-client';
|
|
2
|
-
export
|
|
3
|
-
attributVarden: string;
|
|
4
|
-
instansAttributVarden: string;
|
|
5
|
-
antalTraffar: string;
|
|
6
|
-
avvecklad?: string | undefined;
|
|
7
|
-
sprak?: string | undefined;
|
|
8
|
-
organisation?: string | undefined;
|
|
9
|
-
utbildningsniva: string;
|
|
10
|
-
kodEllerBenamning: string;
|
|
11
|
-
} & ({
|
|
12
|
-
startPeriod: string;
|
|
13
|
-
} | {
|
|
14
|
-
terminkodStart: string;
|
|
15
|
-
});
|
|
16
|
-
export declare const getAllEntitiesByUseOfContinuation: <T>(apiCall: (requestQuery: RequestQuery, requestHeader?: {
|
|
1
|
+
import { MellanlagringSearchResponse, SokUtbildningsInstansSlimQuery, SokUtbildningsTillfalleSlimQuery } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
export declare const getAllEntitiesByUseOfContinuation: <T, K extends SokUtbildningsInstansSlimQuery | SokUtbildningsTillfalleSlimQuery>(apiCall: (requestQuery: K, requestHeader?: {
|
|
17
3
|
continuationToken?: string;
|
|
18
|
-
}) => Promise<MellanlagringSearchResponse<T>>, requestQuery:
|
|
4
|
+
}) => Promise<MellanlagringSearchResponse<T>>, requestQuery: K) => Promise<T[]>;
|
|
@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.getAllEntitiesByUseOfContinuation = void 0;
|
|
13
13
|
const SearchError_1 = require("../SearchError");
|
|
14
|
-
const MAX_SEARCH_RESULTS_TO_RETURN = 250;
|
|
14
|
+
const MAX_SEARCH_RESULTS_TO_RETURN = 250; // TODO Benni, make sure to adjust this. We do not want to have more than 250 results in the UI, but here it could be more
|
|
15
15
|
const MAX_CONTINUATION_ITERATIONS = 4;
|
|
16
16
|
const getAllEntitiesByUseOfContinuation = (apiCall, requestQuery) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
17
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAllEntitiesByUseOfContinuation.js","sourceRoot":"","sources":["../../../src/search/utils/getAllEntitiesByUseOfContinuation.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"getAllEntitiesByUseOfContinuation.js","sourceRoot":"","sources":["../../../src/search/utils/getAllEntitiesByUseOfContinuation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,gDAA4C;AAE5C,MAAM,4BAA4B,GAAG,GAAG,CAAA,CAAC,0HAA0H;AACnK,MAAM,2BAA2B,GAAG,CAAC,CAAA;AAE9B,MAAM,iCAAiC,GAAG,CAI/C,OAK4C,EAC5C,YAAe,EACD,EAAE;;IAChB,IAAI,iBAAiB,GAAuB,SAAS,CAAA;IACrD,IAAI,cAAc,GAAG,CAAC,CAAA;IACtB,IAAI,WAAW,GAAQ,EAAE,CAAA;IAEzB,GAAG,CAAC;QACF,IAAI,cAAc,IAAI,2BAA2B,EAAE,CAAC;YAClD,MAAM,yBAAW,CAAC,QAAQ,CAAC,sDAAsD,2BAA2B,EAAE,CAAC,CAAA;QACjH,CAAC;QACD,MAAM,aAAa,qBACd,CAAC,iBAAiB,KAAK,IAAI,IAAI,iBAAiB,KAAK,SAAS,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAC5F,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,aAAa,CAAC,CAAA;QAEzD,oGAAoG;QACpG,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,yBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACnC,CAAC;QAED,oGAAoG;QACpG,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,yBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QACxD,CAAC;QAED,IAAI,MAAM,CAAC,UAAU,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;YAC3C,mHAAmH;YACnH,OAAO,EAAE,CAAA;QACX,CAAC;QAED,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE9C,IAAI,WAAW,CAAC,MAAM,GAAG,4BAA4B,EAAE,CAAC;YACtD,MAAM,yBAAW,CAAC,QAAQ,CAAC,wCAAwC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QAC1F,CAAC;QAED,iBAAiB,GAAG,MAAA,MAAM,CAAC,UAAU,CAAC,iBAAiB,mCAAI,SAAS,CAAA;QACpE,cAAc,EAAE,CAAA;IAClB,CAAC,QAAQ,iBAAiB,EAAC;IAE3B,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA,CAAA;AAnDY,QAAA,iCAAiC,qCAmD7C"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.mapCourseRoundSearchDTO = void 0;
|
|
4
|
+
const typeChecking_1 = require("../../utils/typeChecking");
|
|
5
|
+
const castToString = (value) => {
|
|
6
|
+
if (typeof value === 'string') {
|
|
7
|
+
return value;
|
|
8
|
+
}
|
|
9
|
+
if (typeof value === 'number') {
|
|
10
|
+
return value.toString();
|
|
11
|
+
}
|
|
12
|
+
return '';
|
|
13
|
+
};
|
|
14
|
+
const mapCourseRoundSearchDTO = (courseRound) => {
|
|
15
|
+
var _a;
|
|
16
|
+
const utbildningstyper = courseRound.utbildningstyp.map(({ level: { name: educationalLevel = '' } = {} }) => educationalLevel);
|
|
17
|
+
const studietakter = courseRound.studietakt.map(({ takt }) => takt).filter(typeChecking_1.isDefined);
|
|
18
|
+
const undervisningssprak = courseRound.undervisningssprak.map(({ name: courseLanguage = '' }) => courseLanguage);
|
|
19
|
+
const studieorter = courseRound.studieort.map(({ name: courseCampus = '' }) => courseCampus);
|
|
20
|
+
const allStartPeriods = courseRound.startperiod.map(({ code: startTerm = '' }) => startTerm);
|
|
21
|
+
const startTerm = allStartPeriods.length === 1 ? allStartPeriods[0] : undefined;
|
|
22
|
+
const perioder = courseRound.period.map(({ forstaUndervisningsdatum: { year: startPeriodYear, period: startPeriod } = {}, sistaUndervisningsdatum: { year: endPeriodYear, period: endPeriod } = {}, tillfallesperioderNummer = undefined, }) => ({
|
|
23
|
+
startPeriodYear: castToString(startPeriodYear),
|
|
24
|
+
startPeriod,
|
|
25
|
+
endPeriodYear: castToString(endPeriodYear),
|
|
26
|
+
endPeriod,
|
|
27
|
+
tillfallesperioderNummer,
|
|
28
|
+
}));
|
|
29
|
+
return {
|
|
30
|
+
kod: courseRound.kod,
|
|
31
|
+
benamning: courseRound.benamning,
|
|
32
|
+
omfattning: (_a = courseRound.omfattning.formattedWithUnit) !== null && _a !== void 0 ? _a : '',
|
|
33
|
+
utbildningstyper,
|
|
34
|
+
studietakter,
|
|
35
|
+
undervisningssprak,
|
|
36
|
+
studieorter,
|
|
37
|
+
startTerm,
|
|
38
|
+
perioder,
|
|
39
|
+
};
|
|
40
|
+
};
|
|
41
|
+
exports.mapCourseRoundSearchDTO = mapCourseRoundSearchDTO;
|
|
42
|
+
//# sourceMappingURL=mapCourseRoundSearchDTO.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mapCourseRoundSearchDTO.js","sourceRoot":"","sources":["../../../src/search/utils/mapCourseRoundSearchDTO.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;AAIpD,MAAM,YAAY,GAAG,CAAC,KAAkC,EAAU,EAAE;IAClE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAA;IACzB,CAAC;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAEM,MAAM,uBAAuB,GAAG,CAAC,WAAsC,EAAwB,EAAE;;IACtG,MAAM,gBAAgB,GAAa,WAAW,CAAC,cAAc,CAAC,GAAG,CAC/D,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,gBAAgB,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,gBAAgB,CACtE,CAAA;IAED,MAAM,YAAY,GAAa,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,wBAAS,CAAC,CAAA;IAE/F,MAAM,kBAAkB,GAAa,WAAW,CAAC,kBAAkB,CAAC,GAAG,CACrE,CAAC,EAAE,IAAI,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,cAAc,CAClD,CAAA;IAED,MAAM,WAAW,GAAa,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,CAAA;IAEtG,MAAM,eAAe,GAAa,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAA;IACtG,MAAM,SAAS,GAAuB,eAAe,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEnG,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,CACrC,CAAC,EACC,wBAAwB,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,EAC7E,uBAAuB,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EACxE,wBAAwB,GAAG,SAAS,GACrC,EAAE,EAAE,CAAC,CAAC;QACL,eAAe,EAAE,YAAY,CAAC,eAAe,CAAC;QAC9C,WAAW;QACX,aAAa,EAAE,YAAY,CAAC,aAAa,CAAC;QAC1C,SAAS;QACT,wBAAwB;KACzB,CAAC,CACH,CAAA;IAED,OAAO;QACL,GAAG,EAAE,WAAW,CAAC,GAAG;QACpB,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,UAAU,EAAE,MAAA,WAAW,CAAC,UAAU,CAAC,iBAAiB,mCAAI,EAAE;QAC1D,gBAAgB;QAChB,YAAY;QACZ,kBAAkB;QAClB,WAAW;QACX,SAAS;QACT,QAAQ;KACT,CAAA;AACH,CAAC,CAAA;AAzCY,QAAA,uBAAuB,2BAyCnC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.mapCourseVersionDTO = void 0;
|
|
4
|
+
const mapCourseVersionDTO = (courseVersion) => {
|
|
5
|
+
var _a, _b;
|
|
6
|
+
return {
|
|
7
|
+
kod: courseVersion.kod,
|
|
8
|
+
benamning: courseVersion.benamning,
|
|
9
|
+
omfattning: courseVersion.omfattning.formattedWithUnit,
|
|
10
|
+
utbildningstyp: (_b = (_a = courseVersion.utbildningstyp) === null || _a === void 0 ? void 0 : _a.level.name) !== null && _b !== void 0 ? _b : '',
|
|
11
|
+
};
|
|
12
|
+
};
|
|
13
|
+
exports.mapCourseVersionDTO = mapCourseVersionDTO;
|
|
14
|
+
//# sourceMappingURL=mapCourseVersionDTO.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mapCourseVersionDTO.js","sourceRoot":"","sources":["../../../src/search/utils/mapCourseVersionDTO.ts"],"names":[],"mappings":";;;AAGO,MAAM,mBAAmB,GAAG,CAAC,aAAqB,EAAoB,EAAE;;IAC7E,OAAO;QACL,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,iBAAiB;QACtD,cAAc,EAAE,MAAA,MAAA,aAAa,CAAC,cAAc,0CAAE,KAAK,CAAC,IAAI,mCAAI,EAAE;KAC/D,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,mBAAmB,uBAO/B"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { UtbildningstypItem } from '@kth/ladok-mellanlager-client';
|
|
2
|
-
import { SearchParams } from '../types';
|
|
3
|
-
import { RequestQuery } from './getAllEntitiesByUseOfContinuation';
|
|
1
|
+
import { SokUtbildningsInstansSlimQuery, UtbildningstypItem } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
import { RequestQuery, SearchParams } from '../types';
|
|
4
3
|
/**
|
|
5
4
|
* Throws an error if the searchParams are invalid.
|
|
6
5
|
* @param searchParams
|
|
@@ -10,9 +9,4 @@ export declare const prepareSearchRequestQueryForKursTillfallen: (utbildningstyp
|
|
|
10
9
|
requestQuery: RequestQuery;
|
|
11
10
|
filterPeriod: boolean;
|
|
12
11
|
};
|
|
13
|
-
export declare const prepareSearchRequestQueryForKursInstans: (searchParams: SearchParams) =>
|
|
14
|
-
kodEllerBenamning: string | undefined;
|
|
15
|
-
antalTraffar: string;
|
|
16
|
-
avvecklad: string;
|
|
17
|
-
utbildningstypgrundtyp: string;
|
|
18
|
-
};
|
|
12
|
+
export declare const prepareSearchRequestQueryForKursInstans: (searchParams: SearchParams) => NonNullable<SokUtbildningsInstansSlimQuery>;
|
|
@@ -4,6 +4,8 @@ exports.prepareSearchRequestQueryForKursInstans = exports.prepareSearchRequestQu
|
|
|
4
4
|
const SearchError_1 = require("../SearchError");
|
|
5
5
|
const utils_1 = require("../../utils");
|
|
6
6
|
const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
|
|
7
|
+
const utbildningsTypIdConstants_1 = require("../utbildningsTypIdConstants");
|
|
8
|
+
const attributVardenConstants_1 = require("../../attributVardenConstants");
|
|
7
9
|
/**
|
|
8
10
|
* Throws an error if the searchParams are invalid.
|
|
9
11
|
* @param searchParams
|
|
@@ -19,28 +21,30 @@ const validateSearchParams = (searchParams) => {
|
|
|
19
21
|
};
|
|
20
22
|
exports.validateSearchParams = validateSearchParams;
|
|
21
23
|
const MAX_ANTAL_TRAFFAR = '100';
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
24
|
+
// TODO Benni, maybe this does not make things cleaner, observe
|
|
25
|
+
// TODO Benni don't forget this when cleaning up types on query object
|
|
26
|
+
const DEFAULT_INSTANCE_QUERY_PARAMS = {
|
|
27
|
+
attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH,
|
|
28
|
+
instansAttributVarden: 'utbildningstyp',
|
|
25
29
|
antalTraffar: MAX_ANTAL_TRAFFAR,
|
|
26
30
|
};
|
|
27
31
|
const prepareSearchRequestQueryForKursTillfallen = (utbildningstyper, searchParams) => {
|
|
28
32
|
const { kodEllerBenamning, organisation, sprak, startPeriod, utbildningsniva, avvecklad } = searchParams;
|
|
29
33
|
const educationalTypes = filterAndMapEducationalTypes({ utbildningsniva, utbildningstyper });
|
|
30
34
|
const filterPeriod = !Boolean(startPeriod);
|
|
31
|
-
const requestQuery = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*' }, getStartPeriodOrTerminkodStart(startPeriod)), (educationalTypes && { utbildningsniva: educationalTypes.join(',') })), (organisation && { organisation })), (sprak && { sprak })), (avvecklad && { avvecklad })),
|
|
35
|
+
const requestQuery = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*' }, getStartPeriodOrTerminkodStart(startPeriod)), (educationalTypes && { utbildningsniva: educationalTypes.join(',') })), (organisation && { organisation })), (sprak && { sprak })), (avvecklad && { avvecklad })), DEFAULT_INSTANCE_QUERY_PARAMS), { utbildningstypid: utbildningsTypIdConstants_1.INSTANCE_UTBILDNINGSTYP_IDS });
|
|
32
36
|
return { requestQuery, filterPeriod }; // TODO Benni this does two things, filterPeriod should probably be split out
|
|
33
37
|
};
|
|
34
38
|
exports.prepareSearchRequestQueryForKursTillfallen = prepareSearchRequestQueryForKursTillfallen;
|
|
35
|
-
const prepareSearchRequestQueryForKursInstans = (searchParams) => {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
};
|
|
39
|
+
const prepareSearchRequestQueryForKursInstans = (searchParams) => ({
|
|
40
|
+
kodEllerBenamning: searchParams.kodEllerBenamning,
|
|
41
|
+
antalTraffar: MAX_ANTAL_TRAFFAR,
|
|
42
|
+
avvecklad: 'false',
|
|
43
|
+
utbildningstypgrundtyp: 'KURS',
|
|
44
|
+
utbildningstypid: utbildningsTypIdConstants_1.VERSION_UTBILDNINGSTYP_IDS,
|
|
45
|
+
instansAttributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS,
|
|
46
|
+
senasteversion: 'true',
|
|
47
|
+
});
|
|
44
48
|
exports.prepareSearchRequestQueryForKursInstans = prepareSearchRequestQueryForKursInstans;
|
|
45
49
|
const filterAndMapEducationalTypes = ({ utbildningsniva, utbildningstyper: ladokTypes, }) => {
|
|
46
50
|
if (!utbildningsniva)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchUtils.js","sourceRoot":"","sources":["../../../src/search/utils/searchUtils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"searchUtils.js","sourceRoot":"","sources":["../../../src/search/utils/searchUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { ProgramTillfalle } from '../mapProgramTillfalle';
|
|
|
10
10
|
import { SearchApi } from '../search/types';
|
|
11
11
|
export type OmKursenLadokApiClient = {
|
|
12
12
|
getLatestCourseVersion: (courseCode: string, language: Language) => Promise<(Course & ResponseInfo) | ResponseInfo>;
|
|
13
|
+
getLatestCourseVersionIncludingCancelled: (courseCode: string, language: Language) => Promise<(Course & ResponseInfo) | ResponseInfo>;
|
|
13
14
|
Search: SearchApi;
|
|
14
15
|
getActiveCourseRounds: (courseCode: string, language: Language) => Promise<CourseRound[] | undefined>;
|
|
15
16
|
getActiveAndFutureCourseRounds: (courseCode: string, language: Language) => Promise<CourseRound[] | undefined>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kth/om-kursen-ladok-client",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.8",
|
|
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": "0.1.
|
|
25
|
-
"@kth/ladok-mellanlager-client": "0.4.
|
|
24
|
+
"@kth/ladok-attributvarde-utils": "0.1.6",
|
|
25
|
+
"@kth/ladok-mellanlager-client": "0.4.5",
|
|
26
26
|
"date-fns": "^4.1.0",
|
|
27
27
|
"showdown": "^2.1.0"
|
|
28
28
|
}
|