From 829db2c105a924014fc08dd45beadfbd0ec90e9f Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavan.a@venbainfo.com>
Date: Thu, 19 Oct 2023 16:14:45 +0530
Subject: [PATCH 1/5] AUTO_FILENAME OVERWRITE : AADHAVAN

---
 QuestionPreview.html            |   7 +-
 addform.html                    |  12 ++-
 assets/css/theme-default.css    |   2 +-
 savexml.js                      | 158 +++++++++++++++++++++++---------
 xml2/Monthly Question Paper.xml |   1 -
 5 files changed, 132 insertions(+), 48 deletions(-)
 delete mode 100644 xml2/Monthly Question Paper.xml

diff --git a/QuestionPreview.html b/QuestionPreview.html
index bbbd0bf..8e3ac38 100644
--- a/QuestionPreview.html
+++ b/QuestionPreview.html
@@ -49,6 +49,10 @@
 
 	
     <style>
+		p{
+			font-weight: 500;
+		}
+
 	/* Question Group Mark */
 	.text-qus-align{
 		display: inline-flex;
@@ -110,7 +114,8 @@
         .text-des{ margin-left: 20px;margin-top: 0px;}	/* Change there aadhavan top-6px*/ 
         .text-option-align{display:flex;margin-top: 0%;margin-left: 45px;} /* Change there aadhavan 10px*/  
         .text-option-align p{ margin:0; }
-		#sectionTitle {border-top: 2px solid gray; width: 100%;}
+		#sectionTitle {border-top: 2px solid gray
+		; width: 100%;}
 		#sectionTitle:first-of-type {border:none;}
         mjx-container[jax="CHTML"][display="true"] {
             display: block;
diff --git a/addform.html b/addform.html
index cb6c7ab..62f50c0 100644
--- a/addform.html
+++ b/addform.html
@@ -48,6 +48,14 @@
 	
 	<style>
 
+		#editPreview{
+    	color: #7018d4; 
+		}
+		#editPreview:hover {
+    	color:#3399FF; 
+
+		}
+
 		ul, #myUL {
 		  list-style-type: none;
 		}
@@ -354,7 +362,7 @@
 							<ul>
 								<li><a href="dashboard.html"><i class="fa fa-home" aria-hidden="true" style="font-size: 24px;"></i>&nbsp;&nbsp;Home</a></li>
 								<li><a href="#" class="myBtn" onclick="saveFile()" id="SaveButton"><i class="fa fa-floppy-o" aria-hidden="true" style="font-size: 20px;"></i>&nbsp;&nbsp;Save</a></li>
-								<li><a id="editPreview" style="color: #730fd5;"><i class="fa fa-eye" aria-hidden="true" style="font-size: 24px;"></i>&nbsp;&nbsp;Preview</a></li>
+								<li><a id="editPreview" ><i class="fa fa-eye" aria-hidden="true" style="font-size: 24px;"></i>&nbsp;&nbsp;Preview</a></li>
 							</ul>
 						</div>
 						</div>
@@ -585,7 +593,7 @@
 
 const url = new URL(window.location.href);// Get the URL of the current page for JSON
 const params = new URLSearchParams(url.search);// Create a URLSearchParams object from the query string
-var FileName = params.get('filename');// Get the value of a specific parameter
+var FileName = params.get('filename');// Get the value of a specific parameter 
 
 var xmlPath ="" //get the xml filepath in .env file local variable
 
diff --git a/assets/css/theme-default.css b/assets/css/theme-default.css
index 32d0dde..b8dd5fb 100644
--- a/assets/css/theme-default.css
+++ b/assets/css/theme-default.css
@@ -22,7 +22,7 @@ body {
 
 p {
     
-    font-weight: 500;/* Change this into 400 aadhavan */
+    font-weight: 400;/* Change this into 400 aadhavan */
     font-style: normal;
     font-family: 'Rubik', sans-serif;
     color: #6d6d6d; 
diff --git a/savexml.js b/savexml.js
index 36b8934..38c7aca 100644
--- a/savexml.js
+++ b/savexml.js
@@ -3,11 +3,38 @@ const cheerio = require('cheerio');
 const Swal = require('sweetalert2')
 const encode = require('./encode')
 const path = require('path')
-
 require('dotenv').config();
+
+
 //Get the value from .env
 const isEncrypted = process.env.ENCRYPTED;
 
+
+// start the Autosave filename take the names in xml folder
+////////
+    function getFilesInFolder(folderName) {
+      const xmlFilePath = path.join(__dirname, folderName);
+      try {
+        const fileNames = fs.readdirSync(xmlFilePath);
+        const xmlFiles = fileNames.filter((file) => file.endsWith('.xml'));
+        return xmlFiles;
+      } catch (error) {
+          console.error('Error reading folder:', error);
+          return [];
+        }
+    }
+    //XmlPath get from .env
+    const xmlPath_ = process.env.XML_FILE_PATH;
+    const folderName = `/${xmlPath_}`;
+    const filePaths = [];
+    const files = getFilesInFolder(folderName);
+    files.forEach((file) => {
+      const filePath = file;
+      filePaths.push(filePath);
+    });
+////////
+//end the autosave
+
 function saveXmlToFile(xmlData, filePath) {
   console.log(filePath);
   // Check if the file path is provided
@@ -32,73 +59,108 @@ function saveXmlToFile(xmlData, filePath) {
   });
   localStorage.clear();
 
-//  window.location.href = 'dashboard.html';
+   window.location.href = 'dashboard.html';
 
 }
 
 
 function savexml(UserFilename) {
-    
-       // Get the XML string from localStorage
-   var xmlString = localStorage.getItem("xml");
 
-   //check Encrypted or not
-   var enc = "";
-    if (isEncrypted === 'YES') {
-         // Encrypt 
-       enc = encode(xmlString);
-    }else{
-      enc = xmlString;
-    }
+  // Get the XML string from localStorage
+  var xmlString = localStorage.getItem("xml");
 
-    //XmlPath get from .env 
-    const xmlPathenv=process.env.XML_FILE_PATH;
-    const xmlPath = path.join(__dirname, xmlPathenv)
-   // Get the json string from localStorage for set fileName
-   var jsonData = localStorage.getItem("json"); 
-  
-    // Create a filename using on the subtitle
-    var xmlfilename = `${UserFilename}.xml`;
-    // var jsonfilename = `${UserFilename}.json`;
-
-    // file path where you want to save the XML file
-    // const xmlfilePath = process.cwd() + `/${xmlPath}` + xmlfilename;
-
-    const xmlfilePath = `${xmlPath}` + xmlfilename;
-    // const jsonfilePath = process.cwd() + '/xml/' + jsonfilename;
-  
-    // Call the function to save the XML file
-    saveXmlToFile(enc, xmlfilePath);
-    
+  //check Encrypted or not
+  var enc = "";
+  if (isEncrypted === 'YES') {
+    // Encrypt 
+    enc = encode(xmlString);
+  } else {
+    enc = xmlString;
   }
 
-function promptBox(){
+  //XmlPath get from .env 
+  const xmlPathenv = process.env.XML_FILE_PATH;
+  const xmlPath = path.join(__dirname, xmlPathenv)
+  // Get the json string from localStorage for set fileName
+  var jsonData = localStorage.getItem("json");
 
+  // Create a filename using on the subtitle
+  var xmlfilename = `${UserFilename}.xml`;
+  // var jsonfilename = `${UserFilename}.json`;
 
-  var jsonData = localStorage.getItem("json"); 
-   var jsonString = JSON.parse(jsonData);
-   var getTitle = jsonString.question_paper_title;
-   var RawFileName = removeHtmlTags(getTitle);
-  //  console.log(RawFileName)
-    
+  // file path where you want to save the XML file
+  // const xmlfilePath = process.cwd() + `/${xmlPath}` + xmlfilename;
+
+  const xmlfilePath = `${xmlPath}` + xmlfilename;
+  // const jsonfilePath = process.cwd() + '/xml/' + jsonfilename;
+
+  // Call the function to save the XML file
+  saveXmlToFile(enc, xmlfilePath);
+
+}
+
+function promptBox() {
+
+  var jsonData = localStorage.getItem("json");
+  var jsonString = JSON.parse(jsonData);
+  var getTitle = jsonString.question_paper_title;
+  var RawFileNam = removeHtmlTags(getTitle);
+  var RawFileName;
+
+  if (RawFileNam === "" || RawFileNam === null) {
+        const currentDate = new Date();
+        const year = currentDate.getFullYear();
+        const month = String(currentDate.getMonth() + 1).padStart(2, '0'); 
+        const day = String(currentDate.getDate()).padStart(2, '0');
+        let hours = currentDate.getHours();
+        let ampm = 'AM';
+        
+        if (hours > 12) {
+            hours -= 12;
+            ampm = 'PM';
+        }
+        
+        hours = String(hours).padStart(2, '0');
+        const minutes = String(currentDate.getMinutes()).padStart(2, '0');
+
+        // Create a formatted date-time string
+        const formattedDateTime = `${year}${month}${day}(${hours};${minutes}${ampm})`;
+         RawFileName = "untitled" +formattedDateTime;
+  } else {
+    RawFileName = RawFileNam
+  }
   Swal.fire({
     title: 'Enter Filename',
     input: 'text',
     inputValue: RawFileName,
     showCancelButton: true,
+    showDenyButton: false,
+    denyButtonText: 'Overwrite',
     confirmButtonText: 'Submit',
     cancelButtonText: 'Cancel',
     inputValidator: (value) => {
+      const entervalue =value+'.xml'
       if (!value) {
         return 'You need to enter Filename!'
       }
+      else if (value){
+        const fileexists =fileexists(entervalue);
+       if(fileexists){
+        Swal.update({ showDenyButton: true });
+        return 'This file Name already exists'
+       }else {
+        Swal.update({ showDenyButton: false }); 
+      }
+      }
     }
   }).then((result) => {
+    console.log(result);
     if (result.isConfirmed) {
-      
+
       const inputValue = result.value
       savexml(inputValue)
-      
+    }else if(result.isDenied){
+      savexml(RawFileName)
     }
   })
 
@@ -114,5 +176,15 @@ function removeHtmlTags(inputString) {
   return text;
 }
 
-
-  
\ No newline at end of file
+//check filename is already exists or not
+function fileexists(enteredfilename) {
+  var nextFilename
+  for (const files of filePaths) {
+    nextFilename = files;
+    if (nextFilename === enteredfilename) {
+      return true;
+    }
+    }
+    
+}
+    
diff --git a/xml2/Monthly Question Paper.xml b/xml2/Monthly Question Paper.xml
deleted file mode 100644
index fa39abe..0000000
--- a/xml2/Monthly Question Paper.xml	
+++ /dev/null
@@ -1 +0,0 @@
-75Fj5Ddz4Dp3sKeXGmtZ8w==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
\ No newline at end of file

From e30c5e7ece6a5c4dc86a66d55320f1fa23fc30e5 Mon Sep 17 00:00:00 2001
From: venkateswaran ubuntu <bitbucket@venbainfotech.com>
Date: Thu, 19 Oct 2023 17:19:42 +0530
Subject: [PATCH 2/5] COMPLETE REORDER QUESTION AND QUESTION GROUP : RV

---
 addform.html                 | 114 ++++++++++++++++++++++++++++++-----
 assets/css/theme-default.css |   2 +-
 mark_calc.js                 |   5 +-
 nav_pane.js                  |  14 +++--
 savexml.js                   |   2 +-
 style.css                    |   3 +
 6 files changed, 117 insertions(+), 23 deletions(-)

diff --git a/addform.html b/addform.html
index 093dc3e..3344bbe 100644
--- a/addform.html
+++ b/addform.html
@@ -411,7 +411,6 @@
 		<div class="row section QuestionPaperClass" id="QuestionPaper">
 
 		<!-- QuestionPapper Title Start-->
-		
 		<div class="question-papper-title element" style="border-top: solid; margin-bottom: 15px;">
 			<input type="hidden" id="QuestionPaper_UUID_ID">
 			<div class="col-lg-12 col-md-12">
@@ -809,6 +808,7 @@ navpane();
 html2json();
 
 
+// function for ONMOUSE HOVER to SHOW the side ADD BUTTONS
 function showButtons(container) {
 	const buttons = container.querySelector('.buttons');
 	const onhover = container.querySelector('.onhover');
@@ -820,6 +820,7 @@ function showButtons(container) {
 	
  }
 
+// function for ONMOUSE HOVER to HIDE the side ADD BUTTONS
 function hideButtons(container) {
 	const buttons = container.querySelector('.buttons');
 	const onhover = container.querySelector('.onhover');
@@ -1188,12 +1189,15 @@ function addQuestionGroup(idObj)
 			<i id="collapseSubSection_${QuestionGroup_ID}" aria-hidden="true" style=" font-size: 24px; margin-right: 9px; margin-top: 25px;"></i> 
 			<input type="hidden" id="Question_Group_UUID_ID_${QuestionGroup_ID}" value="${idObj.hasOwnProperty('question_group_obj') ? idObj.question_group_obj.attributes.Id : QuestionGroup_UUID}">
 			<div class="groupsection" draggable='true' id="group_question_${QuestionGroup_ID}">
-				<div class="sectionTitle" id="group_question_title_${QuestionGroup_ID}">		
-					
+				<div class="sectionTitle" id="group_question_title_${QuestionGroup_ID}">					
 					<div class="col-lg-12 col-md-12">
-						
 						<div onmouseover="showButtons(this)" id="QuestionGroupButtons_${QuestionGroup_ID}" class="row question element" style="border-top: 10px solid #a658f3; border-radius:10px; margin-top:5px;">
 							
+							<div class="items  align-items-center">
+								<span onclick="ReArrangeQuestionsGroup(event)" id="forword_${QuestionGroup_ID}" class="fa fa-chevron-up up-icon"></span>&nbsp;&nbsp;
+								<span onclick="ReArrangeQuestionsGroup(event)" id="backword_${QuestionGroup_ID}" class="fa fa-chevron-down down-icon"></span>&nbsp;&nbsp;&nbsp;
+				        	</div>
+							
 							<div class="row" style="text-align:right; width: 100%">
 								<div class="col-lg-10 col-md-12">
 									<div class=" button-group align-items-center">
@@ -1210,21 +1214,20 @@ function addQuestionGroup(idObj)
 										</div>
 									</div>
 								</div>
-							</div>
-						
+							</div>						
 							<div id="dragHandle" class="drag-handle">
 							<i class="fas fa-grip-horizontal"></i>
 							</div>
 							<div class="col-lg-12 col-md-12">
 								<div class="form_box">
-									<label>Quesions Group:</label>
+									<label>Questions Group:</label>
 									<div class="richText" id="subSection_title_text_${QuestionGroup_ID}" contenteditable="true" style=" border: 2px solid #EEECFE;  margin-top: 4px;">${idObj.hasOwnProperty('question_group_obj') ? idObj.question_group_obj.group_title  : ""}</div>
 								</div>
 							</div>
 
 							<div class="col-lg-12 col-md-12 hideondrag">
 								<div class="form_box">
-									<label>Quesions Group Description:</label>
+									<label>Questions Group Description:</label>
 									<div class="richText" id="subSection_description_text_${QuestionGroup_ID}" contenteditable="true" style=" border: 2px solid #EEECFE;  margin-top: 4px;">${idObj.hasOwnProperty('question_group_obj') ? idObj.question_group_obj.group_description : ""}</div>
 								</div>
 							</div>
@@ -1451,7 +1454,6 @@ const value = localStorage.getItem('JSON_FOR_NAV')
 // 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, questionAreaId = false, questionRandomNo = false, questionMarks = false, questionUUID = false, questionDisplayMarks = false)
 {
-
 		const ChoiceGroupFixed_UUID = uuidv4();
 	
         var groupQuestion = "";
@@ -1501,8 +1503,9 @@ function groupQuestion(question_id = false, section_id = false , group_question_
 				<i class="fas fa-grip-horizontal"></i>
 			</div>
 			<div class="items hideondrag" style="display: none;">
+				<i onclick="ReArrangeQuestions(event)" class="fa fa-chevron-up up-icon"></i>&nbsp;&nbsp;
+				<i onclick="ReArrangeQuestions(event)" class="fa fa-chevron-down down-icon"></i>&nbsp;&nbsp;&nbsp;
 				<i class="fa fa-trash-o"  onclick="removeClonedQroupQuestion(${addChoiceAreaId})" style="font-size:20px;"aria-hidden="true"></i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<i class="fa fa-clone" id="cloneId_${addChoiceAreaId}" onclick="cloneQuestion(event, 2)"  style="font-size:20px;" aria-hidden="true"></i>
 			</div>
 
              
@@ -1574,7 +1577,6 @@ function groupQuestion(question_id = false, section_id = false , group_question_
 								<math-field  id="choiceTextField_math_${addChoiceAreaId}" style="width: 100%;" contenteditable="true">${Choice ? Choice[0].choice_name : ""}</math-field>
                              </div>
 							<div class="items2 col-lg-4">
-								<i class="fa fa-trash-o"  style="font-size:20px;" aria-hidden="true" id="deleteButton_${addChoiceAreaId}"></i>&nbsp;&nbsp;&nbsp;
 								<input style="width:14px; height:14px" type="checkbox" id="Choicemath_${addChoiceAreaId}">&nbsp;&nbsp;<span class="math">MATH</span>
 							</div>
 						</div>                     
@@ -1953,8 +1955,8 @@ function addNewChoice(NewaddChoiceAreaId = false , choiceName = false, questionR
 							<math-field  id="newchoiceTextField_math_`+text_field_created_time+rnd_no+`" style="width: 100%;" contenteditable="true">${choiceName ? choiceName : ""}</math-field>
 							</div>
 						<div class="items2 col-lg-4">
-							<i class="fa fa-trash-o"  style="font-size:20px;" aria-hidden="true" id="newChoiceDeleteButton_`+text_field_created_time+rnd_no+`"></i>&nbsp;&nbsp;&nbsp;
-							<input style="width:14px; height:14px" type="checkbox" id="choice_math_`+text_field_created_time+rnd_no+`">&nbsp;&nbsp;<span class="math">MATH</span>
+							<input style="width:14px; height:14px" type="checkbox" id="choice_math_`+text_field_created_time+rnd_no+`">&nbsp;&nbsp;<span class="math">MATH</span>&nbsp;&nbsp;&nbsp;
+							<i class="fa fa-trash-o"  style="font-size:20px;" aria-hidden="true" id="newChoiceDeleteButton_`+text_field_created_time+rnd_no+`" title="Remove Choice"></i>
 						</div>
 					</div>
 			</div>`
@@ -2157,8 +2159,9 @@ textQuestion +=
 	</div>
 
 	<div class="items  align-items-center hideondrag" style="display: none;">
+		<i onclick="ReArrangeQuestions(event)" id="forword_${addTextQuestionId}" class="fa fa-chevron-up up-icon" ></i>&nbsp;&nbsp;
+		<i onclick="ReArrangeQuestions(event)" id="backword_${addTextQuestionId}" class="fa fa-chevron-down down-icon"></i>&nbsp;&nbsp;&nbsp;
 		<i class="fa fa-trash-o"  onclick="removeClonedTextQuestion(${addTextQuestionId})" style="font-size:20px;"aria-hidden="true"></i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		<i class="fa fa-clone"    onclick="cloneQuestion(event, 1)" id="cloneId_${addTextQuestionId}" style="font-size:20px;"  aria-hidden="true"></i>
 	</div>
 	<div class="col-lg-12 col-md-12 ">
 		<input type="hidden" id="Text_Question_UUID_ID_${addTextQuestionId}" value="${QuestionObj.hasOwnProperty('questionUUID') ? QuestionObj.questionUUID : Text_Question_UUID}">
@@ -2419,6 +2422,86 @@ var inputElement = document.getElementById(Textid);
 }
 
 
+//function for Questions REORDER in the SECTION Level
+function ReArrangeQuestions(e){
+    
+	var currentID= e.target.parentElement.parentElement.parentElement.id;
+	console.log(currentID)
+	var currentItemID = document.getElementById(currentID);
+	console.log('currentItemID');
+	console.log(currentItemID);
+
+	if (e.target.classList.contains('up-icon')) {
+
+		console.log('FORWORD');
+		const question_ListItem = e.target.parentElement.parentElement;
+		console.log('question_ListItem');
+		console.log(question_ListItem);
+
+		const question_PrevItem = question_ListItem.previousElementSibling;
+		console.log('question_PrevItem');
+		console.log(question_PrevItem );
+
+		if (question_PrevItem !== null) {
+			currentItemID.insertBefore(question_ListItem, question_PrevItem);
+		}
+	} else if (e.target.classList.contains('down-icon')) {
+        
+		console.log('BACKWORD');
+		const question_ListItem = e.target.parentElement.parentElement;
+		console.log('question_ListItem');
+		console.log(question_ListItem);
+
+		const question_nextItem = question_ListItem.nextElementSibling;
+		console.log('question_nextItem');
+		console.log(question_nextItem );
+
+		if (question_nextItem) {
+			currentItemID.insertBefore(question_nextItem, question_ListItem);
+		}
+	}
+}
+
+//function for REORDER the Question Group in the SECTION Level
+function ReArrangeQuestionsGroup(e){
+    
+	var currentID= e.target.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.id;
+	console.log(currentID)
+	var currentItemID = document.getElementById(currentID);
+	console.log('currentItemID');
+	console.log(currentItemID);
+
+	if (e.target.classList.contains('up-icon')) {
+
+		console.log('FORWORD');
+		const question_ListItem = e.target.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement;
+		console.log('question_ListItem');
+		console.log(question_ListItem);
+
+		const question_PrevItem = question_ListItem.previousElementSibling;
+		console.log('question_PrevItem');
+		console.log(question_PrevItem );
+
+		if (question_PrevItem !== null) {
+			currentItemID.insertBefore(question_ListItem, question_PrevItem);
+		}
+	} else if (e.target.classList.contains('down-icon')) {
+        
+		console.log('BACKWORD');
+		const question_ListItem = e.target.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement;
+		console.log('question_ListItem');
+		console.log(question_ListItem);
+
+		const question_nextItem = question_ListItem.nextElementSibling;
+		console.log('question_nextItem');
+		console.log(question_nextItem );
+
+		if (question_nextItem) {
+			currentItemID.insertBefore(question_nextItem, question_ListItem);
+		}
+	}
+}
+
 //Function for Add Group Question inside the Group QUestion Like Question
 function MultiLevelQuestionGroup(e)
 {
@@ -2508,6 +2591,7 @@ function cloneQuestion(e,type)
 // remove the cloned text type questions function 
 function removeClonedTextQuestion(index) 
 {
+	alert('hi text');
 	var element = document.getElementById('removeAndCloneTextQuestion_'+ index);
 	if (element) {
 	  element.remove();
@@ -2517,6 +2601,8 @@ function removeClonedTextQuestion(index)
 // remove the cloned choice or group type questions function
 function removeClonedQroupQuestion(index) 
 {
+	alert('hi choice');
+
 	var element = document.getElementById('removeAndCloneQroupQuestion_'+ index);
 	if (element) {
 		element.remove();
diff --git a/assets/css/theme-default.css b/assets/css/theme-default.css
index 32d0dde..b8dd5fb 100644
--- a/assets/css/theme-default.css
+++ b/assets/css/theme-default.css
@@ -22,7 +22,7 @@ body {
 
 p {
     
-    font-weight: 500;/* Change this into 400 aadhavan */
+    font-weight: 400;/* Change this into 400 aadhavan */
     font-style: normal;
     font-family: 'Rubik', sans-serif;
     color: #6d6d6d; 
diff --git a/mark_calc.js b/mark_calc.js
index 002d27c..c0ef262 100644
--- a/mark_calc.js
+++ b/mark_calc.js
@@ -95,7 +95,10 @@ function generateSingleQuestions(ParentObjects)
     
     var	parentMarks = ParentObjects.parentMarks;
     var	parentAttemptAny = ParentObjects.parentAttemptAny;
-	var MarkDivideValue = parentMarks / parentAttemptAny;
+	var DivideValue = parentMarks / parentAttemptAny;
+	const twoDigitsAfterDecimal = DivideValue.toFixed(2);
+	var MarkDivideValue = parseFloat(twoDigitsAfterDecimal);
+    // console.log(MarkDivideValue)
 
     // console.log('parentMarks :  ', parentMarks);
     // console.log('new_parentAttemptAny :  ', parentAttemptAny);
diff --git a/nav_pane.js b/nav_pane.js
index d57d05b..8c6cfd2 100644
--- a/nav_pane.js
+++ b/nav_pane.js
@@ -6,7 +6,7 @@ function navpane() {
     let currentlyHighlightedElement = null; // Track the currently highlighted element
     // console.log('navpane called');
     var jsonData = JSON.parse(localStorage.getItem('JSON_FOR_NAV'));
-    console.log(jsonData);
+    // console.log(jsonData);
     // var arr = JSON.parse( localStorage.getItem('memoriesdata') );
     // var jsonData2 = JSON.parse(jsonData);
     // console.log(typeof jsonData);
@@ -38,7 +38,7 @@ function navpane() {
             var splitedSectionId = sectionId.split("_")[3];
             var SectionBox_RawID = 'SectionBox_'+splitedSectionId;
             var SectionBoxID = document.getElementById(SectionBox_RawID)
-            console.log(SectionBoxID);
+            // console.log(SectionBoxID);
             
                
             // Check if the section should be initially expanded based on expandedSections
@@ -146,7 +146,7 @@ function navpane() {
         // nodeDiv.id = nodeData.textQuestion_Id || nodeData.choice_question_id;
         const nodeDataId = nodeData.question_Id
         const nodeDataType = nodeData.question_type
-        console.log('nodeDataType:',nodeDataType);
+        // console.log('nodeDataType:',nodeDataType);
 
      
 
@@ -189,7 +189,7 @@ function navpane() {
             }
             
             var QuestionID = document.getElementById(RawID)
-            console.log(QuestionID)
+            // console.log(QuestionID)
            
             const questionLink = document.createElement('a');
             questionLink.href = '#' + nodeDataId;
@@ -219,6 +219,7 @@ function navpane() {
                     questionLink.style.fontWeight = questionLink.style.fontWeight === 'bold' ? 'normal' : 'bold';
                 } else {
                     questionLink.style.fontWeight = 'bold';
+                    QuestionID.style.fontWeight = 'normal';
                     currentlyHighlightedElement = questionLink;
                 }
             });
@@ -248,12 +249,12 @@ function navpane() {
             groupTitleDiv.setAttribute('data-id', groupTitleId);
             groupTitleDiv.className = 'question-group';
             
-            console.log(groupTitleId);
+            // console.log(groupTitleId);
 
             var splitedGroupId = groupTitleId.split("_")[3];
             var SplitedGroupRawID = 'QuestionGroupButtons_'+splitedGroupId;
             var GroupBoxID = document.getElementById(SplitedGroupRawID);
-            console.log(GroupBoxID);
+            // console.log(GroupBoxID);
 
     
             // Check if the group should be initially expanded based on expandedSections
@@ -332,6 +333,7 @@ function navpane() {
                     groupQuestionLink.style.fontWeight = groupQuestionLink.style.fontWeight === 'bold' ? 'normal' : 'bold';
                 } else {
                     groupQuestionLink.style.fontWeight = 'bold';
+                    GroupBoxID.style.fontWeight = 'normal';
                     currentlyHighlightedElement = groupQuestionLink;
                 }
             });
diff --git a/savexml.js b/savexml.js
index 36b8934..620c3da 100644
--- a/savexml.js
+++ b/savexml.js
@@ -32,7 +32,7 @@ function saveXmlToFile(xmlData, filePath) {
   });
   localStorage.clear();
 
-//  window.location.href = 'dashboard.html';
+ window.location.href = 'dashboard.html';
 
 }
 
diff --git a/style.css b/style.css
index ae3d022..0ecc7ec 100644
--- a/style.css
+++ b/style.css
@@ -3557,10 +3557,13 @@ input:disabled {
 
 .math{
     font-weight: 500;
+    font-size: 14px;
 }
 .mathQuestions{
     font-weight: 500;
     float: right;
+    font-size: 14px;
+
 }
 
 

From 8c4070625ed3cdd7d0922dd444f010e0da49446e Mon Sep 17 00:00:00 2001
From: aadhavan valli <aadhavan.a@venbainfo.com>
Date: Fri, 20 Oct 2023 10:22:11 +0530
Subject: [PATCH 3/5] PREVIEW_CHANGE : AADHAVAN

---
 QuestionPaperPreview.js               | 16 +++++++-------
 QuestionPreview.html                  | 30 ++++++++++++++++++++-------
 addform.html                          | 21 +++++++++++++++++--
 savexml.js                            |  9 ++++----
 xml2json_for_Questionpaper_preview.js |  5 +++--
 5 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/QuestionPaperPreview.js b/QuestionPaperPreview.js
index ed654f5..eff4bdc 100644
--- a/QuestionPaperPreview.js
+++ b/QuestionPaperPreview.js
@@ -72,8 +72,9 @@ function CheakQnType(question, questionIndex, depth,nested) {
     }
     
 }
-let count =0    
+var count =0    
 var count1 =0
+var romanNumerals = ["", "i", "ii", "iii", "iv", "v", "vi", "vii", "viii", "ix", "x"];
 function processQuestion(question, questionIndex, depth,nested) {
     const questionTex = question.question;
     const questionText = questionTex.replace('<p>', '<p id="question_Text">');
@@ -84,14 +85,14 @@ function processQuestion(question, questionIndex, depth,nested) {
     // Add appropriate indentation for nested questions
     const questionIndentation = "  ".repeat(depth + 1);
     if (nested == 1) {// this adds the inside the questionGroup 
-        count1++
-        questionPaper += `<div class="text-qus-align">${questionIndentation}${count}.${count1}) ${convertToLatex(questionText, mathstatus)}${questionIndentation}</div><p id="question-mark">Marks :${questionMark}</p><div class="text-des">${convertToLatex(questionDescription, mathstatus)}</div>`;
+        count1++;
+        var romanNumeral=romanNumerals[count1];
+        questionPaper += `<div class="text-qus-choice">${questionIndentation}${romanNumeral}) ${convertToLatex(questionText, mathstatus)}${questionIndentation}</div><p id="question-mark">Marks :${questionMark}</p><div class="text-des">${convertToLatex(questionDescription, mathstatus)}</div>`;
     } else {
         count++
         questionPaper += `<div class="text-qus-align">${questionIndentation}${count}) ${convertToLatex(questionText, mathstatus)}${questionIndentation}</div><p id="question-mark">Marks :${questionMark}</p><div class="text-des">${convertToLatex(questionDescription, mathstatus)}</div>`;
     }
-
-    // If it's an MCQ question, add choices
+    // If it's an MCquestionText
     if (question.question_type === "group") {
         const answers = question.answers;
         const alphabetOptions = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; // Define the alphabet options
@@ -138,7 +139,7 @@ function GroupQuestion(question, questionIndex, depth) {
 // Function to recursively convert JSON to a formatted question paper
 function convertJSONToQuestionPaper(data, depth = 0, sectionIndex = 1, questionIndex = 1) {
     const sections = data.sections;
-    console.log(sections);
+    // console.log(sections);
     // Extract the heading information
     const questionPaperTitle = data.question_paper_title;
     const questionPaperDescription = data.question_paper_description;
@@ -164,7 +165,7 @@ function convertJSONToQuestionPaper(data, depth = 0, sectionIndex = 1, questionI
         const indentation = "  ".repeat(depth);
 
         // questionPaper += `${indentation}${sectionTitle}${sectionAttempt}${sectionMark}${indentation}${sectionDescription}`;
-        questionPaper += `${indentation}${modifiedSectionTitle}${sectionMark}${sectionAttempt}${indentation}${sectionDescription}`;
+        questionPaper += `${indentation}<hr id="horizontal">${modifiedSectionTitle}${sectionMark}${sectionAttempt}${indentation}${sectionDescription}`;
 
 
         // Process each question in the section
@@ -184,5 +185,4 @@ function convertJSONToQuestionPaper(data, depth = 0, sectionIndex = 1, questionI
 const formattedQuestionPaper = convertJSONToQuestionPaper(jsonData, 0, 1, 1);
 const questionPaperElement = document.getElementById("questionPaper");
 questionPaperElement.innerHTML = formattedQuestionPaper; // Use innerHTML here
-
 }
\ No newline at end of file
diff --git a/QuestionPreview.html b/QuestionPreview.html
index 8e3ac38..40f9230 100644
--- a/QuestionPreview.html
+++ b/QuestionPreview.html
@@ -49,22 +49,33 @@
 
 	
     <style>
+		hr{
+			height: 2px;
+		}
+		#horizontal:first-of-type{
+			display: none;
+		}
+		
 		p{
 			font-weight: 500;
 		}
 
 	/* Question Group Mark */
-	.text-qus-align{
+	/* .text-qus-align{
 		display: inline-flex;
-	}
+	} */
 	.group_attempt_any{
 		display: inline-flex;
 		float: right;
-		margin-right: 40px;
+		margin-right: 115px;
+		margin-top:-35px;
 	}
 	.group_marks{
 		display: inline-flex;
 		float: right;
+		margin-top:-35px;
+		margin-right: 4px;
+
 	}
 	
 	
@@ -77,6 +88,7 @@
 			display: inline-block;
 			margin-right: 10px;
 			float: right;
+			margin-top:-25px;
 		}		 
 
 		/* Section SectionAttempt SectionMark */
@@ -88,11 +100,13 @@
 			display: inline-block;
 			margin-right: 40px;
 			float: right;
+			/* margin-top:-27px; */
 		}
 		#sectionMark{
 			display: inline-block; 
 			margin-right: 10px;
 			float: right;
+			/* margin-top:-27px; */
 		}
 
 		/* End the this */
@@ -109,14 +123,14 @@
         .MathJax.CtxtMenu_Attached_0{
             display: contents !important;
         }
-        .text-qus-align{margin-left: -16px;padding-right: 250px; }
+        .text-qus-align{margin-left: -16px;padding-right: 250px;display:flex; }
         .text-qus-align p{ margin:0; }
         .text-des{ margin-left: 20px;margin-top: 0px;}	/* Change there aadhavan top-6px*/ 
         .text-option-align{display:flex;margin-top: 0%;margin-left: 45px;} /* Change there aadhavan 10px*/  
         .text-option-align p{ margin:0; }
-		#sectionTitle {border-top: 2px solid gray
-		; width: 100%;}
-		#sectionTitle:first-of-type {border:none;}
+		/* #sectionTitle {border-top: 2px solid gray
+		; width:99%;} */
+		/* #sectionTitle:first-of-type {border:none;} */
         mjx-container[jax="CHTML"][display="true"] {
             display: block;
             text-align: center;
@@ -297,7 +311,7 @@
 		//XmlPath get from .env
 		const xmlPathenv=process.env.XML_FILE_PATH;
 		const xmlPath =path.join(__dirname,xmlPathenv);
-		console.log(xmlFileName)
+		// console.log(xmlFileName)
            return new Promise((resolve, reject) => {
                fs.readFile(`${xmlPath}`+xmlFileName, 'utf8', (error, data) => {
                    if (error) {
diff --git a/addform.html b/addform.html
index 09e02b2..65601f2 100644
--- a/addform.html
+++ b/addform.html
@@ -613,7 +613,6 @@
 const url = new URL(window.location.href);// Get the URL of the current page for JSON
 const params = new URLSearchParams(url.search);// Create a URLSearchParams object from the query string
 var FileName = params.get('filename');// Get the value of a specific parameter 
-
 var xmlPath ="" //get the xml filepath in .env file local variable
 
 $(document).ready(function() {
@@ -666,10 +665,28 @@ document.addEventListener('DOMContentLoaded', function () {
 });
 		
 
-//EditPreview  and  Create Previe
+//EditPreview  and  Create Preview
 	var previewbutton = document.getElementById("editPreview");
 	previewbutton.addEventListener("click", async () => { 
 		if (FileName) {
+			const saveButton = document.getElementById('SaveButton');
+			if (saveButton) {
+				saveButton.click();	
+				setTimeout(function() {
+        			var popupInput = document.getElementById("swal2-input");	
+       				var submitButton = document.querySelector(".swal2-confirm.swal2-styled");
+        			submitButton.addEventListener("click", function() {
+           				FileName = popupInput.value;
+						FileName += ".xml"
+						if(FileName){
+							var anchorElement = document.getElementById("editPreview");
+							if (anchorElement) {
+  				  				anchorElement.click();
+							}
+						}
+        			});  
+    			}, 1000); 
+			}
 			previewbutton.href = "QuestionPreview.html?filename=" + FileName;
 		} else {
 			const saveButton = document.getElementById('SaveButton');
diff --git a/savexml.js b/savexml.js
index 38c7aca..d1a2b2a 100644
--- a/savexml.js
+++ b/savexml.js
@@ -36,7 +36,7 @@ const isEncrypted = process.env.ENCRYPTED;
 //end the autosave
 
 function saveXmlToFile(xmlData, filePath) {
-  console.log(filePath);
+  // console.log(filePath);
   // Check if the file path is provided
   if (!filePath) {
     console.error('File path is required.');
@@ -139,13 +139,14 @@ function promptBox() {
     confirmButtonText: 'Submit',
     cancelButtonText: 'Cancel',
     inputValidator: (value) => {
+      // console.log(value);
       const entervalue =value+'.xml'
       if (!value) {
         return 'You need to enter Filename!'
       }
       else if (value){
-        const fileexists =fileexists(entervalue);
-       if(fileexists){
+        const fileexist =fileexists(entervalue);
+       if(fileexist){
         Swal.update({ showDenyButton: true });
         return 'This file Name already exists'
        }else {
@@ -154,7 +155,7 @@ function promptBox() {
       }
     }
   }).then((result) => {
-    console.log(result);
+    // console.log(result);
     if (result.isConfirmed) {
 
       const inputValue = result.value
diff --git a/xml2json_for_Questionpaper_preview.js b/xml2json_for_Questionpaper_preview.js
index bc7cada..c454b56 100644
--- a/xml2json_for_Questionpaper_preview.js
+++ b/xml2json_for_Questionpaper_preview.js
@@ -54,8 +54,9 @@ function getQuestionsNodes(questionNode,type)
 					{
 						var tempChoiceobj = {};
 						 tempChoiceobj['id'] = choiceList[k].childNodes[0].firstChild.nodeValue;
-						 tempChoiceobj['choice_name'] =  (choiceList[k].childNodes[1].firstChild !== null ? choiceList[k].childNodes[1].firstChild.nodeValue : "");
-						 tempChoiceobj['choice_description'] = (choiceList[k].childNodes[2].firstChild !== null ? choiceList[k].childNodes[2].firstChild.nodeValue : "");
+						 tempChoiceobj['no'] =  (choiceList[k].childNodes[1].firstChild !== null ? choiceList[k].childNodes[1].firstChild.nodeValue : "");
+						 tempChoiceobj['choice_name'] =  (choiceList[k].childNodes[2].firstChild !== null ? choiceList[k].childNodes[2].firstChild.nodeValue : "");
+						 tempChoiceobj['is_math_enabled'] = (choiceList[k].childNodes[3].firstChild !== null ? choiceList[k].childNodes[3].firstChild.nodeValue : "");
 						 // console.log(tempChoiceobj);
 						 questionObj['answers'].push(tempChoiceobj);
 

From a88dff4d4b789727ddc28791fb347a96701dde3f Mon Sep 17 00:00:00 2001
From: venkateswaran ubuntu <bitbucket@venbainfotech.com>
Date: Fri, 20 Oct 2023 10:52:39 +0530
Subject: [PATCH 4/5] CODE MERGE : RV

---
 QuestionPaperPreview.js | 7 +++++++
 QuestionPreview.html    | 3 +++
 savexml.js              | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/QuestionPaperPreview.js b/QuestionPaperPreview.js
index ed654f5..d6162e8 100644
--- a/QuestionPaperPreview.js
+++ b/QuestionPaperPreview.js
@@ -75,6 +75,9 @@ function CheakQnType(question, questionIndex, depth,nested) {
 let count =0    
 var count1 =0
 function processQuestion(question, questionIndex, depth,nested) {
+    // console.log('question Data')
+    // console.log(question);
+
     const questionTex = question.question;
     const questionText = questionTex.replace('<p>', '<p id="question_Text">');
     const questionDescription = question.question_description;
@@ -83,6 +86,7 @@ function processQuestion(question, questionIndex, depth,nested) {
     const multipleAnswer =question.question_sub_type; // this gives true or false to chaeck multiple answers or not
     // Add appropriate indentation for nested questions
     const questionIndentation = "  ".repeat(depth + 1);
+    console.log(questionIndentation)
     if (nested == 1) {// this adds the inside the questionGroup 
         count1++
         questionPaper += `<div class="text-qus-align">${questionIndentation}${count}.${count1}) ${convertToLatex(questionText, mathstatus)}${questionIndentation}</div><p id="question-mark">Marks :${questionMark}</p><div class="text-des">${convertToLatex(questionDescription, mathstatus)}</div>`;
@@ -90,6 +94,8 @@ function processQuestion(question, questionIndex, depth,nested) {
         count++
         questionPaper += `<div class="text-qus-align">${questionIndentation}${count}) ${convertToLatex(questionText, mathstatus)}${questionIndentation}</div><p id="question-mark">Marks :${questionMark}</p><div class="text-des">${convertToLatex(questionDescription, mathstatus)}</div>`;
     }
+    console.log(questionPaper);
+
 
     // If it's an MCQ question, add choices
     if (question.question_type === "group") {
@@ -183,6 +189,7 @@ function convertJSONToQuestionPaper(data, depth = 0, sectionIndex = 1, questionI
 // Call the function and display the formatted question paper
 const formattedQuestionPaper = convertJSONToQuestionPaper(jsonData, 0, 1, 1);
 const questionPaperElement = document.getElementById("questionPaper");
+console.log(questionPaperElement);
 questionPaperElement.innerHTML = formattedQuestionPaper; // Use innerHTML here
 
 }
\ No newline at end of file
diff --git a/QuestionPreview.html b/QuestionPreview.html
index 8e3ac38..147717a 100644
--- a/QuestionPreview.html
+++ b/QuestionPreview.html
@@ -316,6 +316,9 @@
                });
            });
        }    
+
+	   console.log()
+
            
        </script>
 	
diff --git a/savexml.js b/savexml.js
index 260f218..e46bf4d 100644
--- a/savexml.js
+++ b/savexml.js
@@ -144,8 +144,8 @@ function promptBox() {
         return 'You need to enter Filename!'
       }
       else if (value){
-        const fileexists =fileexists(entervalue);
-       if(fileexists){
+        const fileexist = fileexists(entervalue);
+       if(fileexist){
         Swal.update({ showDenyButton: true });
         return 'This file Name already exists'
        }else {

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 5/5] 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 */
+
+}
+