@capytale/activity.js 3.0.2 → 3.0.3
Sign up to get free protection for your applications and to get access to all the features.
- package/activity/activitySession/uni/backend.d.ts +2 -2
- package/activity/activitySession/uni/backend.d.ts.map +1 -1
- package/activity/activitySession/uni/backend.js +10 -2
- package/activity/activitySession/uni/backend.js.map +1 -1
- package/activity/evaluation/evaluation.d.ts +1 -1
- package/backend/capytale/urlParser.d.ts +7 -0
- package/backend/capytale/urlParser.d.ts.map +1 -1
- package/backend/capytale/urlParser.js +10 -0
- package/backend/capytale/urlParser.js.map +1 -1
- package/index.d.ts +0 -1
- package/index.d.ts.map +1 -1
- package/index.js +3 -3
- package/index.js.map +1 -1
- package/package.json +1 -4
|
@@ -4,7 +4,7 @@ import type { UserLoader } from "../../../entity/user";
|
|
|
4
4
|
import type { ActivityTypeBackend } from "../../activityType/backend";
|
|
5
5
|
import type { ActivityBunchOptions } from "../../activityBunch/uni/backend";
|
|
6
6
|
import type { RouteResolver } from "../../../api/http/route";
|
|
7
|
-
import { type ActivitySession } from ".";
|
|
8
|
-
export type SessionLoader = (id: number, options?: ActivityBunchOptions) => Promise<ActivitySession>;
|
|
7
|
+
import { type ActivityMode, type ActivitySession } from ".";
|
|
8
|
+
export type SessionLoader = (id: number, options?: ActivityBunchOptions, mode?: ActivityMode) => Promise<ActivitySession>;
|
|
9
9
|
export default function (res: RouteResolver, al: ActivityLoader, mb: MeBackend, ul: UserLoader, atl: ActivityTypeBackend): SessionLoader;
|
|
10
10
|
//# sourceMappingURL=backend.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../src/activity/activitySession/uni/backend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAGlE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAA6B,
|
|
1
|
+
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../../src/activity/activitySession/uni/backend.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAGlE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAA6B,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,GAAG,CAAC;AAGlF,MAAM,MAAM,aAAa,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,EAAE,IAAI,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;AAE1H,MAAM,CAAC,OAAO,WAAW,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,mBAAmB,GAAG,aAAa,CA6CvI"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import ActivityError from "../../error";
|
|
2
2
|
import ActivitySessionClass from ".";
|
|
3
3
|
export default function (res, al, mb, ul, atl) {
|
|
4
|
-
async function loadSession(id, options) {
|
|
4
|
+
async function loadSession(id, options, mode) {
|
|
5
5
|
const aPromise = al(id, options);
|
|
6
6
|
const mePromise = mb.getMeAsync();
|
|
7
7
|
const a = await aPromise;
|
|
@@ -29,7 +29,12 @@ export default function (res, al, mb, ul, atl) {
|
|
|
29
29
|
throw new ActivityError("Vous devez être connecté pour accéder à cette activité.");
|
|
30
30
|
}
|
|
31
31
|
if (a.isTeacher(me.uid)) {
|
|
32
|
-
|
|
32
|
+
if ((mode === "assignment") || (mode === "review")) {
|
|
33
|
+
m = mode;
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
m = "review";
|
|
37
|
+
}
|
|
33
38
|
student = await ul(a.assignmentNode.owner.value);
|
|
34
39
|
}
|
|
35
40
|
else if (a.isStudent(me.uid)) {
|
|
@@ -39,6 +44,9 @@ export default function (res, al, mb, ul, atl) {
|
|
|
39
44
|
throw new ActivityError("Accès non autorisé.");
|
|
40
45
|
}
|
|
41
46
|
}
|
|
47
|
+
if ((mode != null) && (m !== mode)) {
|
|
48
|
+
console.log("Mode mismatch", `query param : ${mode}`, `inferred : ${m}`, "using inferred mode");
|
|
49
|
+
}
|
|
42
50
|
const at = await atl.get(a.activityType);
|
|
43
51
|
return new ActivitySessionClass(res, a, at, me, m, student);
|
|
44
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/activity/activitySession/uni/backend.ts"],"names":[],"mappings":"AAMA,OAAO,aAAa,MAAM,SAAS,CAAC;AAIpC,OAAO,oBAAiE,MAAM,GAAG,CAAC;AAKlF,MAAM,CAAC,OAAO,WAAW,GAAkB,EAAE,EAAkB,EAAE,EAAa,EAAE,EAAc,EAAE,GAAwB;IACpH,KAAK,UAAU,WAAW,CAAC,EAAU,EAAE,OAA8B;
|
|
1
|
+
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../src/activity/activitySession/uni/backend.ts"],"names":[],"mappings":"AAMA,OAAO,aAAa,MAAM,SAAS,CAAC;AAIpC,OAAO,oBAAiE,MAAM,GAAG,CAAC;AAKlF,MAAM,CAAC,OAAO,WAAW,GAAkB,EAAE,EAAkB,EAAE,EAAa,EAAE,EAAc,EAAE,GAAwB;IACpH,KAAK,UAAU,WAAW,CAAC,EAAU,EAAE,OAA8B,EAAE,IAAmB;QACtF,MAAM,QAAQ,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACjC,MAAM,SAAS,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,CAAC,GAAG,MAAM,QAAQ,CAAC;QACzB,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC;QAC3B,uCAAuC;QACvC,IAAI,OAAO,GAAqB,SAAS,CAAC;QAC1C,IAAI,CAAe,CAAC;QACpB,IAAI,IAAI,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;YAC3B,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;gBACb,CAAC,GAAG,MAAM,CAAC;YACf,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtB,CAAC,GAAG,QAAQ,CAAC;gBACjB,CAAC;qBAAM,CAAC;oBACJ,CAAC,GAAG,MAAM,CAAC;gBACf,CAAC;YACL,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,kBAAkB;gBAClC,MAAM,IAAI,aAAa,CAAC,uEAAuE,CAAC,CAAC;YACrG,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;gBACb,MAAM,IAAI,aAAa,CAAC,yDAAyD,CAAC,CAAC;YACvF,CAAC;YACD,IAAI,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtB,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,EAAE,CAAC;oBACjD,CAAC,GAAG,IAAI,CAAC;gBACb,CAAC;qBAAM,CAAC;oBACJ,CAAC,GAAG,QAAQ,CAAC;gBACjB,CAAC;gBACD,OAAO,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,KAAsB,CAAC,CAAC;YACtE,CAAC;iBAAM,IAAI,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7B,CAAC,GAAG,YAAY,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,aAAa,CAAC,qBAAqB,CAAC,CAAC;YACnD,CAAC;QACL,CAAC;QACD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,iBAAiB,IAAI,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE,qBAAqB,CAAC,CAAC;QACpG,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QACzC,OAAO,IAAI,oBAAoB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,WAAW,CAAC;AACvB,CAAC"}
|
|
@@ -1,9 +1,16 @@
|
|
|
1
|
+
import type { ActivityMode } from "../../activity/activitySession/uni";
|
|
1
2
|
/**
|
|
2
3
|
* Lit dans l'URL de la page le paramètre 'id' et le retourne.
|
|
3
4
|
*
|
|
4
5
|
* @returns le nid de la page ou undefined si le paramètre 'id' n'est pas présent.
|
|
5
6
|
*/
|
|
6
7
|
export declare function readNid(): number | undefined;
|
|
8
|
+
/**
|
|
9
|
+
* Lit dans l'URL de la page le paramètre 'mode' et le retourne.
|
|
10
|
+
*
|
|
11
|
+
* @returns le mode de la page ou undefined si le paramètre 'mode' n'est pas présent.
|
|
12
|
+
*/
|
|
13
|
+
export declare function readMode(): ActivityMode | undefined;
|
|
7
14
|
/**
|
|
8
15
|
* Lit dans l'URL de la page le paramètre 'lti' et le retourne.
|
|
9
16
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urlParser.d.ts","sourceRoot":"","sources":["../../src/backend/capytale/urlParser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"urlParser.d.ts","sourceRoot":"","sources":["../../src/backend/capytale/urlParser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAIvE;;;;GAIG;AACH,wBAAgB,OAAO,IAAI,MAAM,GAAG,SAAS,CAI5C;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,IAAI,YAAY,GAAG,SAAS,CAInD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAIrD"}
|
|
@@ -9,6 +9,16 @@ export function readNid() {
|
|
|
9
9
|
return parseInt(query.get('id'));
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
|
+
/**
|
|
13
|
+
* Lit dans l'URL de la page le paramètre 'mode' et le retourne.
|
|
14
|
+
*
|
|
15
|
+
* @returns le mode de la page ou undefined si le paramètre 'mode' n'est pas présent.
|
|
16
|
+
*/
|
|
17
|
+
export function readMode() {
|
|
18
|
+
if (query.has('mode')) {
|
|
19
|
+
return query.get('mode');
|
|
20
|
+
}
|
|
21
|
+
}
|
|
12
22
|
/**
|
|
13
23
|
* Lit dans l'URL de la page le paramètre 'lti' et le retourne.
|
|
14
24
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urlParser.js","sourceRoot":"","sources":["../../src/backend/capytale/urlParser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"urlParser.js","sourceRoot":"","sources":["../../src/backend/capytale/urlParser.ts"],"names":[],"mappings":"AAEA,MAAM,KAAK,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAE1D;;;;GAIG;AACH,MAAM,UAAU,OAAO;IACnB,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAClB,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAC;IACtC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,QAAQ;IACpB,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAiB,CAAC;IAC7C,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB;IAC5B,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;IAC7B,CAAC;AACL,CAAC"}
|
package/index.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import "./activity/activityBunch/uni";
|
|
2
2
|
import type { ActivityBunchOptions } from "./activity/activityBunch/uni/backend";
|
|
3
3
|
declare const sessionLoader: import("./activity/activitySession/uni/backend").SessionLoader;
|
|
4
|
-
export default sessionLoader;
|
|
5
4
|
declare function autoLoad(options?: ActivityBunchOptions): ReturnType<typeof sessionLoader>;
|
|
6
5
|
export { autoLoad };
|
|
7
6
|
//# sourceMappingURL=index.d.ts.map
|
package/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAC;AActC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAEjF,QAAA,MAAM,aAAa,gEAAuC,CAAC;AAE3D,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAC;AActC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAEjF,QAAA,MAAM,aAAa,gEAAuC,CAAC;AAE3D,iBAAS,QAAQ,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAOlF;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC"}
|
package/index.js
CHANGED
|
@@ -8,18 +8,18 @@ import sessionBackend from "./activity/activitySession/uni/backend";
|
|
|
8
8
|
import mb from "./backend/capytale/me";
|
|
9
9
|
import ul from "./backend/capytale/user";
|
|
10
10
|
import atl from "./backend/capytale/activityType";
|
|
11
|
-
import { readLtiSessionId, readNid } from "./backend/capytale/urlParser";
|
|
11
|
+
import { readLtiSessionId, readNid, readMode } from "./backend/capytale/urlParser";
|
|
12
12
|
import ltiSession from "./backend/capytale/lti";
|
|
13
13
|
const sessionLoader = sessionBackend(res, al, mb, ul, atl);
|
|
14
|
-
export default sessionLoader;
|
|
15
14
|
function autoLoad(options) {
|
|
16
15
|
const id = readNid();
|
|
17
16
|
if (id == null)
|
|
18
17
|
throw new Error('No nid');
|
|
18
|
+
const mode = readMode();
|
|
19
19
|
const lti = readLtiSessionId();
|
|
20
20
|
if (lti != null)
|
|
21
21
|
ltiSession.setSessId(lti);
|
|
22
|
-
return sessionLoader(id, options);
|
|
22
|
+
return sessionLoader(id, options, mode);
|
|
23
23
|
}
|
|
24
24
|
export { autoLoad };
|
|
25
25
|
//# sourceMappingURL=index.js.map
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAC;AAEtC,OAAO,GAAG,MAAM,6BAA6B,CAAC;AAC9C,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACvC,OAAO,IAAI,MAAM,yBAAyB,CAAC;AAC3C,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;AACzC,OAAO,cAAc,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACvC,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACzC,OAAO,GAAG,MAAM,iCAAiC,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAC;AAEtC,OAAO,GAAG,MAAM,6BAA6B,CAAC;AAC9C,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACvC,OAAO,IAAI,MAAM,yBAAyB,CAAC;AAC3C,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;AACzC,OAAO,cAAc,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACvC,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACzC,OAAO,GAAG,MAAM,iCAAiC,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAGhD,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;AAE3D,SAAS,QAAQ,CAAC,OAA8B;IAC5C,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;IACrB,IAAI,EAAE,IAAI,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;IACxB,MAAM,GAAG,GAAG,gBAAgB,EAAE,CAAC;IAC/B,IAAI,GAAG,IAAI,IAAI;QAAE,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,aAAa,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAC5C,CAAC;AAED,OAAO,EAAE,QAAQ,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@capytale/activity.js",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.3",
|
|
4
4
|
"bin": {
|
|
5
5
|
"cactjs": "./bin/cactjs.js"
|
|
6
6
|
},
|
|
@@ -22,9 +22,6 @@
|
|
|
22
22
|
"tsc-alias": "^1.8.8",
|
|
23
23
|
"typescript": "^5.4.2"
|
|
24
24
|
},
|
|
25
|
-
"publishConfig": {
|
|
26
|
-
"@capytale:registr": "https://gitlab.in.ac-paris.fr/api/v4/projects/62/packages/npm/"
|
|
27
|
-
},
|
|
28
25
|
"dependencies": {
|
|
29
26
|
"js-cookie": "^3.0.5",
|
|
30
27
|
"tslib": "^2.6.2"
|