@capytale/activity.js 3.1.5 → 3.1.7
Sign up to get free protection for your applications and to get access to all the features.
- package/activity/activityBunch/base/nodes/base.d.ts +7 -0
- package/activity/activityBunch/base/nodes/base.d.ts.map +1 -1
- package/activity/activityBunch/base/nodes/base.js +17 -5
- package/activity/activityBunch/base/nodes/base.js.map +1 -1
- package/activity/evaluation/backend.d.ts.map +1 -1
- package/activity/evaluation/backend.js +12 -4
- package/activity/evaluation/backend.js.map +1 -1
- package/backend/capytale/resolver.d.ts.map +1 -1
- package/backend/capytale/resolver.js +11 -6
- package/backend/capytale/resolver.js.map +1 -1
- package/package.json +1 -1
|
@@ -16,6 +16,8 @@ declare abstract class ActivityNode extends Node {
|
|
|
16
16
|
readonly activity_type: Field<'String', 'Single', 'Read'>;
|
|
17
17
|
readonly _config: Field<'String', 'Single', 'Write'>;
|
|
18
18
|
readonly _anti_cheat: Field<'AntiCheat', 'Single', 'Read'>;
|
|
19
|
+
readonly created: Field<'Date', 'Single', 'Read'>;
|
|
20
|
+
readonly changed: Field<'Date', 'Single', 'Read'>;
|
|
19
21
|
readonly shared_notes: Field<'String', 'Single', 'Write'>;
|
|
20
22
|
/**
|
|
21
23
|
* activityType :
|
|
@@ -28,6 +30,11 @@ declare abstract class ActivityNode extends Node {
|
|
|
28
30
|
* - codabloc
|
|
29
31
|
*/
|
|
30
32
|
get activityType(): string;
|
|
33
|
+
/**
|
|
34
|
+
* Indique si l'objet est nouveau ou non.
|
|
35
|
+
* Cette propriété n'est pas mise à jour automatiquement lors d'une sauvegarde ou d'un touch().
|
|
36
|
+
*/
|
|
37
|
+
get isNew(): boolean;
|
|
31
38
|
}
|
|
32
39
|
declare abstract class AssignmentNode extends Node {
|
|
33
40
|
static readonly bundle = "student_assignment";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/activity/activityBunch/base/nodes/base.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC5E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAa,EAAE,EAAa,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/activity/activityBunch/base/nodes/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,13 @@ import Node from "../../../../entity/node";
|
|
|
2
2
|
import { Field, TitleField, ReferenceField } from "../../../../entity/fieldDefinition";
|
|
3
3
|
import { int_to_wf, wf_to_int } from "../../../field/workflow";
|
|
4
4
|
import ActivityError from "../../../error";
|
|
5
|
+
function isNew(n) {
|
|
6
|
+
if (n.created.value == null)
|
|
7
|
+
throw new ActivityError('La propriété created n\'est pas définie.');
|
|
8
|
+
if (n.changed.value == null)
|
|
9
|
+
throw new ActivityError('La propriété changed n\'est pas définie.');
|
|
10
|
+
return n.created.value.getTime() >= n.changed.value.getTime();
|
|
11
|
+
}
|
|
5
12
|
class ActivityNode extends Node {
|
|
6
13
|
static fields = {
|
|
7
14
|
title: TitleField('Write'),
|
|
@@ -16,6 +23,8 @@ class ActivityNode extends Node {
|
|
|
16
23
|
activity_type: Field('String', 'Single', 'Read'),
|
|
17
24
|
_config: Field('String', 'Single', 'Write', 'field_config'),
|
|
18
25
|
_anti_cheat: Field('AntiCheat', 'Single', 'Read', 'field_anti_cheat'),
|
|
26
|
+
created: Field('Date', 'Single', 'Read', 'created'),
|
|
27
|
+
changed: Field('Date', 'Single', 'Read', 'changed'),
|
|
19
28
|
shared_notes: Field('String', 'Single', 'Write', 'field_answer_sheet'),
|
|
20
29
|
};
|
|
21
30
|
/**
|
|
@@ -32,6 +41,13 @@ class ActivityNode extends Node {
|
|
|
32
41
|
return this.activity_type.value;
|
|
33
42
|
}
|
|
34
43
|
;
|
|
44
|
+
/**
|
|
45
|
+
* Indique si l'objet est nouveau ou non.
|
|
46
|
+
* Cette propriété n'est pas mise à jour automatiquement lors d'une sauvegarde ou d'un touch().
|
|
47
|
+
*/
|
|
48
|
+
get isNew() {
|
|
49
|
+
return isNew(this);
|
|
50
|
+
}
|
|
35
51
|
}
|
|
36
52
|
class AssignmentNode extends Node {
|
|
37
53
|
static bundle = 'student_assignment';
|
|
@@ -55,11 +71,7 @@ class AssignmentNode extends Node {
|
|
|
55
71
|
* Cette propriété n'est pas mise à jour automatiquement lors d'une sauvegarde ou d'un touch().
|
|
56
72
|
*/
|
|
57
73
|
get isNew() {
|
|
58
|
-
|
|
59
|
-
throw new ActivityError('La propriété created n\'est pas définie.');
|
|
60
|
-
if (this.changed.value == null)
|
|
61
|
-
throw new ActivityError('La propriété changed n\'est pas définie.');
|
|
62
|
-
return this.created.value.getTime() >= this.changed.value.getTime();
|
|
74
|
+
return isNew(this);
|
|
63
75
|
}
|
|
64
76
|
changeWorkflow(v) {
|
|
65
77
|
let wfn = wf_to_int(v);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/activity/activityBunch/base/nodes/base.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE5E,OAAO,EAAE,SAAS,EAAM,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,aAAa,MAAM,SAAS,CAAC;AAEpC,MAAe,YAAa,SAAQ,IAAI;IACpC,MAAM,CAAU,MAAM,GAA8B;QAChD,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC;QAC1B,aAAa,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAmB,CAAC;QAC3E,eAAe,EAAE,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC;QACpD,aAAa,EAAE,KAAK,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC;QACjD,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;QACvC,UAAU,EAAE,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC;QAC/C,cAAc,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;QAC9C,gBAAgB,EAAE,KAAK,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC;QACtD,cAAc,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;QACjD,aAAa,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;QAChD,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAC;QAC3D,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,kBAAkB,CAAC;QACrE,YAAY,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,oBAAoB,CAAC;KACzE,CAAC;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/activity/activityBunch/base/nodes/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../src/activity/evaluation/backend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD,KAAK,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE3C,MAAM,MAAM,iBAAiB,GAAG;IAC5B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEvD;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAExE;;;;;OAKG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1E,CAAA;AAgBD,MAAM,CAAC,OAAO,WAAW,EAAE,EAAE,WAAW,GAAG,iBAAiB,
|
|
1
|
+
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../../src/activity/evaluation/backend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD,KAAK,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE3C,MAAM,MAAM,iBAAiB,GAAG;IAC5B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEvD;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAExE;;;;;OAKG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1E,CAAA;AAgBD,MAAM,CAAC,OAAO,WAAW,EAAE,EAAE,WAAW,GAAG,iBAAiB,CAoM3D"}
|
|
@@ -34,9 +34,8 @@ export default function (hb) {
|
|
|
34
34
|
return data.filter(sa => sa.hidden);
|
|
35
35
|
return data.filter(sa => !sa.hidden);
|
|
36
36
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
for (const e of data.evals) {
|
|
37
|
+
function simplifyExerciceLabels(evals) {
|
|
38
|
+
for (const e of evals) {
|
|
40
39
|
const prefix = e.evalLabel.slice(0, 9); //"Exercice "
|
|
41
40
|
if (prefix === "Exercice ") {
|
|
42
41
|
e.evalLabel = "Ex." + e.evalLabel.slice(9);
|
|
@@ -47,6 +46,15 @@ export default function (hb) {
|
|
|
47
46
|
else
|
|
48
47
|
e.date = e.serverDate;
|
|
49
48
|
}
|
|
49
|
+
}
|
|
50
|
+
async function getEvalsForStudent(id, uid) {
|
|
51
|
+
const data = (await hb.getJsonAsync({ name: 'sa.eval', id, uid }));
|
|
52
|
+
simplifyExerciceLabels(data.evals);
|
|
53
|
+
return data;
|
|
54
|
+
}
|
|
55
|
+
async function getEvalsForAssignment(id) {
|
|
56
|
+
const data = (await hb.getJsonAsync({ name: 'sa.eval', id }));
|
|
57
|
+
simplifyExerciceLabels(data.evals);
|
|
50
58
|
return data;
|
|
51
59
|
}
|
|
52
60
|
return {
|
|
@@ -80,7 +88,7 @@ export default function (hb) {
|
|
|
80
88
|
const evaluationsByLabel = {};
|
|
81
89
|
const evaluationLabels = [];
|
|
82
90
|
const sortRegEx = /(\d+)$/;
|
|
83
|
-
for (const [uid, itemsPromise] of iter(filteredUids, uid =>
|
|
91
|
+
for (const [uid, itemsPromise] of iter(filteredUids, uid => getEvalsForAssignment(saByUid[uid].nid))) {
|
|
84
92
|
if (!studentsByUid[uid]) {
|
|
85
93
|
studentsByUid[uid] = {
|
|
86
94
|
firstname: saByUid[uid].firstname,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../src/activity/evaluation/backend.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,IAAI,MAAM,gBAAgB,CAAC;AA+BlC,SAAS,eAAe,CAAC,UAAsB;IAC3C,IAAI,IAAU,CAAC;IACf,IAAI,UAAU,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QAC1B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACtB,CAAC;SAAM,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7C,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;SAAM,IAAI,UAAU,CAAC,IAAI,YAAY,IAAI,EAAE,CAAC;QACzC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAC3B,CAAC;SAAM,CAAC;QACJ,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IACpC,CAAC;IACD,UAAU,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,CAAC,OAAO,WAAW,EAAe;IACpC,MAAM,WAAW,GAAqC,EAAE,CAAC;IAEzD,KAAK,UAAU,MAAM,CAAC,EAAU,EAAE,MAAe;QAC7C,IAAI,IAAc,CAAC;QACnB,IAAI,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;YACxD,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;QAC5B,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,YAAY,CAAW,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAE,CAAC;YACnE,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC;YACpB,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,IAAI,MAAM,KAAK,KAAK;YAAE,OAAO,IAAI,CAAC;QAClC,IAAI,MAAM,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;
|
|
1
|
+
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../src/activity/evaluation/backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/backend/capytale/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/backend/capytale/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AA0HlD,MAAM,CAAC,OAAO,WAAW,KAAK,EAAE,KAAK,EAAE,QAAQ,GAAE,OAAe,GAAG,MAAM,CAIxE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import ltiSession from "./lti";
|
|
2
|
-
const
|
|
2
|
+
const actApiEp = '/web/c-act/api/n/';
|
|
3
3
|
const typeEp = '/web/c-act/api/t';
|
|
4
4
|
const typeGroupsEp = '/web/c-act/api/g';
|
|
5
5
|
const typeWeightsEp = '/web/c-act/api/w';
|
|
@@ -96,17 +96,22 @@ function sesameCodeResole(route) {
|
|
|
96
96
|
return cAuthEp + 'sesame/code/' + route.code;
|
|
97
97
|
return cAuthEp + 'sesame/code';
|
|
98
98
|
}
|
|
99
|
+
function evalResolve(route) {
|
|
100
|
+
if (route.uid == null)
|
|
101
|
+
return actApiEp + route.id + '/e';
|
|
102
|
+
else
|
|
103
|
+
return actApiEp + route.id + '/e/' + route.uid;
|
|
104
|
+
}
|
|
99
105
|
function resolve(route) {
|
|
100
106
|
switch (route.name) {
|
|
101
|
-
case 'fs.list': return
|
|
102
|
-
case 'fs.field': return
|
|
107
|
+
case 'fs.list': return actApiEp + route.id + '/fields';
|
|
108
|
+
case 'fs.field': return actApiEp + route.id + '/fields/' + route.field;
|
|
103
109
|
case 'rest': return restResolve(route);
|
|
104
110
|
case 'session': return sessionEp + route.id;
|
|
105
111
|
case 'c-auth.me': return cAuthEp + 'me';
|
|
106
|
-
case 'sa.list': return
|
|
112
|
+
case 'sa.list': return actApiEp + route.id + '/assignments';
|
|
107
113
|
case 'sa.launch': return frontEp + 'c/' + route.code;
|
|
108
|
-
case 'sa.eval': return
|
|
109
|
-
case 'sa.evals': return fsEp + route.id + '/e/' + route.uid;
|
|
114
|
+
case 'sa.eval': return evalResolve(route);
|
|
110
115
|
case 'type': return typeResolve(route);
|
|
111
116
|
case 'type.groups': return typeGroupsEp;
|
|
112
117
|
case 'type.weights': return typeWeightsEp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/backend/capytale/resolver.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,OAAO,CAAC;AAE/B,MAAM,
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/backend/capytale/resolver.ts"],"names":[],"mappings":"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"}
|