Commit ff99b549 authored by snehar-nd's avatar snehar-nd
Browse files

Fix for Instructions in question paper(Instruction values are missing sometimes.)

Showing with 5 additions and 14 deletions
+5 -14
...@@ -45,7 +45,7 @@ const getQuestionSet = async (id) => { ...@@ -45,7 +45,7 @@ const getQuestionSet = async (id) => {
headers, headers,
}; };
return axios(request).then((r) => { return axios(request).then(async (r) => {
const data = r.data.result.questionSet; const data = r.data.result.questionSet;
let sections; let sections;
if (data && "children" in data) sections = data.children; if (data && "children" in data) sections = data.children;
...@@ -65,17 +65,8 @@ const getQuestionSet = async (id) => { ...@@ -65,17 +65,8 @@ const getQuestionSet = async (id) => {
}); });
else return []; else return [];
}); // Hierarchy }); // Hierarchy
const instructions = getQuestionForSet(id).then((resp) => { const instructions = await getQuestionForSet(id);
return resp.instructions.default;
});
var introData
instructions.then((result)=>{
introData = result
})
const promiseMap = questionIds.map((sec) => const promiseMap = questionIds.map((sec) =>
sec.map((question) => { sec.map((question) => {
...@@ -109,7 +100,7 @@ const getQuestionSet = async (id) => { ...@@ -109,7 +100,7 @@ const getQuestionSet = async (id) => {
return { return {
sectionData, sectionData,
paperData: data, paperData: data,
instructions: introData instructions: instructions.instructions.default
}; };
}); });
}); });
......
...@@ -20,11 +20,11 @@ const buildDOCX_1_WithCallback = async (id, callback) => { ...@@ -20,11 +20,11 @@ const buildDOCX_1_WithCallback = async (id, callback) => {
callback(null, data.error, data.errorMsg); callback(null, data.error, data.errorMsg);
} else { } else {
let subject, grade, examName, instructions, language, description; let subject, grade, examName, instructions, language, description;
if(data.instructions) instructions = data.instructions;
if (data.paperData) { if (data.paperData) {
subject = data.paperData.subject && data.paperData.subject[0]; subject = data.paperData.subject && data.paperData.subject[0];
grade = data.paperData.gradeLevel && data.paperData.gradeLevel[0]; grade = data.paperData.gradeLevel && data.paperData.gradeLevel[0];
examName = data.paperData.name; examName = data.paperData.name;
instructions = data.instructions;
language = data.paperData.medium && data.paperData.medium[0]; language = data.paperData.medium && data.paperData.medium[0];
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment