diff --git a/addform.html b/addform.html index 87e4894..abf600d 100644 --- a/addform.html +++ b/addform.html @@ -537,6 +537,8 @@ + + @@ -822,7 +824,7 @@ function addSection(title = false, description = false, random_no = false, secti
Attempt Any :
- +
@@ -830,7 +832,7 @@ function addSection(title = false, description = false, random_no = false, secti
Marks :
- +
@@ -841,20 +843,6 @@ function addSection(title = false, description = false, random_no = false, secti - -
-
-
-
- - - - - -
-
-
-
`; var formContainer = document.getElementById('addNewSection'); @@ -1019,29 +1007,45 @@ function addSection(title = false, description = false, random_no = false, secti } + + //mark calculation code for section // var Section_Attempt_Any_raw_Id = 'Section_Attempt_Any_Id_' + sectionRandomID; - // var Section_Attempt_Any_Id = document.getElementById(Section_Attempt_Any_raw_Id) + // var Section_Marks_raw_Id = 'Section_Marks_Id_' + sectionRandomID; - // var Section_Marks_raw_Id = 'Section_Marks_Id_' + sectionRandomID; - // var Section_Marks_Id = document.getElementById(Section_Marks_raw_Id) - // console.log(Section_Marks_Id); + // $('#'+Section_Marks_raw_Id).prop("disabled", true); - // $(Section_Attempt_Any_Id).keyup(function() { - // var inputValue = $(this).val(); - - // if(inputValue == "") - // { - - // $(Section_Marks_Id).prop("disabled", true); - // } - // else{ - - // $(Section_Marks_Id).prop("disabled", false); - - // } + // $('#'+Section_Attempt_Any_raw_Id).keyup(function() { + // var inputValue = $(this).val(); + + // if(inputValue == ""){ + // $('#'+Section_Marks_raw_Id).prop("disabled", true); + // }else{ + // $('#'+Section_Marks_raw_Id).prop("disabled", false); + // } + // json2nav(); // }); + //end of mark calculation code for section + + + +// function for calling html2json script using Mark Calculation +var Section_Attempt_Any_raw_Id = 'Section_Attempt_Any_Id_' + sectionRandomID; +var Section_Marks_raw_Id = 'Section_Marks_Id_' + sectionRandomID; +$('#'+Section_Attempt_Any_raw_Id).keyup(function() { + + json2nav() + markCalculation() + +}); +$('#'+Section_Marks_raw_Id).keyup(function() { + + json2nav() + markCalculation() + +}); + json2nav(); clearSidebarWrapper(); @@ -1146,7 +1150,7 @@ function addQuestionGroup(idObj)
Attempt Any :
- +
@@ -1154,7 +1158,7 @@ function addQuestionGroup(idObj)
Marks :
- +
@@ -1164,18 +1168,6 @@ function addQuestionGroup(idObj)
-
-
-
-
- - - - -
-
-
-
`; @@ -1227,13 +1219,7 @@ function addQuestionGroup(idObj) }); - var groupQuestion = 'draggedGroup_'+QuestionGroup_ID; - $('#'+groupQuestion).click(function(){ - - // alert('draggedGroup_'); - - }) - + var removeAndCloneTextQuestion_Raw = 'QuestionGroupButtons_'+QuestionGroup_ID; var AddButtons_Raw = 'AddButton_'+QuestionGroup_ID; $('#'+removeAndCloneTextQuestion_Raw).mouseenter(function(){ @@ -1247,7 +1233,7 @@ function addQuestionGroup(idObj) var subSectionText = 'subSection_title_text_' + QuestionGroup_ID; var quill = new Quill('#'+subSectionText, { - theme: 'snow', // Choose a theme (snow, bubble, etc.) + theme: 'snow', modules: { toolbar: toolbarOptions }, @@ -1308,38 +1294,137 @@ function addQuestionGroup(idObj) } +//mark calculation in QuestionGroup - var question_groupid = 'subSection_title_text_'+ QuestionGroup_ID; - var inputElement = document.getElementById(question_groupid); - inputElement.addEventListener("keyup", function(event) { +// var Question_Group_Marks_Field = 'Question_Group_Marks_Id_' + QuestionGroup_ID; - json2nav(); - clearSidebarWrapper(); - navpane(); +// var sectionRandomID = localStorage.getItem('sectionId'); +// var Section_Attempt_Any_raw_Id = 'Section_Attempt_Any_Id_' + sectionRandomID; +// var Section_Marks_raw_Id = 'Section_Marks_Id_' + sectionRandomID; +// var InMarkValue = $('#'+Section_Marks_raw_Id).val(); - }); +// var Question_Attempt_Any_Fields = 'Question_Attempt_Any_Id_'+ QuestionGroup_ID; - json2nav(); - clearSidebarWrapper(); - navpane(); +// var QGinputValue = $('#'+Section_Attempt_Any_raw_Id).val(); + +// if(QGinputValue == ""){ +// $('#'+Question_Group_Marks_Field).prop("disabled", false); +// }else{ +// $('#'+Question_Group_Marks_Field).prop("disabled", true); +// $('#'+Question_Group_Marks_Field).val(InMarkValue); +// } + + + + +// $('#'+Section_Attempt_Any_raw_Id).keyup(function() { +// var inputValue = $(this).val(); + +// var Question_Attempt_Any_Fields_values = $('#'+Question_Attempt_Any_Fields).val(); +// console.log(Question_Attempt_Any_Fields_values); + +// if(Question_Attempt_Any_Fields_values == "") +// { +// if(inputValue == ""){ +// $('#'+Question_Group_Marks_Field).prop("disabled", false); +// // alert('enable'); +// }else{ +// $('#'+Question_Group_Marks_Field).prop("disabled", true); +// // alert('disabled'); + +// } +// } + +// json2nav(); +// }); + +// $('#'+Section_Marks_raw_Id).keyup(function() { +// var MarksinputValue = $(this).val(); +// if(MarksinputValue !== ""){ +// $('#'+Question_Group_Marks_Field).val(MarksinputValue); +// }else{ +// $('#'+Question_Group_Marks_Field).val(""); +// } +// }); + + +// $('#'+Question_Attempt_Any_Fields).keyup(function() { +// var inputValue = $(this).val(); +// if(inputValue == ""){ +// $('#'+Question_Group_Marks_Field).prop("disabled", true); +// // alert('disabled'); +// }else{ +// $('#'+Question_Group_Marks_Field).prop("disabled", false); +// // alert('enable'); + +// } +// json2nav(); +// }); + +//end of mark calculation in Choice Question + +var question_groupid = 'subSection_title_text_'+ QuestionGroup_ID; +var inputElement = document.getElementById(question_groupid); +inputElement.addEventListener("keyup", function(event) { + + json2nav(); + clearSidebarWrapper(); + navpane(); + +}); + +// function for calling html2json using Mark Calculation +var Question_Group_Marks_Field = 'Question_Group_Marks_Id_' + QuestionGroup_ID; +var Question_Attempt_Any_Fields = 'Question_Attempt_Any_Id_'+ QuestionGroup_ID; +$('#'+Question_Group_Marks_Field).keyup(function() { + json2nav() + markCalculation() +}); +$('#'+Question_Attempt_Any_Fields).keyup(function() { + + json2nav() + markCalculation() + +}); + +json2nav(); +clearSidebarWrapper(); +navpane(); + } //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, questionType = false, questionSubType = false, mathEnabled = false, Choice = false, random_no = 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) +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) { - - console.log('===========================================================================================================================================') - console.log("group_question_area_id : "+group_question_area_id, 'questionGroupId : '+ questionGroupId, 'questionAreaId : '+questionAreaId) - console.log('===========================================================================================================================================') - - + + // console.log( + // 'question_id : '+question_id, + // 'section_id : ' + section_id, + // 'group_question_area_id : ' + group_question_area_id, + // 'questionTitle : '+ questionTitle, + // 'questionDescription : ' + questionDescription, + // 'questionSubType : ' + questionSubType, + // 'mathEnabled : ' + mathEnabled, + // Choice, + // 'questionAreaId : ' + questionAreaId, + // 'questionGroupId : ' + questionGroupId, + // 'questionRandomNo : ' + questionRandomNo, + // 'QuestionGroupRandomNo : ' + QuestionGroupRandomNo, + // 'questionMarks : ' + questionMarks, + // 'questionUUID : ' + questionUUID, + // 'group_question_marks : ' + group_question_marks, + // 'group_question_uuid : ' + group_question_uuid, + // 'questionDisplayMarks : ' + questionDisplayMarks, + // 'group_question_Display_Marks : ' + group_question_Display_Marks) + const ChoiceGroupFixed_UUID = uuidv4(); var groupQuestion = ""; const text_field_created_time = Date.now();// random number for dynamic ID - using current date time + localStorage.setItem('questionsId', text_field_created_time); - var addChoiceAreaId = "" + var addChoiceAreaId = ""; if(questionRandomNo) { addChoiceAreaId = questionRandomNo; @@ -1367,7 +1452,7 @@ function groupQuestion( question_id = false, section_id = false , group_question } else { - marks = 0; + marks = ""; } var UUID = ""; @@ -1447,14 +1532,14 @@ function groupQuestion( question_id = false, section_id = false , group_question
-
${questionType == 'group' ? questionTitle : ''}
+
${questionTitle ? questionTitle : ''}
-
${questionType == 'group' ? questionDescription : ''}
+
${questionDescription ? questionDescription : ''}
${mathEnabled == 'true' ? questionDescription : ''}
@@ -1569,14 +1654,14 @@ function groupQuestion( question_id = false, section_id = false , group_question var choiceTextField = 'choiceTextField_'+addChoiceAreaId; var choicecommentFielddelete = 'newChoiceGroup_'+addChoiceAreaId; - var ChoiceMathSwitchId = document.getElementById(ChoiceMathSwitch) + var ChoiceMathSwitchId = document.getElementById(ChoiceMathSwitch); var textQuestionSubtitle_mathId = document.getElementById(textQuestionSubtitle_math) var textQuestionSubtitleId = document.getElementById(textQuestionSubtitle) var choiceTextField_math_Id = document.getElementById(choiceTextField_math) var choiceTextFieldId = document.getElementById(choiceTextField) var choicecommentFielddeleteId = document.getElementById(choicecommentFielddelete) - + if (mathEnabled === 'true') { @@ -1592,7 +1677,7 @@ function groupQuestion( question_id = false, section_id = false , group_question else { - ChoiceMathSwitchId.checked = false; + $(ChoiceMathSwitchId).checked = false; $(textQuestionSubtitleId).show(); $(textQuestionSubtitle_mathId).hide(); $(choiceTextFieldId).show(); @@ -1601,7 +1686,7 @@ function groupQuestion( question_id = false, section_id = false , group_question - ChoiceMathSwitchId.addEventListener("change", function() { + $(ChoiceMathSwitchId).change(function() { if (ChoiceMathSwitchId.checked) { $(textQuestionSubtitle_mathId).show(); @@ -1664,19 +1749,39 @@ function groupQuestion( question_id = false, section_id = false , group_question var QuestionGroupAddButtons_ID = document.getElementById(QuestionGroupAddButtons_Raw) var removeAndCloneTextQuestion_ID = document.getElementById(removeAndCloneTextQuestion_Raw); + //for hide and the side button + var questiongrouparea = ""; + if(questionAreaId !== false) + { + questiongrouparea = questionAreaId.split("_")[0]; + } + else + { + var questiongrouparea = 'false'; + } + if(group_question_area_id !== false) { - // alert('true') + $('#'+overallQuestionGroupAddButtons_Raw).show(); $('#'+overallAddButtons_Raw).hide(); } else{ - // alert('false') - $('#'+overallQuestionGroupAddButtons_Raw).hide(); - $('#'+overallAddButtons_Raw).show(); + + if(questiongrouparea === 'group') + { + $('#'+overallQuestionGroupAddButtons_Raw).show(); + $('#'+overallAddButtons_Raw).hide(); + } + else + { + $('#'+overallQuestionGroupAddButtons_Raw).hide(); + $('#'+overallAddButtons_Raw).show(); + } + } @@ -1690,7 +1795,14 @@ function groupQuestion( question_id = false, section_id = false , group_question } else { - add_button_hide_and_show(AddButtons_Raw); + if(questiongrouparea === 'group') + { + add_button_hide_and_show(QuestionGroupAddButtons_Raw); + } + else + { + add_button_hide_and_show(AddButtons_Raw); + } } }) @@ -1704,101 +1816,178 @@ function groupQuestion( question_id = false, section_id = false , group_question var removeAndCloneTextQuestion_ID = document.getElementById(removeAndCloneTextQuestion_Raw); - // $(removeAndCloneTextQuestion_ID).click(function(){ - - // // alert('choice'); - // }) +//mark calculation in Choice Question + +// var choiceQuestionMarkField = 'Choice_Question_Marks_Id_' + addChoiceAreaId; + +// var sectionRandomID = localStorage.getItem('sectionId'); +// var Section_Attempt_Any_raw_Id = 'Section_Attempt_Any_Id_' + sectionRandomID; +// var Section_Marks_raw_Id = 'Section_Marks_Id_' + sectionRandomID; + +// var InMarkValue = $('#'+Section_Marks_raw_Id).val(); +// // alert(InMarkValue); + +// var QuestionGroup_ID = localStorage.getItem('QuestionGroupId'); +// var Question_Attempt_Any_Fields = 'Question_Attempt_Any_Id_' + QuestionGroup_ID; - var typetwoQuestionName = 'textQuestionName_' + addChoiceAreaId; - - var quill = new Quill('#'+typetwoQuestionName, { - theme: 'snow', - modules: { - toolbar: toolbarOptions - }, - }); - - var typetwoQuestionSubtitle = 'textQuestionSubtitle_' + addChoiceAreaId; - var quill = new Quill('#'+typetwoQuestionSubtitle, { - theme: 'snow', - modules: { - toolbar: toolbarOptions - }, - }); - - var choiceTextField = 'choiceTextField_' + addChoiceAreaId; - var quill = new Quill('#'+choiceTextField, { - theme: 'snow', - modules: { - toolbar: toolbarOptions2 - }, - placeholder: 'Enter Choice', - }); - - var textQuestionName_Div = 'textQuestionName_' + addChoiceAreaId; - var textQuestionNewRTEId = 'typeTwotextQuestionName_rtc_' + addChoiceAreaId; - var textQuestionName_previousDiv = $('#'+textQuestionName_Div).prev(); - textQuestionName_previousDiv.attr("id", textQuestionNewRTEId); - $('#'+textQuestionName_Div).click(function() { - - rtc_hide_and_show(textQuestionNewRTEId); - - }); - - - var textQuestionSubtitle_Div = 'textQuestionSubtitle_' + addChoiceAreaId; - var textQuestionSubtitleNewRTEId = 'typeTwotextQuestionSubtitle_rtc_' + addChoiceAreaId; - var textQuestionSubtitle_previousDiv = $('#'+textQuestionSubtitle_Div).prev(); - textQuestionSubtitle_previousDiv.attr("id", textQuestionSubtitleNewRTEId); - $('#'+textQuestionSubtitle_Div).click(function() { - - rtc_hide_and_show(textQuestionSubtitleNewRTEId); - - }); - - var choiceTextField_Div = 'choiceTextField_' + addChoiceAreaId; - var choiceTextNewRTEId = 'choiceTextField_rtc_' + addChoiceAreaId; - var choiceTextField_previousDiv = $('#'+choiceTextField_Div).prev(); - choiceTextField_previousDiv.attr("id", choiceTextNewRTEId); - $('#'+choiceTextField_Div).click(function() { - - rtc_hide_and_show(choiceTextNewRTEId); - - }); - $(textQuestionName_previousDiv).hide(); - $(textQuestionSubtitle_previousDiv).hide(); - $(choiceTextField_previousDiv).hide(); +// //these lines are work only the 'ChoiceQuestion()(groupQuestion)' function calls +// var QGinputValue = $('#'+Section_Attempt_Any_raw_Id).val(); + +// if(QGinputValue == ""){ +// $('#'+choiceQuestionMarkField).prop("disabled", false); +// // alert('enable'); +// }else{ +// $('#'+choiceQuestionMarkField).prop("disabled", true); +// $('#'+choiceQuestionMarkField).val(InMarkValue); +// // alert('disabled'); +// } +// //end of the lines - var DisplayMark_RawID = "Choice_Question_Display_Marks_Id_" + addChoiceAreaId; - var DisplayMark_ID = document.getElementById(DisplayMark_RawID) - if(questionDisplayMarks === 'true'){ +// $('#'+Section_Attempt_Any_raw_Id).keyup(function() { +// var inputValue = $(this).val(); +// if(inputValue == ""){ +// $('#'+choiceQuestionMarkField).prop("disabled", false); +// // alert('enable'); +// }else{ +// $('#'+choiceQuestionMarkField).prop("disabled", true); +// // alert('disabled'); - DisplayMark_ID.checked = true; - }else if(group_question_Display_Marks === 'true'){ - DisplayMark_ID.checked = true; - }else{ - DisplayMark_ID.checked = false; - } +// } +// json2nav(); +// }); + +// $('#'+Section_Marks_raw_Id).keyup(function() { +// var MarksinputValue = $(this).val(); + +// if(MarksinputValue !== ""){ +// $('#'+choiceQuestionMarkField).val(MarksinputValue); +// }else{ +// $('#'+choiceQuestionMarkField).val(""); +// } +// }); - var choiceid = 'textQuestionName_'+ addChoiceAreaId; - var inputElement = document.getElementById(choiceid); - $(inputElement).keyup(function(event) { - - json2nav(); - clearSidebarWrapper(); - navpane(); +// $('#'+Question_Attempt_Any_Fields).keyup(function() { +// var inputValue = $(this).val(); +// if(inputValue == ""){ +// $('#'+choiceQuestionMarkField).prop("disabled", false); +// // alert('enable') +// }else{ +// $('#'+choiceQuestionMarkField).prop("disabled", true); +// // alert('disabled'); - }); - - json2nav(); - clearSidebarWrapper(); - navpane(); - } +// } +// json2nav(); +// }); + +//end of mark calculation in Choice Question + + + +var typetwoQuestionName = 'textQuestionName_' + addChoiceAreaId; +var quill = new Quill('#'+typetwoQuestionName, { + theme: 'snow', + modules: { + toolbar: toolbarOptions + }, +}); + +var typetwoQuestionSubtitle = 'textQuestionSubtitle_' + addChoiceAreaId; +var quill = new Quill('#'+typetwoQuestionSubtitle, { + theme: 'snow', + modules: { + toolbar: toolbarOptions + }, +}); + +var choiceTextField = 'choiceTextField_' + addChoiceAreaId; +var quill = new Quill('#'+choiceTextField, { + theme: 'snow', + modules: { + toolbar: toolbarOptions2 + }, + placeholder: 'Enter Choice', +}); + + + +var textQuestionName_Div = 'textQuestionName_' + addChoiceAreaId; +var textQuestionNewRTEId = 'typeTwotextQuestionName_rtc_' + addChoiceAreaId; +var textQuestionName_previousDiv = $('#'+textQuestionName_Div).prev(); +textQuestionName_previousDiv.attr("id", textQuestionNewRTEId); +$('#'+textQuestionName_Div).click(function() { + + rtc_hide_and_show(textQuestionNewRTEId); + +}); + + +var textQuestionSubtitle_Div = 'textQuestionSubtitle_' + addChoiceAreaId; +var textQuestionSubtitleNewRTEId = 'typeTwotextQuestionSubtitle_rtc_' + addChoiceAreaId; +var textQuestionSubtitle_previousDiv = $('#'+textQuestionSubtitle_Div).prev(); +textQuestionSubtitle_previousDiv.attr("id", textQuestionSubtitleNewRTEId); +$('#'+textQuestionSubtitle_Div).click(function() { + + rtc_hide_and_show(textQuestionSubtitleNewRTEId); + +}); + +var choiceTextField_Div = 'choiceTextField_' + addChoiceAreaId; +var choiceTextNewRTEId = 'choiceTextField_rtc_' + addChoiceAreaId; +var choiceTextField_previousDiv = $('#'+choiceTextField_Div).prev(); +choiceTextField_previousDiv.attr("id", choiceTextNewRTEId); +$('#'+choiceTextField_Div).click(function() { + + rtc_hide_and_show(choiceTextNewRTEId); + +}); +$(textQuestionName_previousDiv).hide(); +$(textQuestionSubtitle_previousDiv).hide(); +$(choiceTextField_previousDiv).hide(); + + +var DisplayMark_RawID = "Choice_Question_Display_Marks_Id_" + addChoiceAreaId; +var DisplayMark_ID = document.getElementById(DisplayMark_RawID) + +if(questionDisplayMarks === 'true'){ + + DisplayMark_ID.checked = true; +}else if(group_question_Display_Marks === 'true'){ + DisplayMark_ID.checked = true; +}else{ + DisplayMark_ID.checked = false; +} + + +var choiceid = 'textQuestionName_'+ addChoiceAreaId; +var inputElement = document.getElementById(choiceid); +$(inputElement).keyup(function(event) { + + json2nav(); + clearSidebarWrapper(); + navpane(); + +}); + +// function for calling html2json using Mark Calculation +var choiceQuestionMarkField = 'Choice_Question_Marks_Id_' + addChoiceAreaId; +$('#'+choiceQuestionMarkField).keyup(function() { + + json2nav() + markCalculation() + +}); + +json2nav(); +clearSidebarWrapper(); +navpane(); + + +} //Function for Create a New Choice Field in a Choice Question function addNewChoice(NewaddChoiceAreaId = false , choiceName = false, choiceDescription = false, questionRandomNo = false, QuestionGroupRandomNo = false, choiceID = false, mathEnabled= false) @@ -1955,12 +2144,8 @@ function addNewChoice(NewaddChoiceAreaId = false , choiceName = false, choiceDes } //Function for Create a New Text Question in the Section and Question Group -function textQuestion(question_id = false, section_id = false, group_question_area_id = false, questionTitle = false, questionDescription = false, questionType = false, questionSubType = false, mathEnabled = false, random_no = 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) +function textQuestion(question_id = false, section_id = false, group_question_area_id = false, questionTitle = false, questionDescription = false, questionSubType = false, mathEnabled = 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('===========================================================================================================================================') - console.log("group_question_area_id : "+group_question_area_id, 'questionGroupId : '+ questionGroupId, 'questionAreaId : '+questionAreaId) - console.log('===========================================================================================================================================') - const Text_Question_UUID = uuidv4(); var textQuestion = ""; @@ -1979,6 +2164,7 @@ function textQuestion(question_id = false, section_id = false, group_question_ar { addTextQuestionId = text_field_created_time; } + localStorage.setItem('questionsId', addTextQuestionId); @@ -1993,7 +2179,7 @@ function textQuestion(question_id = false, section_id = false, group_question_ar } else { - marks = 0; + marks = ""; } @@ -2067,13 +2253,13 @@ function textQuestion(question_id = false, section_id = false, group_question_ar
-
${questionType == 'text' ? questionTitle : ''}
+
${questionTitle ? questionTitle : ''}
-
${questionType == 'text' ? questionDescription : ''}
+
${questionDescription ? questionDescription : ''}
${mathEnabled == 'true' ? questionDescription : ''}
@@ -2173,9 +2359,9 @@ function textQuestion(question_id = false, section_id = false, group_question_ar var textQuestionSubtitle_math = 'textQuestionSubtitle_math_' + addTextQuestionId; var textQuestionSubtitle = 'textQuestionSubtitle_' + addTextQuestionId; - var ChoiceMathSwitchId = document.getElementById(ChoiceMathSwitch) - var textQuestionSubtitle_mathId = document.getElementById(textQuestionSubtitle_math) - var textQuestionSubtitleId = document.getElementById(textQuestionSubtitle) + var ChoiceMathSwitchId = document.getElementById(ChoiceMathSwitch); + var textQuestionSubtitle_mathId = document.getElementById(textQuestionSubtitle_math); + var textQuestionSubtitleId = document.getElementById(textQuestionSubtitle); if (mathEnabled === 'true') @@ -2198,16 +2384,120 @@ function textQuestion(question_id = false, section_id = false, group_question_ar ChoiceMathSwitchId.addEventListener("change", function() { if (ChoiceMathSwitchId.checked) { - $(textQuestionSubtitle_mathId).show(); - $(textQuestionSubtitleId).hide(); - $(textQuestionSubtitle_previousDiv).hide(); + $(textQuestionSubtitle_mathId).show(); + $(textQuestionSubtitleId).hide(); + $(textQuestionSubtitle_previousDiv).hide(); } else { - $(textQuestionSubtitleId).show(); - $(textQuestionSubtitle_mathId).hide(); + $(textQuestionSubtitleId).show(); + $(textQuestionSubtitle_mathId).hide(); } }); + //mark calculation in TextQuestion + +// var textQuestionMarkField = 'Text_Question_Marks_Id_'+ addTextQuestionId + +// var sectionRandomID = localStorage.getItem('sectionId'); +// var Section_Attempt_Any_raw_Id = 'Section_Attempt_Any_Id_' + sectionRandomID; +// var Section_Marks_raw_Id = 'Section_Marks_Id_' + sectionRandomID; + + + +// var QuestionGroup_ID = localStorage.getItem('QuestionGroupId'); +// var Question_Attempt_Any_Fields = 'Question_Attempt_Any_Id_' + QuestionGroup_ID; +// var Question_Group_Marks_Field = 'Question_Group_Marks_Id_' + QuestionGroup_ID; + + +// //These lines are execute only the 'textQuestion()' function call +// var QGinputValue = $('#'+Section_Attempt_Any_raw_Id).val(); +// var InMarkValue = $('#'+Section_Marks_raw_Id).val(); +// // alert(InMarkValue); + +// if(QGinputValue == ""){ +// $('#'+textQuestionMarkField).prop("disabled", false); +// // alert('text question enable'); +// }else{ +// $('#'+textQuestionMarkField).prop("disabled", true); +// $('#'+textQuestionMarkField).val(InMarkValue); +// // alert('text question disabled'); +// } +// //end of the lines + + +// // These lines are working only the Section function to change anything AtemptAny field +// $('#'+Section_Attempt_Any_raw_Id).keyup(function() { +// var inputValue = $(this).val(); +// var MarkValue = $('#'+Section_Marks_raw_Id).val(); + +// // alert(MarkValue); + +// if(inputValue == "" && section_id){ +// $('#'+textQuestionMarkField).prop("disabled", false); +// // alert('sectionRandomID text enable'); +// }else{ +// $('#'+textQuestionMarkField).prop("disabled", true); +// // alert('sectionRandomID text disabled'); +// } +// json2nav(); +// }); + +// $('#'+Section_Marks_raw_Id).keyup(function() { +// var MarksinputValue = $(this).val(); + +// if(MarksinputValue !== "" && section_id){ +// $('#'+textQuestionMarkField).val(MarksinputValue); +// } +// }); +// //end of the line + + +// //These lines are execute only the 'textQuestion()' function call +// var QG_AttemptAny_inputValue = $('#'+Question_Attempt_Any_Fields).val(); +// var QG_Marks_inputValue = $('#'+Question_Group_Marks_Field).val(); +// // alert(InMarkValue); + +// if(QG_AttemptAny_inputValue == ""){ +// $('#'+textQuestionMarkField).prop("disabled", false); +// // alert('text question enable'); +// }else{ +// $('#'+textQuestionMarkField).prop("disabled", true); +// $('#'+textQuestionMarkField).val(QG_Marks_inputValue); +// // alert('text question disabled'); +// } +// //end of the lines + + + +// // These Function are working only the QuestionGroup to change anything AtemptAny field +// $('#'+Question_Attempt_Any_Fields).keyup(function() { +// var inputValue = $(this).val(); +// var QG_Marks_inputValues = $('#'+Question_Group_Marks_Field).val(); + +// if(inputValue == "" && group_question_area_id){ +// $('#'+textQuestionMarkField).prop("disabled", false); +// // alert('QuestionGroup_ID text enable'); +// }else{ +// $('#'+textQuestionMarkField).prop("disabled", true); +// $('#'+textQuestionMarkField).val(QG_Marks_inputValues); +// // alert('QuestionGroup_ID text disabled'); + +// } +// json2nav(); +// }); + +// $('#'+Question_Group_Marks_Field).keyup(function() { +// var MarksinputValue = $(this).val(); + +// if(MarksinputValue !== "" && group_question_area_id){ +// $('#'+textQuestionMarkField).val(MarksinputValue); +// } +// }); +// // end of the lines + + +//end of mark calculation in textquestion + var AddButtons_Raw = 'AddButtons_'+addTextQuestionId; @@ -2219,11 +2509,7 @@ function textQuestion(question_id = false, section_id = false, group_question_ar var QuestionGroupAddButtons_ID = document.getElementById(QuestionGroupAddButtons_Raw) var removeAndCloneTextQuestion_ID = document.getElementById(removeAndCloneTextQuestion_Raw); - // console.log('group_question_area_id'); - // console.log(group_question_area_id); - // console.log('questionTitle'); - // console.log(questionTitle); - // if(group_question_area_id !== false )//questionGroupId + if(group_question_area_id !== false )//questionGroupId { // alert('three') @@ -2237,7 +2523,7 @@ function textQuestion(question_id = false, section_id = false, group_question_ar // alert('four') // four button group - if(questionGroupId !== false) + if(questionAreaId !== false) { $('#'+overallQuestionGroupAddButtons_Raw).show(); $('#'+overallAddButtons_Raw).hide(); @@ -2258,13 +2544,20 @@ function textQuestion(question_id = false, section_id = false, group_question_ar $('#'+removeAndCloneTextQuestion_Raw).mouseenter(function(){ - if(group_question_area_id !== false || questionTitle !== false) + if(group_question_area_id !== false) { add_button_hide_and_show(QuestionGroupAddButtons_Raw); } else - { - add_button_hide_and_show(AddButtons_Raw); + { + if(questionAreaId !== false) + { + add_button_hide_and_show(QuestionGroupAddButtons_Raw); + } + else + { + add_button_hide_and_show(AddButtons_Raw); + } } }) @@ -2341,10 +2634,18 @@ function textQuestion(question_id = false, section_id = false, group_question_ar navpane(); }); + // function for calling html2json using Mark Calculation + var textQuestionMarkField = 'Text_Question_Marks_Id_'+ addTextQuestionId + $('#'+textQuestionMarkField).keyup(function() { + + json2nav() + markCalculation() + + }); + json2nav(); clearSidebarWrapper(); navpane(); - } diff --git a/addform_old.html b/addform_old.html index 3d90656..a9f2aaa 100644 --- a/addform_old.html +++ b/addform_old.html @@ -46,7 +46,6 @@ - + + + + @@ -191,6 +342,8 @@
@@ -219,9 +373,18 @@
- -
+
+ + + + + +
+ +
@@ -248,49 +411,49 @@
- +
- +
- +
- +
- +
- +
- +
- +
@@ -314,6 +477,7 @@
+
@@ -366,13 +530,31 @@ - + - + + + + + +