@kth/om-kursen-ladok-client 1.0.6 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19,6 +19,7 @@ const utils_1 = require("./utils");
19
19
  const mapUtbildningsplan_1 = require("./mapUtbildningsplan");
20
20
  const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
21
21
  const examinationModulesUtil_1 = require("./utils/examinationModulesUtil");
22
+ const gradingScalesUtils_1 = require("./utils/gradingScalesUtils");
22
23
  const filterAndMapCourseRounds = (response, language) => {
23
24
  if (response.type === "error") {
24
25
  throw new Error(`API error: ${response.responseInfo.message}`);
@@ -46,7 +47,8 @@ const createApiClient = (config) => {
46
47
  const course = result.items
47
48
  .sort((a, b) => parseInt(b.index.versionsnummer) - parseInt(a.index.versionsnummer))
48
49
  .at(0);
49
- const mappedCourse = (0, mapCourse_1.mapCourse)(course, language);
50
+ const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient);
51
+ const mappedCourse = (0, mapCourse_1.mapCourse)(course, language, gradingScalesCodes);
50
52
  return Object.assign(Object.assign({}, result.responseInfo), mappedCourse);
51
53
  }),
52
54
  searchCourses: (searchParams, language) => __awaiter(void 0, void 0, void 0, function* () {
@@ -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,5 +1,6 @@
1
1
  import { SokUtbildningsInstansItem } from "@kth/ladok-mellanlager-client";
2
2
  import { Language, TranslatedGrunddata, TranslatedOrganisation, TranslatedUtbildningstyp } from "./utils/languageUtil";
3
+ import { GradingScalesCodes } from "./mapGradingScales";
3
4
  export type Course = {
4
5
  uid: string;
5
6
  versionsnummer: string;
@@ -11,8 +12,10 @@ export type Course = {
11
12
  };
12
13
  organisation?: TranslatedOrganisation;
13
14
  utbildningstyp?: TranslatedUtbildningstyp;
14
- betygsskala?: TranslatedGrunddata;
15
+ betygsskala?: TranslatedGrunddata & {
16
+ formatted: string | undefined;
17
+ };
15
18
  huvudomraden?: TranslatedGrunddata[];
16
19
  schoolCode: string;
17
20
  };
18
- export declare const mapCourse: (course: SokUtbildningsInstansItem, language: Language) => Course;
21
+ export declare const mapCourse: (course: SokUtbildningsInstansItem, language: Language, gradingScalesCodes: GradingScalesCodes) => Course;
package/dist/mapCourse.js CHANGED
@@ -5,7 +5,7 @@ const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
5
5
  const languageUtil_1 = require("./utils/languageUtil");
6
6
  const creditsUtil_1 = require("./utils/creditsUtil");
7
7
  const schoolUtil_1 = require("./utils/schoolUtil");
8
- const mapCourse = (course, language) => {
8
+ const mapCourse = (course, language, gradingScalesCodes) => {
9
9
  const benamning = {
10
10
  sv: course.index["utbildning.attribut.svensk.benamning"],
11
11
  en: course.index["utbildning.attribut.engelsk.benamning"],
@@ -27,7 +27,7 @@ const mapCourse = (course, language) => {
27
27
  },
28
28
  organisation: organisation && (0, languageUtil_1.translateOrganisation)(organisation, language),
29
29
  utbildningstyp: utbildningstyp && (0, languageUtil_1.translateUtbildningstyp)(utbildningstyp, language),
30
- betygsskala: betygsskala && (0, languageUtil_1.translateGrunddata)(betygsskala, language),
30
+ betygsskala: betygsskala && Object.assign(Object.assign({}, (0, languageUtil_1.translateGrunddata)(betygsskala, language)), { formatted: gradingScalesCodes[betygsskala.code] }),
31
31
  huvudomraden: huvudomraden === null || huvudomraden === void 0 ? void 0 : huvudomraden.map((x) => (0, languageUtil_1.translateGrunddata)(x, language)),
32
32
  schoolCode,
33
33
  };
@@ -1 +1 @@
1
- {"version":3,"file":"mapCourse.js","sourceRoot":"","sources":["../src/mapCourse.ts"],"names":[],"mappings":";;;AAAA,8EAKwC;AAGxC,uDAQ8B;AAC9B,qDAAiE;AACjE,mDAAuE;AAkBhE,MAAM,SAAS,GAAG,CACvB,MAAiC,EACjC,QAAkB,EACV,EAAE;IACV,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC;QACxD,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC;KAC1D,CAAC;IACF,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAClC,MAAM,CAAC,cAAc,EACrB,iCAAiC,CAClC,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAEpE,MAAM,UAAU,GAAG,IAAA,8CAAiC,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAE7E,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAElE,OAAO;QACL,GAAG,EAAE,MAAM,CAAC,WAAY;QACxB,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc;QAC3C,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC;QAC5C,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC;QAC9B,UAAU,EAAE;YACV,MAAM,EAAE,UAAU;YAClB,iBAAiB,EAAE,IAAA,wCAA0B,EAC3C,UAAU,EACV,cAAc,EACd,QAAQ,CACT;SACF;QACD,YAAY,EAAE,YAAY,IAAI,IAAA,oCAAqB,EAAC,YAAY,EAAE,QAAQ,CAAC;QAC3E,cAAc,EACZ,cAAc,IAAI,IAAA,sCAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;QACrE,WAAW,EAAE,WAAW,IAAI,IAAA,iCAAkB,EAAC,WAAW,EAAE,QAAQ,CAAC;QACrE,YAAY,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,iCAAkB,EAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACvE,UAAU;KACX,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,SAAS,aAwCpB"}
1
+ {"version":3,"file":"mapCourse.js","sourceRoot":"","sources":["../src/mapCourse.ts"],"names":[],"mappings":";;;AAAA,8EAKwC;AAGxC,uDAQ8B;AAC9B,qDAAiE;AACjE,mDAAuE;AAmBhE,MAAM,SAAS,GAAG,CACvB,MAAiC,EACjC,QAAkB,EAClB,kBAAsC,EAC9B,EAAE;IACV,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC;QACxD,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC;KAC1D,CAAC;IACF,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAClC,MAAM,CAAC,cAAc,EACrB,iCAAiC,CAClC,CAAC;IACF,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAA,+CAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAEpE,MAAM,UAAU,GAAG,IAAA,8CAAiC,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAE7E,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAElE,OAAO;QACL,GAAG,EAAE,MAAM,CAAC,WAAY;QACxB,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc;QAC3C,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC;QAC5C,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC;QAC9B,UAAU,EAAE;YACV,MAAM,EAAE,UAAU;YAClB,iBAAiB,EAAE,IAAA,wCAA0B,EAC3C,UAAU,EACV,cAAc,EACd,QAAQ,CACT;SACF;QACD,YAAY,EAAE,YAAY,IAAI,IAAA,oCAAqB,EAAC,YAAY,EAAE,QAAQ,CAAC;QAC3E,cAAc,EACZ,cAAc,IAAI,IAAA,sCAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;QACrE,WAAW,EAAE,WAAW,oCACnB,IAAA,iCAAkB,EAAC,WAAW,EAAE,QAAQ,CAAC,KAC5C,SAAS,EAAE,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,GAChD;QACD,YAAY,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,iCAAkB,EAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACvE,UAAU;KACX,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,SAAS,aA4CpB"}
@@ -1,15 +1,18 @@
1
1
  import { Utbildningsinstans } from "@kth/ladok-mellanlager-client";
2
2
  import { Language, TranslatedGrunddata } from "./utils";
3
3
  import { Grunddata } from "@kth/ladok-attributvarde-utils";
4
+ import { GradingScalesCodes } from "./mapGradingScales";
4
5
  export type ExaminationModule = {
5
6
  ladokUID: string;
6
7
  kod: string;
7
8
  benamning: string | undefined;
8
- betygsskala?: TranslatedGrunddata;
9
+ betygsskala?: TranslatedGrunddata & {
10
+ formatted: string | undefined;
11
+ };
9
12
  omfattning: {
10
13
  number: string;
11
14
  formattedWithUnit: string;
12
15
  };
13
16
  giltigFrom: Grunddata | undefined;
14
17
  };
15
- export declare const mapExaminationModule: (moduleInstance: Utbildningsinstans, language: Language) => ExaminationModule;
18
+ export declare const mapExaminationModule: (moduleInstance: Utbildningsinstans, language: Language, gradingScalesCodes: GradingScalesCodes) => ExaminationModule;
@@ -4,7 +4,7 @@ exports.mapExaminationModule = void 0;
4
4
  const creditsUtil_1 = require("./utils/creditsUtil");
5
5
  const utils_1 = require("./utils");
6
6
  const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
7
- const mapExaminationModule = (moduleInstance, language) => {
7
+ const mapExaminationModule = (moduleInstance, language, gradingScalesCodes) => {
8
8
  var _a;
9
9
  const { Attributvarden, Uid } = moduleInstance;
10
10
  const benamning = {
@@ -19,12 +19,12 @@ const mapExaminationModule = (moduleInstance, language) => {
19
19
  ladokUID: Uid,
20
20
  kod: (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, "utbildning.attribut.kod"),
21
21
  benamning: benamning[language],
22
- betygsskala: betygsskala && (0, utils_1.translateGrunddata)(betygsskala, language),
22
+ betygsskala: betygsskala && Object.assign(Object.assign({}, (0, utils_1.translateGrunddata)(betygsskala, language)), { formatted: gradingScalesCodes[betygsskala.code] }),
23
23
  omfattning: {
24
24
  number: omfattning,
25
25
  formattedWithUnit: (0, creditsUtil_1.formatCreditsWithUnitLabel)(omfattning, utbildningstyp, language),
26
26
  },
27
- giltigFrom: giltigFrom
27
+ giltigFrom: giltigFrom,
28
28
  };
29
29
  };
30
30
  exports.mapExaminationModule = mapExaminationModule;
@@ -1 +1 @@
1
- {"version":3,"file":"mapExaminationModule.js","sourceRoot":"","sources":["../src/mapExaminationModule.ts"],"names":[],"mappings":";;;AACA,qDAAiE;AACjE,mCAA4E;AAC5E,8EAKwC;AAcjC,MAAM,oBAAoB,GAAG,CAClC,cAAkC,EAClC,QAAkB,EACC,EAAE;;IACrB,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IAE/C,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,sCAAsC,CAAC;QACzE,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,uCAAuC,CAAC;KAC3E,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAClC,cAAc,EACd,iCAAiC,CAClC,CAAC;IACF,MAAM,UAAU,GAAG,IAAA,4CAAgB,EACjC,cAAc,EACd,iCAAiC,CAClC,CAAC;IAEF,MAAM,UAAU,GACd,MAAA,IAAA,yCAAa,EAAC,cAAc,EAAE,gCAAgC,EAAE,YAAY,CAAC,mCAC7E,GAAG,CAAC;IAEN,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,cAAc,CAAC,CAAC;IAE7D,OAAO;QACL,QAAQ,EAAE,GAAG;QACb,GAAG,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,yBAAyB,CAAE;QAC9D,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC;QAC9B,WAAW,EAAE,WAAW,IAAI,IAAA,0BAAkB,EAAC,WAAW,EAAE,QAAQ,CAAC;QACrE,UAAU,EAAE;YACV,MAAM,EAAE,UAAU;YAClB,iBAAiB,EAAE,IAAA,wCAA0B,EAC3C,UAAU,EACV,cAAc,EACd,QAAQ,CACT;SACF;QACD,UAAU,EAAE,UAAU;KACvB,CAAC;AACJ,CAAC,CAAC;AAzCW,QAAA,oBAAoB,wBAyC/B"}
1
+ {"version":3,"file":"mapExaminationModule.js","sourceRoot":"","sources":["../src/mapExaminationModule.ts"],"names":[],"mappings":";;;AACA,qDAAiE;AACjE,mCAA4E;AAC5E,8EAKwC;AAejC,MAAM,oBAAoB,GAAG,CAClC,cAAkC,EAClC,QAAkB,EAClB,kBAAsC,EACnB,EAAE;;IACrB,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IAE/C,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,sCAAsC,CAAC;QACzE,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,uCAAuC,CAAC;KAC3E,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,4CAAgB,EAClC,cAAc,EACd,iCAAiC,CAClC,CAAC;IACF,MAAM,UAAU,GAAG,IAAA,4CAAgB,EACjC,cAAc,EACd,iCAAiC,CAClC,CAAC;IAEF,MAAM,UAAU,GACd,MAAA,IAAA,yCAAa,EACX,cAAc,EACd,gCAAgC,EAChC,YAAY,CACb,mCAAI,GAAG,CAAC;IAEX,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,cAAc,CAAC,CAAC;IAE7D,OAAO;QACL,QAAQ,EAAE,GAAG;QACb,GAAG,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,yBAAyB,CAAE;QAC9D,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC;QAC9B,WAAW,EAAE,WAAW,oCACnB,IAAA,0BAAkB,EAAC,WAAW,EAAE,QAAQ,CAAC,KAC5C,SAAS,EAAE,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,GAChD;QACD,UAAU,EAAE;YACV,MAAM,EAAE,UAAU;YAClB,iBAAiB,EAAE,IAAA,wCAA0B,EAC3C,UAAU,EACV,cAAc,EACd,QAAQ,CACT;SACF;QACD,UAAU,EAAE,UAAU;KACvB,CAAC;AACJ,CAAC,CAAC;AAhDW,QAAA,oBAAoB,wBAgD/B"}
@@ -0,0 +1,24 @@
1
+ import { BetygsskalaItem } from "@kth/ladok-mellanlager-client/dist/types/endpoints/betygsskala";
2
+ export type GradingScales = Record<string, GradingScale>;
3
+ export type GradingScale = {
4
+ kod: string;
5
+ benamning: {
6
+ en: string;
7
+ sv: string;
8
+ };
9
+ beskrivning: Record<string, any>;
10
+ betygsgrader: GradingGrade[];
11
+ };
12
+ export type GradingGrade = {
13
+ id: string;
14
+ benamning: {
15
+ en: string;
16
+ sv: string;
17
+ };
18
+ kod: string;
19
+ ordningsnummer: number;
20
+ dolt: boolean;
21
+ };
22
+ export type GradingScalesCodes = Record<string, string>;
23
+ export declare const mapGradingScales: (items: BetygsskalaItem[]) => GradingScales;
24
+ export declare const mapGradingScalesCodes: (items: BetygsskalaItem[]) => GradingScalesCodes;
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.mapGradingScalesCodes = exports.mapGradingScales = void 0;
4
+ const mapGrades = (betygsgrader = []) => betygsgrader
5
+ .map((grad) => ({
6
+ id: grad.ID,
7
+ benamning: { en: grad.Benamning.en, sv: grad.Benamning.sv },
8
+ kod: grad.Kod,
9
+ ordningsnummer: grad.Ordningsnummer,
10
+ dolt: grad.Dolt,
11
+ }))
12
+ .sort((a, b) => a.ordningsnummer - b.ordningsnummer);
13
+ const mapGradingScales = (items) => items.reduce((gradingScales, item) => {
14
+ gradingScales[item.Kod] = {
15
+ kod: item.Kod,
16
+ benamning: { en: item.Benamning.en, sv: item.Benamning.sv },
17
+ beskrivning: item.Beskrivning,
18
+ betygsgrader: mapGrades(item.Betygsgrader),
19
+ };
20
+ return gradingScales;
21
+ }, {});
22
+ exports.mapGradingScales = mapGradingScales;
23
+ const mapGradingScalesCodes = (items) => items.reduce((gradingScalesCodes, item) => {
24
+ const betygsgraderKoder = mapGrades(item.Betygsgrader)
25
+ .map((grad) => grad.kod)
26
+ .join(", ");
27
+ gradingScalesCodes[item.Kod] = betygsgraderKoder;
28
+ return gradingScalesCodes;
29
+ }, {});
30
+ exports.mapGradingScalesCodes = mapGradingScalesCodes;
31
+ //# sourceMappingURL=mapGradingScales.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mapGradingScales.js","sourceRoot":"","sources":["../src/mapGradingScales.ts"],"names":[],"mappings":";;;AA2BA,MAAM,SAAS,GAAG,CAAC,eAAsB,EAAE,EAAE,EAAE,CAC7C,YAAY;KACT,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACd,EAAE,EAAE,IAAI,CAAC,EAAE;IACX,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE;IAC3D,GAAG,EAAE,IAAI,CAAC,GAAG;IACb,cAAc,EAAE,IAAI,CAAC,cAAc;IACnC,IAAI,EAAE,IAAI,CAAC,IAAI;CAChB,CAAC,CAAC;KACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC;AAElD,MAAM,gBAAgB,GAAG,CAAC,KAAwB,EAAiB,EAAE,CAC1E,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE;IACnC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;QACxB,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,SAAS,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE;QAC3D,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;KAC3C,CAAC;IACF,OAAO,aAAa,CAAC;AACvB,CAAC,EAAE,EAAmB,CAAC,CAAC;AATb,QAAA,gBAAgB,oBASH;AAEnB,MAAM,qBAAqB,GAAG,CACnC,KAAwB,EACJ,EAAE,CACtB,KAAK,CAAC,MAAM,CAAC,CAAC,kBAAkB,EAAE,IAAI,EAAE,EAAE;IACxC,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;SACnD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;SACvB,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC;IACjD,OAAO,kBAAkB,CAAC;AAC5B,CAAC,EAAE,EAAwB,CAAC,CAAC;AATlB,QAAA,qBAAqB,yBASH"}
@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.getExaminationModules = exports.fetchModules = exports.fetchStructure = exports.handleError = void 0;
13
13
  const mapExaminationModule_1 = require("../mapExaminationModule");
14
+ const gradingScalesUtils_1 = require("./gradingScalesUtils");
14
15
  const handleError = (message, error) => {
15
16
  console.error(message, error);
16
17
  return { error: message, details: (error === null || error === void 0 ? void 0 : error.message) || "Unknown error" };
@@ -50,8 +51,9 @@ const getExaminationModules = (utbildningsinstansUID, language, ladokClient) =>
50
51
  const strukturDelar = yield (0, exports.fetchStructure)(utbildningsinstansUID, ladokClient);
51
52
  const utbildningsbasUIDn = strukturDelar.map((strukturdel) => strukturdel.UtbildningsbasUID);
52
53
  const examinationModules = yield (0, exports.fetchModules)(utbildningsbasUIDn, ladokClient);
54
+ const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient);
53
55
  const mappedExaminationModules = examinationModules.map((m) => {
54
- return m && (0, mapExaminationModule_1.mapExaminationModule)(m, language);
56
+ return m && (0, mapExaminationModule_1.mapExaminationModule)(m, language, gradingScalesCodes);
55
57
  });
56
58
  return mappedExaminationModules;
57
59
  }
@@ -1 +1 @@
1
- {"version":3,"file":"examinationModulesUtil.js","sourceRoot":"","sources":["../../src/utils/examinationModulesUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,kEAA+D;AAGxD,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,KAAW,EAAE,EAAE;IAC1D,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,eAAe,EAAE,CAAC;AACxE,CAAC,CAAC;AAHW,QAAA,WAAW,eAGtB;AAEK,MAAM,cAAc,GAAG,CAC5B,GAAW,EACX,WAAsC,EACtC,EAAE;;IACF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAC;QACnE,OAAO,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,0CAAE,aAAa,KAAI,EAAE,CAAC;IAC7C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC;AACH,CAAC,CAAA,CAAC;AAVW,QAAA,cAAc,kBAUzB;AAEK,MAAM,YAAY,GAAG,CAC1B,kBAA4B,EAC5B,WAAsC,EACtC,EAAE;IACF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,kBAAkB,CAAC,GAAG,CAAC,CAAO,iBAAiB,EAAE,EAAE;YACjD,IAAI,CAAC;gBACH,MAAM,kBAAkB,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAC7D,iBAAiB,CAClB,CAAC;gBACF,OAAO,kBAAkB,CAAC,IAAI,CAAC;YACjC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAA,mBAAW,EACf,+CAA+C,iBAAiB,GAAG,EACnE,KAAK,CACN,CAAC;YACJ,CAAC;QACH,CAAC,CAAA,CAAC,CACH,CAAC;QACF,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;AACH,CAAC,CAAA,CAAC;AAxBW,QAAA,YAAY,gBAwBvB;AAEK,MAAM,qBAAqB,GAAG,CACnC,qBAA6B,EAC7B,QAAkB,EAClB,WAAsC,EACtC,EAAE;IACF,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,IAAA,sBAAc,EACxC,qBAAsB,EACtB,WAAW,CACZ,CAAC;QACF,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAC1C,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAC/C,CAAC;QACF,MAAM,kBAAkB,GAAG,MAAM,IAAA,oBAAY,EAC3C,kBAAkB,EAClB,WAAW,CACZ,CAAC;QACF,MAAM,wBAAwB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5D,OAAO,CAAC,IAAI,IAAA,2CAAoB,EAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QACH,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;IACjE,CAAC;AACH,CAAC,CAAA,CAAC;AAxBW,QAAA,qBAAqB,yBAwBhC"}
1
+ {"version":3,"file":"examinationModulesUtil.js","sourceRoot":"","sources":["../../src/utils/examinationModulesUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,kEAA+D;AAE/D,6DAA6D;AAEtD,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,KAAW,EAAE,EAAE;IAC1D,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,eAAe,EAAE,CAAC;AACxE,CAAC,CAAC;AAHW,QAAA,WAAW,eAGtB;AAEK,MAAM,cAAc,GAAG,CAC5B,GAAW,EACX,WAAsC,EACtC,EAAE;;IACF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAC;QACnE,OAAO,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,0CAAE,aAAa,KAAI,EAAE,CAAC;IAC7C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC;AACH,CAAC,CAAA,CAAC;AAVW,QAAA,cAAc,kBAUzB;AAEK,MAAM,YAAY,GAAG,CAC1B,kBAA4B,EAC5B,WAAsC,EACtC,EAAE;IACF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,kBAAkB,CAAC,GAAG,CAAC,CAAO,iBAAiB,EAAE,EAAE;YACjD,IAAI,CAAC;gBACH,MAAM,kBAAkB,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAC7D,iBAAiB,CAClB,CAAC;gBACF,OAAO,kBAAkB,CAAC,IAAI,CAAC;YACjC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAA,mBAAW,EACf,+CAA+C,iBAAiB,GAAG,EACnE,KAAK,CACN,CAAC;YACJ,CAAC;QACH,CAAC,CAAA,CAAC,CACH,CAAC;QACF,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;AACH,CAAC,CAAA,CAAC;AAxBW,QAAA,YAAY,gBAwBvB;AAEK,MAAM,qBAAqB,GAAG,CACnC,qBAA6B,EAC7B,QAAkB,EAClB,WAAsC,EACtC,EAAE;IACF,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,IAAA,sBAAc,EACxC,qBAAsB,EACtB,WAAW,CACZ,CAAC;QACF,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAC1C,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAC/C,CAAC;QACF,MAAM,kBAAkB,GAAG,MAAM,IAAA,oBAAY,EAC3C,kBAAkB,EAClB,WAAW,CACZ,CAAC;QACF,MAAM,kBAAkB,GAAG,MAAM,IAAA,0CAAqB,EAAC,WAAW,CAAC,CAAC;QACpE,MAAM,wBAAwB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5D,OAAO,CAAC,IAAI,IAAA,2CAAoB,EAAC,CAAC,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QACH,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;IACjE,CAAC;AACH,CAAC,CAAA,CAAC;AAzBW,QAAA,qBAAqB,yBAyBhC"}
@@ -0,0 +1,8 @@
1
+ import { LadokMellanlagerApiClient } from "@kth/ladok-mellanlager-client";
2
+ export declare const handleError: (message: string, error?: any) => {
3
+ error: string;
4
+ details: any;
5
+ };
6
+ export declare const fetchGradingScales: (ladokClient: LadokMellanlagerApiClient) => Promise<import("@kth/ladok-mellanlager-client").BetygsskalaItem[]>;
7
+ export declare const getGradingScales: (ladokClient: LadokMellanlagerApiClient) => Promise<import("../mapGradingScales").GradingScales>;
8
+ export declare const getGradingScalesCodes: (ladokClient: LadokMellanlagerApiClient) => Promise<import("../mapGradingScales").GradingScalesCodes>;
@@ -0,0 +1,52 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.getGradingScalesCodes = exports.getGradingScales = exports.fetchGradingScales = exports.handleError = void 0;
13
+ const mapGradingScales_1 = require("../mapGradingScales");
14
+ const handleError = (message, error) => {
15
+ console.error(message, error);
16
+ return { error: message, details: (error === null || error === void 0 ? void 0 : error.message) || "Unknown error" };
17
+ };
18
+ exports.handleError = handleError;
19
+ const fetchGradingScales = (ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
20
+ var _a;
21
+ try {
22
+ const gradingScales = yield ladokClient.betygsskala();
23
+ return ((_a = gradingScales === null || gradingScales === void 0 ? void 0 : gradingScales.data) === null || _a === void 0 ? void 0 : _a.Betygsskala) || [];
24
+ }
25
+ catch (error) {
26
+ throw (0, exports.handleError)("Failed to fetch grading scales", error);
27
+ }
28
+ });
29
+ exports.fetchGradingScales = fetchGradingScales;
30
+ const getGradingScales = (ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
31
+ try {
32
+ const gradingScales = yield (0, exports.fetchGradingScales)(ladokClient);
33
+ const mappedGradingScales = (0, mapGradingScales_1.mapGradingScales)(gradingScales);
34
+ return mappedGradingScales;
35
+ }
36
+ catch (error) {
37
+ throw (0, exports.handleError)("Unexpected error during processing", error);
38
+ }
39
+ });
40
+ exports.getGradingScales = getGradingScales;
41
+ const getGradingScalesCodes = (ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
42
+ try {
43
+ const gradingScales = yield (0, exports.fetchGradingScales)(ladokClient);
44
+ const mappedGradingScalesCodes = (0, mapGradingScales_1.mapGradingScalesCodes)(gradingScales);
45
+ return mappedGradingScalesCodes;
46
+ }
47
+ catch (error) {
48
+ throw (0, exports.handleError)("Unexpected error during processing", error);
49
+ }
50
+ });
51
+ exports.getGradingScalesCodes = getGradingScalesCodes;
52
+ //# sourceMappingURL=gradingScalesUtils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"gradingScalesUtils.js","sourceRoot":"","sources":["../../src/utils/gradingScalesUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,0DAA8E;AAEvE,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,KAAW,EAAE,EAAE;IAC1D,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,eAAe,EAAE,CAAC;AACxE,CAAC,CAAC;AAHW,QAAA,WAAW,eAGtB;AAEK,MAAM,kBAAkB,GAAG,CAChC,WAAsC,EACtC,EAAE;;IACF,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,WAAW,EAAE,CAAC;QACtD,OAAO,CAAA,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,0CAAE,WAAW,KAAI,EAAE,CAAC;IAChD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC,CAAA,CAAC;AATW,QAAA,kBAAkB,sBAS7B;AAEK,MAAM,gBAAgB,GAAG,CAC9B,WAAsC,EACtC,EAAE;IACF,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAkB,EAAC,WAAW,CAAC,CAAC;QAC5D,MAAM,mBAAmB,GAAG,IAAA,mCAAgB,EAAC,aAAa,CAAC,CAAC;QAC5D,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;IACjE,CAAC;AACH,CAAC,CAAA,CAAC;AAVW,QAAA,gBAAgB,oBAU3B;AAEK,MAAM,qBAAqB,GAAG,CACnC,WAAsC,EACtC,EAAE;IACF,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAkB,EAAC,WAAW,CAAC,CAAC;QAC5D,MAAM,wBAAwB,GAAG,IAAA,wCAAqB,EAAC,aAAa,CAAC,CAAC;QACtE,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,mBAAW,EAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;IACjE,CAAC;AACH,CAAC,CAAA,CAAC;AAVW,QAAA,qBAAqB,yBAUhC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kth/om-kursen-ladok-client",
3
- "version": "1.0.6",
3
+ "version": "1.1.0",
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": [
@@ -22,6 +22,6 @@
22
22
  },
23
23
  "dependencies": {
24
24
  "@kth/ladok-attributvarde-utils": "0.0.10",
25
- "@kth/ladok-mellanlager-client": "0.0.5"
25
+ "@kth/ladok-mellanlager-client": "0.1.0"
26
26
  }
27
27
  }