ross/rts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge github.com:xkjq/rts

Browse Source
This commit is contained in:
Ross
2021-06-26 14:14:47 +01:00
parent 767a7e8681 70233533ac
commit 8886192a18
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/main.js
+11 -10
View File
@@ -256,7 +256,7 @@ async function loadExamList(data) {
`<li class="cache-item" data-qid=${q}>Question (${saved_exam.exam_type}): ${q}` `<li class="cache-item" data-qid=${q}>Question (${saved_exam.exam_type}): ${q}`
); );
// If a single question is out of date we invalidate the lot... // If a single question is out of date we invalidate the lot...
const q_object = { qid: parseInt(q), type: saved_exam.exam_type }; const q_object = { qid: String(q), type: saved_exam.exam_type };
question_db.question_data question_db.question_data
.get(q_object) .get(q_object)
.then((d) => { .then((d) => {
@@ -279,7 +279,7 @@ async function loadExamList(data) {
//question_db.saved_exams.where("eid").equals(saved_exam.eid).delete(); //question_db.saved_exams.where("eid").equals(saved_exam.eid).delete();
question_db.question_data question_db.question_data
.where(["qid", "type"]) .where(["qid", "type"])
.equals([q, saved_exam.exam_type]) .equals([String(q), saved_exam.exam_type])
.delete(); .delete();
} }
d = null; d = null;
@@ -301,7 +301,7 @@ async function loadExamList(data) {
//question_db.saved_exams.where("eid").equals(saved_exam.eid).delete(); //question_db.saved_exams.where("eid").equals(saved_exam.eid).delete();
question_db.question_data question_db.question_data
.where(["qid", "type"]) .where(["qid", "type"])
.equals([q, saved_exam.exam_type]) .equals([String(q), saved_exam.exam_type])
.delete(); .delete();
}); });
} }
@@ -566,6 +566,7 @@ function setUpPacket(data, path) {
if (!use_local_question_cache) { if (!use_local_question_cache) {
// Save the details to the question database // Save the details to the question database
var clone_data = Object.assign({}, data, { questions: "cached" }); var clone_data = Object.assign({}, data, { questions: "cached" });
console.log(clone_data)
//clone_data["cached_questions"] = Object.keys(data["questions"]); //clone_data["cached_questions"] = Object.keys(data["questions"]);
question_db.saved_exams.put(clone_data); question_db.saved_exams.put(clone_data);
} }
@@ -596,7 +597,7 @@ function setUpPacket(data, path) {
(async () => { (async () => {
for (let n in data["question_requests"]) { for (let n in data["question_requests"]) {
question_number++; question_number++;
n = parseInt(n); n = String(n);
let obj = { qid: n, type: question_type }; let obj = { qid: n, type: question_type };
let question_in_db = await question_db.question_data.get(obj); let question_in_db = await question_db.question_data.get(obj);
@@ -765,7 +766,7 @@ function setUpQuestions(load_previous) {
// Store question data into dexie // Store question data into dexie
let d = { let d = {
//eid: exam_details.eid, //eid: exam_details.eid,
qid: parseInt(e), qid: String(e),
type: questions[e].type, type: questions[e].type,
data: questions[e], data: questions[e],
//timestamp: questions[e]["generated"], //timestamp: questions[e]["generated"],
@@ -849,7 +850,6 @@ async function loadQuestion(n, section = 1, force_reload = false) {
const cid = exam_details.cid; const cid = exam_details.cid;
const eid = exam_details.eid; const eid = exam_details.eid;
// Make sure we have an integer
n = parseInt(n); n = parseInt(n);
//console.log("loading question (n)", n); //console.log("loading question (n)", n);
@@ -863,9 +863,10 @@ async function loadQuestion(n, section = 1, force_reload = false) {
console.log(exam_details, n); console.log(exam_details, n);
const qid = exam_details.question_order[n]; const qid = exam_details.question_order[n];
let q = { qid: qid, type: question_type }; console.log("qid", qid)
console.log(q); let q = { qid: String(qid), type: question_type };
console.log(question_db.question_data); console.log(q)
console.log(question_db.question_data)
let return_data = await question_db.question_data.get(q); let return_data = await question_db.question_data.get(q);
const question_data = return_data.data; const question_data = return_data.data;
@@ -1662,7 +1663,7 @@ function reviewQuestions() {
let overcall_number = 0; let overcall_number = 0;
let incorrectcall_number = 0; let incorrectcall_number = 0;
exam_details.question_order.forEach(async function (qid, n) { exam_details.question_order.forEach(async function (qid, n) {
const q_object = { qid: qid, type: question_type }; const q_object = { qid: String(qid), type: question_type };
let question = await question_db.question_data.get(q_object); let question = await question_db.question_data.get(q_object);
question = question.data; question = question.data;
if (question_type == "long") { if (question_type == "long") {