From 4f65a89f4ea7d1c53969277018ca5a088cf14ef1 Mon Sep 17 00:00:00 2001
From: venkateswaran ubuntu <bitbucket@venbainfotech.com>
Date: Fri, 20 Oct 2023 12:58:17 +0530
Subject: [PATCH] NAVPAN ALIGN AND DISPLY MARKSDEFAULT ON : RV

---
 addform.html | 57 ++++++++++++++++------------------------------------
 nav_pane.js  | 23 +++++++++++----------
 style.css    |  6 ++++++
 3 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/addform.html b/addform.html
index 6e9092b..eefe445 100644
--- a/addform.html
+++ b/addform.html
@@ -931,7 +931,7 @@ function addSection(title = false, description = false, random_no = false, secti
                             <div class="col-lg-5 col-md-5 mt-2">
 							<span>Display Marks</span>
 							<label class="switch">
-							<input type="checkbox" id="Section_Display_Marks_Id_${sectionRandomID}" checked> 
+							<input type="checkbox" id="Section_Display_Marks_Id_${sectionRandomID}"> 
 							<span class="slider round"></span>
 							</label>
 							</div>
@@ -1114,36 +1114,17 @@ function addSection(title = false, description = false, random_no = false, secti
                 var DisplayMark_RawID = 'Section_Display_Marks_Id_' + sectionRandomID
                 var DisplayMark_ID = document.getElementById(DisplayMark_RawID)
 
-				if(sectionDispalyMarks === 'true'){
-
-					DisplayMark_ID.checked = true;
-				}else{
+				if(sectionDispalyMarks === 'false'){
 					DisplayMark_ID.checked = false;
+				}else{
+					DisplayMark_ID.checked = true;
 				}
 				
 				
-				
-				//mark calculation code for section
-				// var Section_Attempt_Any_raw_Id = 'Section_Attempt_Any_Id_' + sectionRandomID;
 				var Section_Marks_raw_Id = 'Section_Marks_Id_' + sectionRandomID;		
-
-
                 $('#'+Section_Marks_raw_Id).prop("disabled", true);
 
-				// $('#'+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;
@@ -1398,18 +1379,17 @@ function addQuestionGroup(idObj)
 			}
 			else
 			{
-				displayMArks = 'false';
+				displayMArks = false;
 			}
 
 
 			var DisplayMark_RawID = "Question_Group_Display_Marks_Id_" + QuestionGroup_ID;
                 var DisplayMark_ID = document.getElementById(DisplayMark_RawID)
 
-				if(displayMArks === 'true'){
-
-					DisplayMark_ID.checked = true;
-				}else{
+				if(displayMArks === 'false'){
 					DisplayMark_ID.checked = false;
+				}else{
+					DisplayMark_ID.checked = true;
 				}
 
 
@@ -1918,11 +1898,10 @@ $(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(questionDisplayMarks === 'false'){
 	DisplayMark_ID.checked = false;
+}else{
+	DisplayMark_ID.checked = true;
 }
 
 var multipleAnswer = 'multipleAnswer_'+addChoiceAreaId;
@@ -2405,20 +2384,18 @@ else
 		}
 		else
 		{
-			displayMArks = 'false';
+			displayMArks = false;
 		}
 
 
 	var DisplayMark_RawID = "Text_Question_Display_Marks_Id_" + addTextQuestionId;
 		var DisplayMark_ID = document.getElementById(DisplayMark_RawID)
 
-		if(displayMArks === 'true'){
-
-			DisplayMark_ID.checked = true;
-		
+		if(displayMArks === 'false'){
+		DisplayMark_ID.checked = false;
 		}else{
-			DisplayMark_ID.checked = false;
-		}
+		DisplayMark_ID.checked = true;
+	    }
 
 
 
diff --git a/nav_pane.js b/nav_pane.js
index 8c6cfd2..897fc41 100644
--- a/nav_pane.js
+++ b/nav_pane.js
@@ -142,25 +142,26 @@ function navpane() {
     
     function createTreeNode(nodeData, parentNode) {
         const nodeDiv = document.createElement('div');
+        nodeDiv.className = "navContain";
+
 
         // nodeDiv.id = nodeData.textQuestion_Id || nodeData.choice_question_id;
         const nodeDataId = nodeData.question_Id
         const nodeDataType = nodeData.question_type
         // console.log('nodeDataType:',nodeDataType);
-
-     
-
         parentNode.appendChild(nodeDiv);
-        
+
+
+        var bulletPoint = "";
         if (nodeData.question) {
             
             var RawID = "";
             if(nodeDataType == 'text')
             {
-                const bulletPoint = document.createElement('i');
+                bulletPoint = document.createElement('span');
                 bulletPoint.className = "fa fa-text-width";
-                bulletPoint.style.marginRight = '10px';
-                bulletPoint.style.fontSize = '17px';
+                bulletPoint.style.marginRight = '5px';
+                bulletPoint.style.fontSize = '15px';
                 bulletPoint.style.fontWeight = 'bold';
                 bulletPoint.style.color = '#00aaff';
                 // bulletPoint.textContent = '\u2022';
@@ -173,10 +174,10 @@ function navpane() {
 
             }else if(nodeDataType == 'group')
             {
-                const bulletPoint = document.createElement('i');
+                bulletPoint = document.createElement('span');
                 bulletPoint.className = "fa fa-check-circle-o";
-                bulletPoint.style.marginRight = '10px';
-                bulletPoint.style.fontSize = '17px';
+                bulletPoint.style.marginRight = '5px';
+                bulletPoint.style.fontSize = '15px';
                 bulletPoint.style.fontWeight = 'bold';
                 bulletPoint.style.color = '#00aaff';
                 bulletPoint.setAttribute("title", "MCQ");
@@ -237,7 +238,7 @@ function navpane() {
             });
     
             if (nodeData.question.length > 20) {
-                questionLink.innerHTML = removeParagraphTags(nodeData.question.substring(0, 20) + '.....');
+                questionLink.innerHTML = removeParagraphTags(nodeData.question.substring(0, 20) + '...');
             } else {
                 questionLink.innerHTML = removeParagraphTags(nodeData.question);
             }
diff --git a/style.css b/style.css
index 0ecc7ec..ebfc130 100644
--- a/style.css
+++ b/style.css
@@ -3566,6 +3566,12 @@ input:disabled {
 
 }
 
+.navContain{
+    display: flex; /* Use a flex container to control spacing */
+    align-items: center; /* Vertically center the items */
+
+}
+