Skip to content
This repository was archived by the owner on Jun 7, 2023. It is now read-only.

Commit c1330cf

Browse files
committed
update api endpoints for bookserver
1 parent 3c0f505 commit c1330cf

5 files changed

Lines changed: 26 additions & 24 deletions

File tree

runestone/activecode/js/activecode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ Yet another is that there is an internal error. The internal error message is:
11921192
this.logRunEvent({
11931193
div_id: this.divid,
11941194
code: this.editor.getValue(),
1195-
lang: this.language,
1195+
language: this.language,
11961196
errinfo: this.errinfo,
11971197
to_save: this.saveCode,
11981198
prefix: this.pretext,

runestone/activecode/js/activecode_sql.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ export default class SQLActiveCode extends ActiveCode {
238238
this.logRunEvent({
239239
div_id: this.divid,
240240
code: this.editor.getValue(),
241-
lang: this.language,
241+
language: this.language,
242242
errinfo: this.results[this.results.length - 1].status,
243243
to_save: this.saveCode,
244244
prefix: this.pretext,
@@ -292,9 +292,8 @@ export default class SQLActiveCode extends ActiveCode {
292292
}
293293
let pct = (100 * this.passed) / (this.passed + this.failed);
294294
pct = pct.toLocaleString(undefined, { maximumFractionDigits: 2 });
295-
result += `You passed ${this.passed} out of ${
296-
this.passed + this.failed
297-
} tests for ${pct}%`;
295+
result += `You passed ${this.passed} out of ${this.passed + this.failed
296+
} tests for ${pct}%`;
298297
this.unit_results = `percent:${pct}:passed:${this.passed}:failed:${this.failed}`;
299298
return result;
300299
}

runestone/mchoice/js/mchoice.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ export default class MultipleChoice extends RunestoneBase {
629629
compareAnswers() {
630630
var data = {};
631631
data.div_id = this.divid;
632-
data.course = eBookConfig.course;
632+
data.course_name = eBookConfig.course;
633633
jQuery.get(
634634
"/assessment/getaggregateresults",
635635
data,

runestone/selectquestion/js/selectone.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,14 @@ export default class SelectOne extends RunestoneBase {
9191
let opts = this.origOpts;
9292
let selectorId = this.selector_id;
9393
console.log("getting question source");
94-
let request = new Request("/runestone/ajax/get_question_source", {
94+
let request = new Request("/assessment/get_question_source", {
9595
method: "POST",
9696
headers: this.jsonHeaders,
9797
body: JSON.stringify(data),
9898
});
9999
let response = await fetch(request);
100100
let htmlsrc = await response.json();
101+
htmlsrc = htmlsrc.detail;
101102
if (htmlsrc.indexOf("No preview") >= 0) {
102103
alert(
103104
`Error: Not able to find a question for ${selectorId} based on the criteria`
@@ -139,8 +140,8 @@ export default class SelectOne extends RunestoneBase {
139140
if (!document.getElementById("component-preview")) {
140141
toggleUI +=
141142
'<div id="component-preview" class="col-md-6 toggle-preview" style="z-index: 999;">' +
142-
'<div id="toggle-buttons"></div>' +
143-
'<div id="toggle-preview"></div>' +
143+
'<div id="toggle-buttons"></div>' +
144+
'<div id="toggle-preview"></div>' +
144145
'</div>';
145146
}
146147
// dropdown menu containing the question options
@@ -163,10 +164,10 @@ export default class SelectOne extends RunestoneBase {
163164
'data-component="'
164165
)[1];
165166
switch (
166-
toggleQuestionSubstring.slice(
167-
0,
168-
toggleQuestionSubstring.indexOf('"')
169-
)
167+
toggleQuestionSubstring.slice(
168+
0,
169+
toggleQuestionSubstring.indexOf('"')
170+
)
170171
) {
171172
case "activecode":
172173
toggleQuestionType = "Active Write Code";
@@ -201,14 +202,14 @@ export default class SelectOne extends RunestoneBase {
201202
}
202203
else {
203204
toggleUI += toggleQuestionType +
204-
" - " +
205-
toggleQuestions[i];
205+
" - " +
206+
toggleQuestions[i];
206207
}
207208
}
208209
else {
209210
toggleUI += toggleQuestionType +
210-
" - " +
211-
toggleQuestions[i];
211+
" - " +
212+
toggleQuestions[i];
212213
}
213214
if ((i == 0) && (data.toggleOptions.includes("lock"))) {
214215
toggleUI += " (only this question will be graded)";
@@ -339,6 +340,7 @@ export default class SelectOne extends RunestoneBase {
339340
}
340341

341342
// on clicking "Select this Problem" button, close preview panel, replace current question in assignments page with selected question, and send request to update grading database
343+
// _ `toggleSet`
342344
async toggleSet(parentID, selectedQuestion, htmlsrc, toggleQuestionTypes) {
343345
var selectorId = parentID + "-toggleSelectedQuestion";
344346
var toggleQuestionSelect = document.getElementById(parentID).getElementsByTagName("select")[0];
@@ -348,10 +350,10 @@ export default class SelectOne extends RunestoneBase {
348350
useRunestoneServices: true,
349351
});
350352
let request = new Request(
351-
"/runestone/ajax/update_selected_question?metaid=" +
352-
parentID +
353-
"&selected=" +
354-
selectedQuestion,
353+
"/assessment/set_selected_question?metaid=" +
354+
parentID +
355+
"&selected=" +
356+
selectedQuestion,
355357
{}
356358
);
357359
await fetch(request);
@@ -378,13 +380,13 @@ export default class SelectOne extends RunestoneBase {
378380
currentParsonsClass = currentParsons[p].classList[2];
379381
if (currentParsonsClass) {
380382
if (currentParsonsClass.includes("indent")) {
381-
indentCount = parseInt(indentCount) + parseInt(currentParsonsClass.slice(6,currentParsonsClass.length));
383+
indentCount = parseInt(indentCount) + parseInt(currentParsonsClass.slice(6, currentParsonsClass.length));
382384
}
383385
}
384386
// for Parsons answer spaces with vertical lines that allow student to define their own line indentation
385387
currentBlockIndent = currentParsons[p].parentElement.parentElement.style.left;
386388
if (currentBlockIndent) {
387-
indentCount = parseInt(indentCount) + parseInt(currentBlockIndent.slice(0,currentBlockIndent.indexOf("px")) / 30);
389+
indentCount = parseInt(indentCount) + parseInt(currentBlockIndent.slice(0, currentBlockIndent.indexOf("px")) / 30);
388390
}
389391
for (var d = 0; d < indentCount; d++) {
390392
indent += " ";

runestone/timed/js/timed.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export default class Timed extends RunestoneBase {
110110
console.log(sendInfo);
111111
if (eBookConfig.useRunestoneServices) {
112112
let request = new Request(
113-
eBookConfig.ajaxURL + "tookTimedAssessment",
113+
"/assessment/tookTimedAssessment",
114114
{
115115
method: "POST",
116116
headers: this.jsonHeaders,
@@ -119,6 +119,7 @@ export default class Timed extends RunestoneBase {
119119
);
120120
let response = await fetch(request);
121121
let data = await response.json();
122+
data = data.detail;
122123
this.taken = data.tookAssessment;
123124
this.assessmentTaken = this.taken;
124125
if (!this.taken) {

0 commit comments

Comments
 (0)