Issue #CO-229 #CO-230 #CO-316 fix: {Reraising PR on release-6.0.0} #303
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| var cheerio = require("cheerio"); | ||
| var cheerioTableparser = require("cheerio-tableparser"); | ||
| const sizeOf = require("image-size"); | ||
| const ProgramServiceHelper = require("../../helpers/programHelper"); | ||
| const programServiceHelper = new ProgramServiceHelper(); | ||
| const optionLabelling = { | ||
| english: {i: 'I', ii: 'II', iii: 'III', iv: 'IV'}, | ||
| hindi: {i: 'क', ii: 'ख', iii: 'ग', iv: 'घ'}, | ||
| } | ||
| const defaultLanguage = 'english' | ||
|
|
||
| var { | ||
| docDefinition, | ||
|
|
@@ -241,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()) { | ||
|
|
@@ -274,20 +275,20 @@ async function renderMCQ(question, questionCounter, marks) { | |
| typeof questionOptions[0][0] === "object" | ||
| ) { | ||
| if (questionOptions[0][0].text) { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'i')+")"}`, questionOptions[0][0].text[1]]); | ||
|
There was a problem hiding this comment. @vaivk369 suggest the better approach of pushing the question to the array. |
||
| imageProperties.push({ | ||
| width: 0, | ||
| height: 0, | ||
| }); | ||
| } else { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'i')+")"}`, questionOptions[0][0].image]); | ||
| imageProperties.push({ | ||
| width: questionOptions[0][0].width, | ||
| height: questionOptions[0][0].height, | ||
| }); | ||
| } | ||
| } else { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'i')+")"}`, questionOptions[0][0]]); | ||
|
There was a problem hiding this comment. Why can't you move the entire this logic into different function as pass the index to it There was a problem hiding this comment. This way if there are only 2 option or more than 4 also the code will works. There was a problem hiding this comment. Shall I resolve this conversation, as this is implemented too? |
||
| imageProperties.push({ | ||
| width: 0, | ||
| height: 0, | ||
|
|
@@ -301,20 +302,20 @@ async function renderMCQ(question, questionCounter, marks) { | |
| typeof questionOptions[1][0] === "object" | ||
| ) { | ||
| if (questionOptions[1][0].text) { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'ii')+")"}`, questionOptions[1][0].text[1]]); | ||
|
There was a problem hiding this comment. Why should I use the same key "II" for all the languages. There was a problem hiding this comment. Cause there must be default options labeling in case of undefined language. There was a problem hiding this comment. Shall I resolve this conversation? |
||
| imageProperties.push({ | ||
| width: 0, | ||
| height: 0, | ||
| }); | ||
| } else { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'ii')+")"}`, questionOptions[1][0].image]); | ||
| imageProperties.push({ | ||
| width: questionOptions[1][0].width, | ||
| height: questionOptions[1][0].height, | ||
| }); | ||
| } | ||
| } else { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'ii')+")"}`, questionOptions[1][0]]); | ||
| imageProperties.push({ | ||
| width: 0, | ||
| height: 0, | ||
|
|
@@ -328,20 +329,20 @@ async function renderMCQ(question, questionCounter, marks) { | |
| typeof questionOptions[2][0] === "object" | ||
| ) { | ||
| if (questionOptions[2][0].text) { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'iii')+")"}`, questionOptions[2][0].text[1]]); | ||
| imageProperties.push({ | ||
| width: 0, | ||
| height: 0, | ||
| }); | ||
| } else { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'iii')+")"}`, questionOptions[2][0].image]); | ||
| imageProperties.push({ | ||
| width: questionOptions[2][0].width, | ||
| height: questionOptions[2][0].height, | ||
| }); | ||
| } | ||
| } else { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'iii')+")"}`, questionOptions[2][0]]); | ||
| imageProperties.push({ | ||
| width: 0, | ||
| height: 0, | ||
|
|
@@ -355,20 +356,20 @@ async function renderMCQ(question, questionCounter, marks) { | |
| typeof questionOptions[3][0] === "object" | ||
| ) { | ||
| if (questionOptions[3][0].text) { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'iv')+")"}`, questionOptions[3][0].text[1]]); | ||
| imageProperties.push({ | ||
| width: 0, | ||
| height: 0, | ||
| }); | ||
| } else { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'iv')+")"}`, questionOptions[3][0].image]); | ||
| imageProperties.push({ | ||
| width: questionOptions[3][0].width, | ||
| height: questionOptions[3][0].height, | ||
| }); | ||
| } | ||
| } else { | ||
| questionOpt.push([`${getLanguageKey(printLanguage, 'iv')+")"}`, questionOptions[3][0]]); | ||
| imageProperties.push({ | ||
| width: 0, | ||
| height: 0, | ||
|
|
@@ -503,9 +504,9 @@ async function renderMTF(question, questionCounter, marks, Type) { | |
| return mtfData; | ||
| } | ||
| function getLanguageKey(lang, key) { | ||
| return optionLabelling[lang] && optionLabelling[lang][key] ? | ||
| optionLabelling[lang][key] : | ||
| optionLabelling[defaultLanguage][key] | ||
| } | ||
|
|
||
| module.exports = { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are the using the keys as i, ii, iii, iv, why can't it be just an array of strings?
optionLabelling = {
"en": ["I", "II", "III" ......],
"hi": ["क", "ख", "ग" ......]
}
This should be configuration driven. should not hardcode here. Later if we want another language, it should be config change. Code should work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes will be implementing this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shall I resolve this conversation, as this one is implemented?