Issue #CO-229 #CO-230 #CO-316 fix: {Reraising PR on release-6.0.0}

src/service/print/csv.js

@@ -7,7 +7,10 @@ const buildCSVWithCallback = async (id, callback) => {
   let error = false;
   let errorMsg = "";
   let totalMarks = 0;
-  getQuestionSet(id)
+  const config = {
+   id: id
+  }
+  getQuestionSet(config)
     .then(async (data) => {
       if (data.error) {
         callback(null, data.error, data.errorMsg, null);
@@ -392,7 +395,6 @@ async function renderMCQ(
   questionOptions.forEach(( quesOpt , i)=>{
     data[`Option${i+1}`] =   quesOpt[0]
   })
-
   return data;
 }
 

src/service/print/docxHelper.js

@@ -1,9 +1,13 @@
 var cheerio = require("cheerio");
 var cheerioTableparser = require("cheerio-tableparser");
 const sizeOf = require("image-size");
-const { compact } = require("lodash");
 const ProgramServiceHelper = require("../../helpers/programHelper");
 const programServiceHelper = new ProgramServiceHelper();
+const optionLabelling = {
+  english: ['i', 'ii', 'iii', 'iv'],
+  hindi: ['क', 'ख', 'ग', 'घ'],
+}
+const defaultLanguage = 'english'
 
 var {
   docDefinition,
@@ -237,6 +241,7 @@ async function getStack(htmlString) {
 }
 
 async function renderMCQ(question, questionCounter, marks) {
+  const printLanguage = (question.medium && question.medium.length) ? question.medium[0].toLowerCase() : defaultLanguage;
   const questionOptions = [];
   let questionTitle;
   for (const [index, qo] of question.editorState.options.entries()) {
@@ -264,113 +269,11 @@ async function renderMCQ(question, questionCounter, marks) {
 
   let questionOpt = [];
   let imageProperties = [];
-  if (questionOptions[0] !== undefined) {
-    if (
-      questionOptions[0][0] !== undefined &&
-      typeof questionOptions[0][0] === "object"
-    ) {
-      if (questionOptions[0][0].text) {
-        questionOpt.push(["I.", questionOptions[0][0].text[1]]);
-        imageProperties.push({
-          width: 0,
-          height: 0,
-        });
-      } else {
-        questionOpt.push(["I.", questionOptions[0][0].image]);
-        imageProperties.push({
-          width: questionOptions[0][0].width,
-          height: questionOptions[0][0].height,
-        });
-      }
-    } else {
-      questionOpt.push(["I.", questionOptions[0][0]]);
-      imageProperties.push({
-        width: 0,
-        height: 0,
-      });
-    }
-  }
 
-  if (questionOptions[1] !== undefined) {
-    if (
-      questionOptions[1][0] !== undefined &&
-      typeof questionOptions[1][0] === "object"
-    ) {
-      if (questionOptions[1][0].text) {
-        questionOpt.push(["II.", questionOptions[1][0].text[1]]);
-        imageProperties.push({
-          width: 0,
-          height: 0,
-        });
-      } else {
-        questionOpt.push(["II.", questionOptions[1][0].image]);
-        imageProperties.push({
-          width: questionOptions[1][0].width,
-          height: questionOptions[1][0].height,
-        });
-      }
-    } else {
-      questionOpt.push(["II.", questionOptions[1][0]]);
-      imageProperties.push({
-        width: 0,
-        height: 0,
-      });
-    }
+  for (let i = 0; i < questionOptions.length; i++) {
+    setOptions(questionOptions, questionOpt, imageProperties, printLanguage, i)
   }
 
-  if (questionOptions[2] !== undefined) {
-    if (
-      questionOptions[2][0] !== undefined &&
-      typeof questionOptions[2][0] === "object"
-    ) {
-      if (questionOptions[2][0].text) {
-        questionOpt.push(["III.", questionOptions[2][0].text[1]]);
-        imageProperties.push({
-          width: 0,
-          height: 0,
-        });
-      } else {
-        questionOpt.push(["III.", questionOptions[2][0].image]);
-        imageProperties.push({
-          width: questionOptions[2][0].width,
-          height: questionOptions[2][0].height,
-        });
-      }
-    } else {
-      questionOpt.push(["III.", questionOptions[2][0]]);
-      imageProperties.push({
-        width: 0,
-        height: 0,
-      });
-    }
-  }
-
-  if (questionOptions[3] !== undefined) {
-    if (
-      questionOptions[3][0] !== undefined &&
-      typeof questionOptions[3][0] === "object"
-    ) {
-      if (questionOptions[3][0].text) {
-        questionOpt.push(["IV.", questionOptions[3][0].text[1]]);
-        imageProperties.push({
-          width: 0,
-          height: 0,
-        });
-      } else {
-        questionOpt.push(["IV.", questionOptions[3][0].image]);
-        imageProperties.push({
-          width: questionOptions[3][0].width,
-          height: questionOptions[3][0].height,
-        });
-      }
-    } else {
-      questionOpt.push(["IV.", questionOptions[3][0]]);
-      imageProperties.push({
-        width: 0,
-        height: 0,
-      });
-    }
-  }
   let data = {
     QuestionIndex: questionCounter,
     Questions: questionTitle,
@@ -394,6 +297,36 @@ async function renderMCQ(question, questionCounter, marks) {
   return data;
 }
 
+function setOptions(questionOptions, questionOpt, imageProperties, printLanguage, i) {
+  console.log('printLanguage', printLanguage);
+  if (questionOptions[i] !== undefined) {
+    if (
+      questionOptions[i][0] !== undefined &&
+      typeof questionOptions[i][0] === "object"
+    ) {
+      if (questionOptions[i][0].text) {
+        questionOpt.push([`${getLanguageKey(printLanguage, i)+")"}`, questionOptions[i][0].text[1]]);
+        imageProperties.push({
+          width: 0,
+          height: 0,
+        });
+      } else {
+        questionOpt.push([`${getLanguageKey(printLanguage, i)+")"}`, questionOptions[i][0].image]);
+        imageProperties.push({
+          width: questionOptions[i][0].width,
+          height: questionOptions[i][0].height,
+        });
+      }
+    } else {
+      questionOpt.push([`${getLanguageKey(printLanguage, i)+")"}`, questionOptions[i][0]]);
+      imageProperties.push({
+        width: 0,
+        height: 0,
+      });
+    }
+  }
+}
+
 async function renderQuestion(question, questionCounter, marks, Type) {
   let data;
   $ = cheerio.load(question.editorState.question);
@@ -498,6 +431,14 @@ async function renderMTF(question, questionCounter, marks, Type) {
 
   return mtfData;
 }
+function getLanguageKey(lang, index) {
+  console.log('KKK', index);
+  if (optionLabelling.hasOwnProperty(lang) && optionLabelling[lang].length > index) {
+    return optionLabelling[lang][index];
+  }
+
+  return optionLabelling[defaultLanguage][index];
+}
 
 module.exports = {
   renderComprehension,

src/service/print/getdocxdata.js

@@ -20,6 +20,8 @@ const {
 const _ = require("lodash");
 
 function create(data, paperData) {
+  const language = (paperData && paperData.language) ? paperData.language.toLowerCase(): defaultLanguage;
+
   const doc = new Document({
     sections: [
       {
@@ -226,9 +228,9 @@ function create(data, paperData) {
                     count++;
                   });
                   arr.push(
-                    new Paragraph({
-                      children: [], // Just newline without text
-                    })
+                    // new Paragraph({
+                    //   children: [], // Just newline without text
+                    // })
                   );
                   arr.push(optionsTabel(testimage));
                   arr.push(
@@ -711,8 +713,8 @@ function displayNumber(data) {
           type: WidthType.DXA,
         },
         margins: {
-          top: convertInchesToTwip(0.0693701),
-          bottom: convertInchesToTwip(0.0693701),
+          top: convertInchesToTwip(0.0093701),
+          bottom: convertInchesToTwip(0.0093701),
           left: convertInchesToTwip(0.3493701),
           right: convertInchesToTwip(0.0693701),
         },
@@ -992,6 +994,12 @@ function optionsTabel(testimage) {
   });
 }
 
+function getLanguageKey(lang, key) {
+  return basicDetails[lang] && basicDetails[lang][key] ?
+  basicDetails[lang][key] :
+  basicDetails[defaultLanguage][key]
+}
+
 module.exports = {
   create,
 };

src/service/print/lang/english.json

@@ -0,0 +1,9 @@
+{
+    "studentName" : "Student Name",
+    "rollNo": "Roll Number",
+    "subject": "Subject",
+    "class": "Class",
+    "time": "Time",
+    "marks": "Marks",
+    "instructionHead": "Instructions"
+}

src/service/print/lang/hindi.json

@@ -0,0 +1,9 @@
+{
+    "studentName" : "विद्यार्थी का नाम",
+    "rollNo": "रोल न",
+    "subject": "विषय",
+    "class": "कक्षा",
+    "time": "समय",
+    "marks": "कुल अंक",
+    "instructionHead": "निर्देश"
+}