diff --git a/stable.user.js b/stable.user.js index 88d841c..5c40d59 100755 --- a/stable.user.js +++ b/stable.user.js @@ -315,8 +315,8 @@ }) getQuizData() - .then(res => { - if (res.length === 0) { + .then(readQuestions => { + if (readQuestions.length === 0) { ShowMessage( { m: texts.unableToParseTestQuestion, @@ -332,47 +332,30 @@ return } - const promises = [] - res.forEach(question => { - const questionObj = { - q: question.question, + const questions = readQuestions.map(question => { + return { + Q: question.question, data: question.data, - subj: getCurrentSubjectName(), } - promises.push( - new Promise(resolve => { - GetXHRQuestionAnswer(questionObj).then(res => { - resolve({ - answers: res, - question: question, - }) - }) - }) - ) }) - // const questions = res.map(question => { - // return { - // q: question.question, - // data: question.data, - // subj: getCurrentSubjectName(), - // } - // }) - - // console.log(questions) - // post('ask', { - // questions: questions, - // location: location.href, - // version: info().script.version, - // cid: cid, - // uid: uid, - // }).then(results => { - // console.log('RES') - // console.log(results) - - Promise.all(promises).then(results => { + post('ask', { + questions: questions, + subj: getCurrentSubjectName(), + location: location.href, + version: info().script.version, + cid: cid, + uid: uid, + }).then(results => { removeLoadingMessage() - ShowAnswers(results) + ShowAnswers( + results.map((res, i) => { + return { + answers: res.answers, + question: readQuestions[i], + } + }) + ) }) }) .catch(err => {