FINAL CHECK : RV
This commit is contained in:
parent
23963dd4de
commit
905d0bed61
11
addform.html
11
addform.html
@ -572,6 +572,8 @@
|
||||
saveButton.click();
|
||||
await new Promise(resolve => setTimeout(resolve, 1000));
|
||||
const swalButton = document.querySelector('.swal2-confirm.swal2-styled');
|
||||
var AutoSaveFileName = document.querySelector('.swal2-input').value;
|
||||
console.log('AutoSaveFileName : ' , AutoSaveFileName);
|
||||
if (swalButton) {
|
||||
swalButton.click();
|
||||
}
|
||||
@ -1400,8 +1402,13 @@ const value = localStorage.getItem('JSON_FOR_NAV')
|
||||
}
|
||||
|
||||
//Function for Create a New Choice Question in the Section and Question Group
|
||||
function groupQuestion( question_id = false, section_id = false , group_question_area_id = false, questionTitle = false, questionDescription = false, questionSubType = false, mathEnabled = false, Choice = false, questionAreaId = false, questionGroupId = false, questionRandomNo = false, QuestionGroupRandomNo = false, questionMarks = false, questionUUID = false, group_question_marks = false, group_question_uuid = false, questionDisplayMarks = false, group_question_Display_Marks = false)
|
||||
{
|
||||
// function groupQuestion( question_id = false, section_id = false , group_question_area_id = false, questionTitle = false, questionDescription = false, questionSubType = false, mathEnabled = false, Choice = false, questionAreaId = false, questionGroupId = false, questionRandomNo = false, QuestionGroupRandomNo = false, questionMarks = false, questionUUID = false, group_question_marks = false, group_question_uuid = false, questionDisplayMarks = false, group_question_Display_Marks = false)
|
||||
function groupQuestion( question_id = false, section_id = false , group_question_area_id = false, questionTitle = false, questionDescription = false, questionType = false, questionSubType = false, mathEnabled = false, Choice = false, questionGroupId = false, questionAreaId = false, questionRandomNo = false, QuestionGroupRandomNo = false, questionMarks = false, questionUUID = false, group_question_marks = false, group_question_uuid = false, questionDisplayMarks = false, group_question_Display_Marks = false)
|
||||
|
||||
|
||||
{
|
||||
|
||||
console.log(Choice)
|
||||
// console.log('===========================================================================================================================================')
|
||||
// console.log("group_question_area_id : "+group_question_area_id, 'questionGroupId : '+ questionGroupId, 'questionAreaId : '+questionAreaId)
|
||||
// console.log('===========================================================================================================================================')
|
||||
|
||||
10
json2html.js
10
json2html.js
@ -20,8 +20,6 @@ function jsonToHtml(jsonData) {
|
||||
else
|
||||
{
|
||||
var title = jsonData.question_paper_title;
|
||||
console.log(title)
|
||||
console.log("TItle")
|
||||
var description = jsonData.question_paper_description;
|
||||
var question_Paper_uuid = jsonData.attributes.Id;
|
||||
var max_marks = jsonData.attributes.MaxMarks;
|
||||
@ -85,12 +83,13 @@ console.log(title)
|
||||
|
||||
if(questionType == 'text')
|
||||
{
|
||||
|
||||
textQuestion(false, false, false, questionTitle, questionDescription, questionSubType, mathEnabled, questionAreaId, false, questionRandomNo, false, questionMarks, questionUUID, false, false, questionDisplayMarks, false);
|
||||
}
|
||||
else if (questionType == 'group')
|
||||
{
|
||||
groupQuestion(false, false, false, questionTitle, questionDescription, questionSubType, mathEnabled, Choice, questionAreaId, false, questionRandomNo, false, questionMarks, questionUUID, false, false, questionDisplayMarks, false);
|
||||
// groupQuestion(false, false, false, questionTitle, questionDescription, questionSubType, mathEnabled, Choice, questionAreaId, false, questionRandomNo, false, questionMarks, questionUUID, false, false, questionDisplayMarks, false);
|
||||
groupQuestion(false, false, false, questionTitle, questionDescription, questionType, questionSubType, mathEnabled, Choice, false, questionAreaId, questionRandomNo, false, questionMarks, questionUUID, false, false, questionDisplayMarks, false);
|
||||
|
||||
|
||||
Choice = Choice.slice(1);
|
||||
Choice.forEach(function(choicenames, index) {
|
||||
@ -160,7 +159,8 @@ function generateGroupQuestion(Question, questionAreaId, questionRandomNo)
|
||||
else if(group_question_Type == 'group')
|
||||
{
|
||||
// console.log('child ggroup'+group_question_Title)
|
||||
groupQuestion(false, false, false, group_question_Title, group_question_Description, mathEnabled, Choice, false, questionGroupId, false, QuestionGroupRandomNo, false, false, group_question_uuid, group_question_marks, false, group_question_Display_Marks);
|
||||
// groupQuestion(false, false, false, group_question_Title, group_question_Description, mathEnabled, Choice, false, questionGroupId, false, QuestionGroupRandomNo, false, false, group_question_marks, group_question_uuid, false, group_question_Display_Marks);
|
||||
groupQuestion(false, false, false, group_question_Title, group_question_Description, group_question_Type, group_questionSubType, mathEnabled, Choice, false, questionGroupId, false, QuestionGroupRandomNo, false, false, group_question_marks, group_question_uuid, false, group_question_Display_Marks);
|
||||
|
||||
|
||||
Choice = Choice.slice(1);
|
||||
|
||||
20
mark_calc.js
20
mark_calc.js
@ -1,7 +1,5 @@
|
||||
function markCalculation() {
|
||||
|
||||
console.clear();
|
||||
|
||||
// Get jsonData from the Localstorage
|
||||
var jsonString = localStorage.getItem('JSON_FOR_NAV');
|
||||
// console.log('jsonData markCalculation');
|
||||
@ -45,7 +43,7 @@ function markCalculation() {
|
||||
}
|
||||
|
||||
var returnvalue = generateSingleQuestions(ParentObjects);
|
||||
console.log('returnvalue of child sum in section : ' , returnvalue);
|
||||
// console.log('returnvalue of child sum in section : ' , returnvalue);
|
||||
|
||||
if(sectionAttemptAny == "")
|
||||
{
|
||||
@ -90,9 +88,9 @@ function generateSingleQuestions(ParentObjects)
|
||||
var questionMarks = Question.marks;
|
||||
var question_Id = Question.question_Id;
|
||||
|
||||
console.log('questionType : ' , questionType);
|
||||
console.log('questionMarks : ' , questionMarks);
|
||||
console.log('##########################################################');
|
||||
// console.log('questionType : ' , questionType);
|
||||
// console.log('questionMarks : ' , questionMarks);
|
||||
// console.log('##########################################################');
|
||||
|
||||
|
||||
var parentMarks = ParentObjects.parentMarks;
|
||||
@ -113,7 +111,7 @@ function generateSingleQuestions(ParentObjects)
|
||||
var QuestionId = question_Id.split("_")[1];
|
||||
QuestionMarkField = document.getElementById('Text_Question_Marks_Id_'+ QuestionId);
|
||||
onlyQuestionMarks = questionMarks !== undefined && questionMarks !== "" ? questionMarks : 0;
|
||||
var questionMarksINT = parseInt(onlyQuestionMarks, 10);
|
||||
var questionMarksINT = parseFloat(onlyQuestionMarks);
|
||||
childMarks = childMarks + questionMarksINT;
|
||||
}
|
||||
else if(questionType == 'group')
|
||||
@ -121,7 +119,7 @@ function generateSingleQuestions(ParentObjects)
|
||||
var QuestionId = question_Id.split("_")[1];
|
||||
QuestionMarkField = document.getElementById('Choice_Question_Marks_Id_' + QuestionId);
|
||||
onlyQuestionMarks = questionMarks !== undefined && questionMarks !== "" ? questionMarks : 0;
|
||||
var questionMarksINT = parseInt(onlyQuestionMarks, 10);
|
||||
var questionMarksINT = parseFloat(onlyQuestionMarks);
|
||||
childMarks = childMarks + questionMarksINT;
|
||||
}
|
||||
|
||||
@ -140,7 +138,7 @@ function generateSingleQuestions(ParentObjects)
|
||||
|
||||
var returnValue = generateGroupQuestions(QuestionGroupObjects); //function for forEach QuestionGroups and Questions
|
||||
onlyQuestionMarks = returnValue !== undefined && returnValue !== "" ? returnValue : 0;
|
||||
var questionGroupMarksINT = parseInt(onlyQuestionMarks, 10);
|
||||
var questionGroupMarksINT = parseFloat(onlyQuestionMarks);
|
||||
childMarks = childMarks + questionGroupMarksINT;
|
||||
}
|
||||
else
|
||||
@ -165,7 +163,7 @@ function generateSingleQuestions(ParentObjects)
|
||||
|
||||
//End of Questions Foreach
|
||||
|
||||
console.log('ChildMarks sum in Questions: ', childMarks);
|
||||
// console.log('ChildMarks sum in Questions: ', childMarks);
|
||||
return childMarks;
|
||||
|
||||
}
|
||||
@ -241,7 +239,7 @@ function generateGroupQuestions(QuestionGroupObjects)
|
||||
|
||||
|
||||
var returnvalue = generateSingleQuestions(QuestionGroupObjects);
|
||||
console.log('ReturnValue of child sum in questionGroup: ' , returnvalue);
|
||||
// console.log('ReturnValue of child sum in questionGroup: ' , returnvalue);
|
||||
|
||||
if(returnvalue)
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user