diff --git a/QuestionPaperPreview.js b/QuestionPaperPreview.js
index 49049af..5088d15 100644
--- a/QuestionPaperPreview.js
+++ b/QuestionPaperPreview.js
@@ -39,6 +39,7 @@ function QuestionPaperPreview(jsonData){
     
     
     function convertToLatex(text, mathstatus) {
+        // console.log(text);
         // Parse mathstatus into a boolean
         const mathStatusBoolean = JSON.parse(mathstatus); 
         // Check if the text contains <p> tags
@@ -130,21 +131,48 @@ function QuestionPaperPreview(jsonData){
 
             var  currentSno_length =currentSno.length-(currentSno.length/2)
           if (currentSno_length == 1) {
-            description_align =17
+            description_align =27
           } else if (currentSno_length == 2) {
             description_align =33
           }else if(currentSno_length == 3){
             description_align =48
           }else if(currentSno_length == 4) {
-            description_align =64
+            description_align =62
           }
           else if(currentSno_length == 5) {
             description_align =78
           }
 
+          
+          var GroupQuestionTilteAlign = 0;
                  if (question.group_title) {
+                    // console.log(question);
+                    let cleanedTex = question.question_id.replace(/\s+/g, ' ').trim();
+                    let cleanedText=cleanedTex.replace('<p>','').replace('</p>','')
+                    var question_id_length =cleanedText.length;
+                    if (question_id_length == 1) {
+                        GroupQuestionTilteAlign =15
+                      } else if (question_id_length == 3) {
+                        GroupQuestionTilteAlign =33
+                      }else if(question_id_length == 5){
+                        GroupQuestionTilteAlign =47
+                      }else if(question_id_length == 7) {
+                        GroupQuestionTilteAlign =63
+                      }else if(question_id_length == 4) {
+                        GroupQuestionTilteAlign =40
+                      }else if(question_id_length == 6) {
+                        GroupQuestionTilteAlign =54
+                      }
+                      
+                      
+
+                    // const questionId =`<p class="GroupQuestionId">${cleanedText})</p>`
+
+                    const questionId =cleanedText
+                    console.log(questionId);
+
                     const questionGroupSetP = `${question.group_title}`;
-                    const questionGroupmodify =questionGroupSetP.replaceAll('<p>', `<p id="question-Group-Id" style="padding-left:${description_align}px">`)
+                    const questionGroupmodify =questionGroupSetP.replaceAll('<p>', `<p id="question-Group-Id" style="padding-left:${GroupQuestionTilteAlign}px">`)
                     if (question.group_attempt_any) {
                         var  questionGroupAttempt = `<p id="group_attempt_any" class="GroupAttempAny">Attempt Any : ${question.group_attempt_any} </p>`
 
@@ -169,7 +197,7 @@ function QuestionPaperPreview(jsonData){
                     //     questionGroupMark = questionGroupMark.replace('<p id="group_marks">', '<p id="group_marks" hidden>')
                     // }
                     
-                    questionPaper += `<div class="text-group-align" style="margin-left:-1px;">${temp_sno})${questionGroupmodify}</div>`
+                    questionPaper += `<div class="text-group-align" style="margin-left:-1px;">${questionId})${questionGroupmodify}</div>`
 
                     questionPaper += `<div class="group_marks_attmpt">${questionGroupAttempt}${questionGroupMark}</div>`;
                     // questionPaper += `<div class="group_attempt_any">${questionGroupAttempt}</div>`;
@@ -177,8 +205,34 @@ function QuestionPaperPreview(jsonData){
                     questionPaper += `<div class="group-descrip" style="margin-left:${description_align}px">${questionGroupDescription}</div>`;
                     depth2++
                 } else if (question.question) {
+                    let cleanedTex = question.questionId.replace(/\s+/g, ' ').trim();
+                    let cleanedText=cleanedTex.replace('<p>','').replace('</p>','')
+                    
+                    var question_id_length =cleanedText.length;
+                    console.log(question_id_length);
+                    if (question_id_length == 1) {
+                        GroupQuestionTilteAlign =14
+                      } else if (question_id_length == 3) {
+                        GroupQuestionTilteAlign =26
+                      }else if(question_id_length == 5){
+                        GroupQuestionTilteAlign =41
+                      }else if(question_id_length == 7) {
+                        GroupQuestionTilteAlign =54
+                      }else if(question_id_length == 2) {
+                        GroupQuestionTilteAlign =25
+                      }else if(question_id_length == 4) {
+                        GroupQuestionTilteAlign =42
+                      }else if(question_id_length == 6) {
+                        GroupQuestionTilteAlign =58
+                      }
+                    // console.log(question);
+                    // const questionId =`<p class="questionId">${cleanedText})</p>`;
+                    const questionI =cleanedText;
+                    var questionId = questionI.replace('<p>', '<p class="questionId">');
+                    console.log(questionId);
+
                     const questionTex = question.question;
-                    const questionText = questionTex.replaceAll('<p>', `<p class="question_Text" style="margin-left:${description_align}px">`);
+                    const questionText = questionTex.replaceAll('<p>', `<p class="question_Text" style="margin-left:${GroupQuestionTilteAlign}px">`);
                     // console.log(questionText);
                     const questionDescriptio = question.question_description;
                     const questionDescription = questionDescriptio.replaceAll('<p>', '<p class="question-Description">')
@@ -198,8 +252,11 @@ function QuestionPaperPreview(jsonData){
 
 
 
-                    questionPaper += `<div  id="parent" class="text-qus-align">${temp_sno})${convertToLatex(questionText, mathstatus)}</div>${questionMark}<div class="text-des align-right" style="margin-left:${description_align}px">${convertToLatex(questionDescription, mathstatus)}</div>`;
-               
+                    // questionPaper += `<div  id="parent" class="text-qus-align">${temp_sno})${convertToLatex(questionText, mathstatus)}</div>${questionMark}<div class="text-des align-right" style="margin-left:${description_align}px">${convertToLatex(questionDescription, mathstatus)}</div>`;
+                        questionPaper += `<div  id="parent" class="text-qus-align">${questionId})${convertToLatex(questionText, mathstatus)}</div>${questionMark}<div class="text-des align-right" style="margin-left:${description_align}px">${convertToLatex(questionDescription, mathstatus)}</div>`;
+// 
+
+
                     if (question.question_type === "group") {
                         var answers = question.answers;
                         var choisealgin =25
@@ -250,6 +307,8 @@ function QuestionPaperPreview(jsonData){
     questionPaperElement.innerHTML = formattedQuestionPaper; // Use innerHTML here
     }
 
+  
+
 function removeHtmlTags(inputString) {
 
     const cheerio = require('cheerio');
@@ -257,4 +316,35 @@ function removeHtmlTags(inputString) {
     const text = $.text();
     
     return text;
-    }
\ No newline at end of file
+    }
+
+function convertToLatex(text, mathstatus) {
+    // Parse mathstatus into a boolean
+    const mathStatusBoolean = true
+    // Check if the text contains <p> tags
+    console.log(text);
+    // console.log("ff")
+    if (!/<p>|<\/p>/i.test(text)) {
+        // console.log('text:' , text)
+        if (mathStatusBoolean) {
+            // console.log('text1:' , text)
+            // Use MathJax to convert the text to LaTeX
+            const cov = MathJax.tex2chtml(text).outerHTML;
+            console.log('cov:' , cov)
+
+            return cov;
+        } else {
+            // Return the text as-is
+
+            return text;
+        }
+    } else {
+        console.log("pq")
+        const cov = MathJax.tex2chtml(text).outerHTML;
+        console.log('cov:' , cov)
+
+        return cov;
+        // Return the text as-is
+        return text;
+    }
+}
\ No newline at end of file
diff --git a/QuestionPreview.html b/QuestionPreview.html
index 6b0ddea..3e3b302 100644
--- a/QuestionPreview.html
+++ b/QuestionPreview.html
@@ -49,8 +49,13 @@
 
 	
     <style>
-		
-		
+		.question-Group-Description{
+			margin-top: -14px;
+		}
+
+		.GroupQuestionId{
+		margin-left: 1px;
+		}
 
 		/* strong{
 			margin-left: -51px !important;
@@ -75,6 +80,7 @@
  		 /* overflow-wrap: break-word;
  		 hyphens: manual; */
 		  text-wrap: wrap;
+		  margin-top: -27px !important;
 
 			/* width: 700px;  */
 			/* inline-size: 150px; */
@@ -137,7 +143,7 @@
 			display: inline-flex;
 			margin-right: 10px;
 			float: right;
-			margin-top:-25px;
+			margin-top:-27px;
 		}		 
 
 		/* Section SectionAttempt SectionMark */
diff --git a/addform.html b/addform.html
index 433e27b..5592570 100644
--- a/addform.html
+++ b/addform.html
@@ -49,17 +49,123 @@
 
 
 	<script src="assets/js/quill.js"></script>
-	<script src="assets/css/quill.snow.css"></script>
+	<!-- <script src="assets/css/quill.snow.css"></script> -->
 
 	<script src="./node_modules/quill-image-resize-module/image-resize.min.js"></script>
 
 	<script src="./node_modules/quill-resize-module/dist/resize.js"></script>
 	<link rel="stylesheet" href="./node_modules/quill-resize-module/dist/resize.css">
 
-	
-	
-	
+	<script src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
+
+	<link rel="stylesheet" href="https://unpkg.com/cropperjs/dist/cropper.min.css">
+
+	<!-- <script src="//cdn.quilljs.com/1.2.2/quill.min.js"></script> -->
+	<script src="./node_modules/quill/dist/quill.min.js"> </script>
+    <!-- <link href="//cdn.quilljs.com/1.2.2/quill.snow.css" rel="stylesheet"> -->
+
+	<!-- <script src="//cdn.quilljs.com/1.3.6/quill.min.js"></script> -->
+    <!-- <link href="//cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet"> -->
+    <script src="./imageresize.min.js"></script>
+
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/4.3.1/fabric.min.js"></script>
+	<script src="QuestionPaperPreview.js"></script>
 	<style>
+		body {
+			margin: 0;
+			font-family: 'Arial', sans-serif;
+		}
+	
+		.sidebar {
+			height: 100%;
+			width: 0;
+			position: fixed;
+			top: 0;
+			right: 0;
+			background-color: #b6b1b1;
+			overflow-x: hidden;
+			transition: 0.5s;
+			padding-top: 60px;
+			z-index: 2; /* Increase z-index to make the sidebar overlap */
+		}
+	
+		.chat-box {
+			padding: 20px;
+			color: white;
+			height: 100%; /* Set height to 100% to fill the sidebar */
+			display: flex;
+			flex-direction: column; /* Stack child elements vertically */
+			justify-content: space-between; /* Push child elements to the top and bottom */
+		}
+	
+		#messages {
+			max-height: calc(100% - 60px); /* Adjusted to leave space for the input box */
+			overflow-y: auto;
+			margin-bottom: 10px;
+		}
+	
+		#messageForm {
+			margin-top: auto; /* Push the form to the bottom */
+		}
+	
+		textarea {
+			height: 40px; /* Adjust the height of the textarea as needed */
+		}
+	
+		input {
+			flex: 1;
+			padding: 10px;
+		}
+	
+		button {
+			padding: 10px;
+			cursor: pointer;
+		}
+	
+		#sidebarToggle2 {
+			position: fixed;
+			top: 20px;
+			right: 20px;
+			font-size: 20px;
+			cursor: pointer;
+			z-index: 3; /* Ensure the button appears above the sidebar */
+		}
+	
+		.content {
+			margin-right: 0; /* Initially, no margin to accommodate the sidebar width */
+			transition: margin-right 0.5s;
+		}
+	
+		.sidebar-open .content {
+			margin-right: 250px; /* Push content to the right when the sidebar is open */
+		}
+	</style>
+
+	<style>
+		div:empty:not(:focus):before {
+	content: attr(data-text);
+  color: #999999;
+}
+		.QuestionsGroupIdset{
+			width: 100px !important;
+			border: 2px solid gray; 
+			margin-left: 170px;
+   			margin-top: -29px;
+		}
+
+		.QuestionTextIdSet{
+			width: 100px !important;
+			border: 1px solid;
+    margin-left: 77px;
+    margin-top: -29px;
+		}
+
+		.testfor{
+			width: 1000px;
+			height: 200px;
+			background-color: white;
+			margin-top: 100px;
+		}
 		
 		/* body { */
       /* Ensure the body takes the full height of the viewport */
@@ -568,6 +674,7 @@ h1.title{
 							<li><a href="dashboard.html"><img class="addPageMenu" src="assets/images/home.svg" alt="">Home</a></li>
 							<li><a href="#" class="myBtn" onclick="saveFile()" id="SaveButton"><img class="addPageMenu" src="assets/images/save.svg" alt="">Save</a></li>
 							<li><a href="#" id="editPreview" ><img class="addPageMenu" src="assets/images/preview.svg" alt="">Preview</a></li>
+							<li id="sidebarToggle2"> Sidebar</li>
 						</ul>
 					</div>
 				</div>
@@ -588,6 +695,155 @@ h1.title{
             	</div>
 			<!-- sidebar end -->
 
+
+			<script>
+				document.addEventListener('DOMContentLoaded', function () {
+					// Initialize Quill with your specific configuration
+					var quill = new Quill('#workarea', {
+						theme: 'snow',
+						modules: {
+							toolbar: {
+								container: toolbarOptions,
+								clipboard: {
+									matchVisual: true,
+								},
+								ImageResize: {
+									displaySize: true,
+									modules: ['Resize', 'DisplaySize', 'Toolbar']
+								}
+							},
+						}
+					});
+				
+					var chat_Div = $("#workarea");
+					var chat_previousDiv = chat_Div.prev();
+					chat_previousDiv.attr("id", "messageInput_rtc");
+					var chatRtc = 'messageInput_rtc';
+				
+					$('#workarea').focus(function () {
+						rtc_hide_and_show(chatRtc);
+					});
+				
+					document.getElementById('sidebarToggle2').addEventListener('click', function () {
+						var sidebar = document.getElementById('rightSidebar');
+						document.body.classList.toggle('sidebar-open');
+						if (sidebar.style.width === '250px') {
+							sidebar.style.width = '0';
+						} else {
+							sidebar.style.width = '250px';
+						}
+					});
+				
+					document.getElementById('sendMessageButton').addEventListener('click', function () {
+						sendMessage(quill);
+					});
+				
+					document.getElementById('workarea').addEventListener('keydown', function (event) {
+						if (event.key === 'Enter') {
+							event.preventDefault();
+							sendMessage(quill);
+						}
+					});
+				
+					// Add Math functionality
+					var mathCheckbox = document.getElementById('Choicemath_messageInput');
+					var mathField = document.getElementById('workarea_math');
+					var richText = document.getElementById('workarea');
+					// Ensure MathQuill field is initially hidden
+					$(mathField).hide();
+					// $(richText1).show();
+					mathCheckbox.addEventListener('change', function () {
+						if (mathCheckbox.checked) {
+							$(mathField).show();
+							$(richText).hide();
+							rtc_hide_and_show(chatRtc);
+						} else {
+							$(mathField).hide();
+							$(richText).show();
+							rtc_hide_and_show(chatRtc);
+						}
+					});
+				
+					// Initialize Math Field
+					var mathFieldId = 'workarea_math';
+					var mathFieldDiv = document.getElementById(mathFieldId);
+					var mathFieldPreviousDiv = $(mathFieldDiv).prev();
+					var mathRTEId = "workarea_math_rtc";
+					mathFieldPreviousDiv.attr("id", mathRTEId);
+				
+					mathFieldDiv.addEventListener('click', function () {
+						var id = localStorage.getItem('rtc');
+						var hideid = document.getElementById(id);
+						$(hideid).hide();
+						$(mathFieldPreviousDiv).show();
+						localStorage.setItem('rtc', mathRTEId);
+					});
+					$(mathFieldPreviousDiv).hide();
+				});
+				
+				function sendMessage(quill) {
+					var workarea = document.getElementById('workarea');
+					var mathField = document.getElementById('workarea_math');
+					var messagesContainer = document.getElementById('messages');
+					console.log("workarea",workarea);
+					
+					console.log("mathField",mathField);
+
+					console.log("messagesContainer",messagesContainer);
+
+					var content = '';
+
+					// Check if the checkbox is checked
+					if ($('#Choicemath_messageInput').prop('checked')) {
+						// Use MathQuill API to get the math field content
+						var mathFieldContent = mathField.getValue();
+						console.log(mathFieldContent);
+						content = convertToLatex(mathFieldContent)
+					} else {
+						content = quill.root.innerHTML.trim();
+					}
+
+					// Log the content to the console
+					console.log("Message Content: ", content);
+
+					if (content !== '') {
+						var messageElement = document.createElement('div');
+						messageElement.className = 'message';
+						messageElement.innerHTML = content;
+
+						messagesContainer.appendChild(messageElement);
+
+						if ($('#Choicemath_messageInput').prop('checked')) {
+							// Clear the math field content
+							mathField.latex('');
+						} else {
+							quill.setText('');
+						}
+
+						messagesContainer.scrollTop = messagesContainer.scrollHeight;
+					}
+				}
+				
+				</script>
+				
+				<div class="sidebar" id="rightSidebar">
+					<div class="chat-box">
+						<h2>Live Chat</h2>
+						<div id="messages" class="chat-history"></div>
+						<form id="messageForm" action="#" method="post" onsubmit="sendMessage(); return false;">
+							<fieldset>
+								<!-- The contentEditable div for Quill -->
+								<div class="richText" id="workarea" contentEditable="true" placeholder="Type your message and press Enter..." ></div>
+								<div>
+								<math-field id="workarea_math" style="width: 100%; " contenteditable="true"></math-field>
+								<div class="items2 col-lg-4">
+									<input style="width:14px; height:14px" type="checkbox" id="Choicemath_messageInput">&nbsp;&nbsp;<span class="math">Math</span>
+								</div></div>
+								<button id="sendMessageButton" type="button">Send</button>
+							</fieldset>
+						</form>
+					</div>
+				</div>
 	
 	<div class="container">
 
@@ -799,7 +1055,6 @@ h1.title{
 	
 <script>
 
-
 localStorage.setItem('scrollPosition', window.scrollY);
 
 	var sidebarWrapper = document.getElementById("questionPaper");
@@ -975,7 +1230,7 @@ function saveFile(flag=0) {
 	{
         var parsedArray = JSON.parse(title_id);
 		var count = parsedArray.length;
-		console.log('count - ' + count)
+		// console.log('count - ' + count)
 	}
 	else
 	{
@@ -1012,11 +1267,11 @@ function saveFile(flag=0) {
 
 
 <script>
-
 const { v4: uuidv4 } = require('uuid');
 const Quill = require('quill');
 
-const ImageResize =require('quill-image-resize-module'); 
+// const ImageResize =require('quill-image-resize-module');
+const ImageResize = require('./imageresize.min') 
 Quill.register('modules/imageResize', ImageResize);
 
 const Question_Paper_UUID = uuidv4();
@@ -1041,10 +1296,28 @@ var toolbarOptions2 = [
 var quill = new Quill('#Question_title', {
 	theme: 'snow', 
 	modules: {
+		
 	toolbar: toolbarOptions,
+	// ImageResize:{
+	// 	displaySize:true,
+	// 	modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
+	// }
 }
 });
 
+var quill = new Quill('#QuestionsGroupIdset ', {
+	theme: 'snow', 
+	modules: {
+		imageResize:{
+		displaySize:true,
+	}
+}
+});
+
+var canvas = new fabric.Canvas('canvas');
+
+
+
 
 var quill = new Quill('#Question_description', {
 	theme: 'snow', 
@@ -1062,15 +1335,6 @@ var quill = new Quill('#Question_description', {
 }
 });
 
-var quill = new Quill('#ql-editor',{
-	theme:'snow',
-	module:{
-		ImageResize:{
-		displaySize:true,
-		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
-	}
-	}
-})
 
 
 // function imageHandler() {
@@ -1144,7 +1408,7 @@ function showButtons(container) {
 	{
         onhover.style.display = 'block';
 	}
-	buttons.style.display = 'block';
+	// buttons.style.display = 'block';
 	
  }
 
@@ -1160,6 +1424,7 @@ function hideButtons(container) {
 
 var i = 0;
 var array_of_Id = []; 
+// var array_of_Id_for_choice =[];
 var questionGroupTitle = "";
 var checktextquestona= 0;
 var checkchoicequestona= 0;
@@ -1398,7 +1663,7 @@ inputFields.forEach(inputField => {
 			});
 			
 			var sectionText = (random_no == false) ? 'section_title_text_' + text_field_created_time : 'section_title_text_' + random_no;  
-			console.log(sectionText);
+			// console.log(sectionText);
 			var quill = new Quill('#'+sectionText, {
 				theme: 'snow', 
 				modules: {
@@ -1446,7 +1711,6 @@ inputFields.forEach(inputField => {
 				var tempSectionTitle = document.getElementById('section_title_text_'+ sectionRandomID).querySelector('.ql-editor').innerHTML;
 				                
 				inputElement.addEventListener("keyup", function(event) {
-                      
 					json2nav();
 					clearSidebarWrapper();
 					navpane();
@@ -1493,10 +1757,13 @@ navpane();
 
 //function for new section add to go that section prevent default
 var EditScroll = localStorage.getItem('scroll')
+// console.log(EditScroll);
 if(EditScroll !== '1' && scrollval == false)
 
 {
+	
 const targetId = 'section_title_text_' + sectionRandomID; 
+// console.log(targetId);
 scrollToElementWithoutLink(targetId);
 
 }
@@ -1504,6 +1771,7 @@ scrollToElementWithoutLink(targetId);
 
 
 		const arrayString = JSON.stringify(array_of_Id);
+		// console.log("3");
 		collect_Empty_Question_Id(arrayString, sectionID);
 
 
@@ -1547,7 +1815,13 @@ function addQuestionGroup(idObj)
 			QuestionGroup_ID = text_field_created_time;
 		}
 
+		// console.log(idObj.hasOwnProperty('question_group_obj') ? idObj.question_group_obj.group_title  : "");
 		var sectionRandomID = localStorage.getItem('sectionId');
+		var group_question_i = `${idObj.hasOwnProperty('question_group_obj') ? idObj.question_group_obj.question_id  : "<p><br></p>"}`
+		var group_question_id = (group_question_i.replace('<p>','').replace('</p>','').replace('<br>',''))
+		// console.log(group_question_i);
+		// console.log(group_question_id);
+
 		addQuestionGroup +=
 		`<div  draggable='true' class="draggable-group hidedrag" id="draggedGroup_${QuestionGroup_ID}">
 			<i id="collapseSubSection_${QuestionGroup_ID}" aria-hidden="true" style=" font-size: 24px; margin-right: 9px; margin-top: 25px;"></i> 
@@ -1586,7 +1860,7 @@ function addQuestionGroup(idObj)
 							</div>						
 							<div class="col-lg-12 col-md-12">
 								<div class="form_box">
-									<label class="titleSpace">Questions Group Title:<span id='partOf_${QuestionGroup_ID}'></span></label>
+									<label class="titleSpace">Questions Group Title:<span id='partOf_${QuestionGroup_ID}'></span> <input contenteditable="true" style="border: 2px solid #EEECFE;height:34px;width: 200px !important;;margin-left:4px;" class="QuestionsGroupIdset"  id="Questions_Group_id_${QuestionGroup_ID}"  value="${group_question_id}" placeholder="SNo..."> </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>
@@ -1647,7 +1921,9 @@ function addQuestionGroup(idObj)
 		    formContainer.insertAdjacentHTML('beforeend', addQuestionGroup);
 		} 
 
-		array_of_Id.push('subSection_title_text_' + QuestionGroup_ID);     
+		   
+		array_of_Id.push('Questions_Group_id_' + QuestionGroup_ID);      
+		array_of_Id.push('subSection_title_text_' + QuestionGroup_ID); 
 
 		var addNewButtonId = 'addNewButtonSectionQroup_' + QuestionGroup_ID ;
 		var textButtonId = 'textButtonSectionQroup_' + QuestionGroup_ID ;
@@ -1655,7 +1931,7 @@ function addQuestionGroup(idObj)
 		var GroupQuestionButtonId = 'QuestionGroupButton_' + QuestionGroup_ID ;
 
 		$('#'+addNewButtonId).on('click', function() {  
-                
+			   
 				$('#'+textButtonId).toggle();
 				$('#'+ChoiseButtonId).toggle();		
 				$('#'+GroupQuestionButtonId).toggle();		
@@ -1768,6 +2044,20 @@ inputElement.addEventListener("keyup", function(event) {
 
 });
 
+var question_groupi = 'Questions_Group_id_'+ QuestionGroup_ID;
+var inputElemen = document.getElementById(question_groupi);
+attrId = document.getElementById('Questions_Group_id_'+ QuestionGroup_ID).innerHTML;
+
+inputElemen.addEventListener("keyup", function(event) {
+
+	json2nav();
+	clearSidebarWrapper();
+	navpane();
+	check_Remove_Empty_Question(question_groupi);
+	// SetQuestionGroupTitle(QuestionGroup_ID, QuestionGroup_ID)
+
+});
+
 // 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;
@@ -1849,6 +2139,7 @@ scrollToElementWithoutLink(targetId);
 
 		
 		const arrayString = JSON.stringify(array_of_Id);
+		// console.log("2");
 		collect_Empty_Question_Id(arrayString, question_groupid);
 		// SetQuestionGroupTitle(QuestionGroup_ID, QuestionGroup_ID)
 
@@ -1856,10 +2147,14 @@ scrollToElementWithoutLink(targetId);
 
 //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, questionType = false, questionSubType = false, mathEnabled = false, Choice = false, questionAreaId = false, questionRandomNo = false, questionMarks = false, questionUUID = false, questionDisplayMarks = 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,questionId,CorrectAnswer)
 {
 		const ChoiceGroupFixed_UUID = uuidv4();
 	
+
+		// inputAreaCheck(Choice)
+
+
         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);
@@ -1925,10 +2220,11 @@ function groupQuestion(question_id = false, section_id = false , group_question_
 
 		var sectionRandomID = localStorage.getItem('sectionId');
 		var QuestionGroup_ID = localStorage.getItem('QuestionGroupId');
-        
-    		
+        var questionIdS=`${questionId ? questionId : ''}`;
+		// console.log(questionIdS);
+		// aa =2
 		groupQuestion += 
-		`<div class="question hidedrag element Question-Border-Top col-lg-12" draggable="true"   id="removeAndCloneQroupQuestion_${addChoiceAreaId}" style="" onclick="toggleClasses(this)" onmouseover="showButtons(this)">
+		`<div class="question hidedrag element Question-Border-Top col-lg-12 choiceQuestion" draggable="true"   id="removeAndCloneQroupQuestion_${addChoiceAreaId}" style="" onclick="toggleClasses(this); multipleAnswerCheck(this); resetthe_radio(this)" onmouseover="showButtons(this);  ">
 			<div class="question-linestyle"><img src="assets/images/${lineImg}"/></div>
 			<div id="dragHandle" class="drag-handle">
 				<i class="fas fa-grip-horizontal"></i>
@@ -1985,8 +2281,8 @@ function groupQuestion(question_id = false, section_id = false , group_question_
 				<div class="row">
 					<div class="col-lg-12 col-md-12" style="margin-top: -20px"> 
 						<div class="form_box">
-							<label class="titleSpace">Question:<span id='partOf_${addChoiceAreaId}'></label>
-							<div class="richText" id="textQuestionName_${addChoiceAreaId}" contenteditable="true" style=" border: 2px solid #EEECFE;  margin-top: 4px;">${questionTitle ? questionTitle : ''}</div>
+							<label class="titleSpace">Question:<span id='partOf_${addChoiceAreaId}'> <input style=" width: 200px !important;border: 2px solid #EEECFE;height: 37px; margin-left: 4px; margin-top: -29px;" id="QuestionChoiceId_${addChoiceAreaId}" class="QuestionChoiceId" contenteditable="true" value="${questionIdS}" placeholder="SNo...."></label>
+			 				<div class="richText" id="textQuestionName_${addChoiceAreaId}" contenteditable="true" style=" border: 2px solid #EEECFE;  margin-top: 4px;">${questionTitle ? questionTitle : ''}</div>
 						</div>
 					</div>
 
@@ -2009,6 +2305,8 @@ function groupQuestion(question_id = false, section_id = false , group_question_
                              </div>
 							<div class="items2 col-lg-4">
 								<input style="width:14px; height:14px" type="checkbox" id="Choicemath_${addChoiceAreaId}">&nbsp;&nbsp;<span class="math">Math</span>
+								<input class="correctAnswerBox " style="width:14px; height:14px; margin-left: 44px;" type="checkbox" id="ChoiceCorrectAnswer_${addChoiceAreaId}"  value="${Choice == false ? ChoiceGroupFixed_UUID : Choice[0].id}">&nbsp;&nbsp;<span class="correctAnswer ">Correct Answer</span>
+
 							</div>
 						</div>                     
 					</div>
@@ -2033,7 +2331,7 @@ function groupQuestion(question_id = false, section_id = false , group_question_
 							
 							<span>Multiple Answer</span>
 							<label class="switch hideondrag" >
-								<input type="checkbox" id="multipleAnswer_${addChoiceAreaId}">
+								<input class="multipleAnswerorNot" type="checkbox" id="multipleAnswer_${addChoiceAreaId}">
 								<span class="slider round"></span>
 							</label>
 					    </div>	
@@ -2075,9 +2373,14 @@ function groupQuestion(question_id = false, section_id = false , group_question_
 			var sectionDiv = document.getElementById(group_question_area_id);
 			sectionDiv.insertAdjacentHTML('beforeend', groupQuestion);
 		}
-
+		array_of_Id.push('removeAndCloneQroupQuestion_'+addChoiceAreaId)
+		array_of_Id.push('QuestionChoiceId_'+addChoiceAreaId)
 		array_of_Id.push('textQuestionName_' + addChoiceAreaId);
 
+		// array_of_Id_for_choice.push('removeAndCloneQroupQuestion_'+addChoiceAreaId)
+
+
+		
 		var commentButtonId =  'commentButton_' + addChoiceAreaId;
 		var commentFieldId = 'commentField_' + addChoiceAreaId;
 		var imageButtonId = 'imageButton_' + addChoiceAreaId;
@@ -2264,6 +2567,9 @@ var quill = new Quill('#'+typetwoQuestionSubtitle, {
 	theme: 'snow', 
 	modules: {
 		toolbar: toolbarOptions
+	// 	imageResize:{
+    //   displaySize:true
+    // }
 	},
 });
 
@@ -2330,11 +2636,15 @@ if (questionSubType === 'true') {
 }
 
 
+// var questionid = 'QuestionTextIdSet_'+ addChoiceAreaId;
+// var inputElementid = document.getElementById(questionid);
+// attrId = document.getElementById('textQuestionName_'+ addChoiceAreaId).querySelector('.ql-editor').innerHTML;
+
+
 var choiceid = 'textQuestionName_'+ addChoiceAreaId;
 var inputElement = document.getElementById(choiceid);
 attrId = document.getElementById('textQuestionName_'+ addChoiceAreaId).querySelector('.ql-editor').innerHTML;
 $(inputElement).keyup(function(event) {
-	
 	json2nav();
 	clearSidebarWrapper();
 	navpane();
@@ -2343,6 +2653,50 @@ $(inputElement).keyup(function(event) {
 
 });
 
+
+var choicei = 'QuestionChoiceId_'+ addChoiceAreaId;
+var inputElemen = document.getElementById(choicei);
+attrId = document.getElementById('QuestionChoiceId_'+ addChoiceAreaId).innerHTML;
+$(inputElemen).keyup(function(event) {
+	json2nav();
+	clearSidebarWrapper();
+	navpane();
+	check_Remove_Empty_Question(choicei);	
+	// SetQuestionGroupTitle(QuestionGroup_ID,addTextQuestionId);
+
+});
+
+
+// var choic = 'ChoiceCorrectAnswer_'+ addChoiceAreaId;
+// var choice = 'multipleAnswer_'+addChoiceAreaId;
+// var inputEleme = document.getElementById(choic);
+// console.log(inputEleme.checked);
+// attrId = document.getElementById('ChoiceCorrectAnswer_'+ addChoiceAreaId);
+// $(inputEleme).change(function(event) {
+// 	json2nav();
+// 	clearSidebarWrapper();
+// 	navpane();
+// 	check_Remove_Empty_Question(choice);	
+// 	// SetQuestionGroupTitle(QuestionGroup_ID,addTextQuestionId);
+
+// });
+
+
+// var choice ='QuestionTextIdSet_'+ addChoiceAreaId;
+// console.log(choice);
+// var input =document.getElementById(choice)
+// attrId = document.getElementById('QuestionTextIdSet_'+ addChoiceAreaId);
+
+// $(input).keyup(function(event) {
+// 	json2nav();
+// 	clearSidebarWrapper();
+// 	navpane();
+// 	check_Remove_Empty_Question(choice);	
+// 	// SetQuestionGroupTitle(QuestionGroup_ID,addTextQuestionId);
+
+// });
+
+
 // function for calling html2json using Mark Calculation
 var choiceQuestionMarkField = 'Choice_Question_Marks_Id_' + addChoiceAreaId;
 $('#'+choiceQuestionMarkField).keyup(function() {
@@ -2365,9 +2719,9 @@ if(EditScroll !== '1')
 const targetId = 'textQuestionName_' + addChoiceAreaId; 
 scrollToElementWithoutLink(targetId);
 }
-
-
 	const arrayString = JSON.stringify(array_of_Id);
+	// console.log(arrayString);
+	// console.log('1');
     collect_Empty_Question_Id(arrayString, choiceid);
 	// if (checkchoicequestona != 0) {
     //  console.log(checktextquestona);
@@ -2375,20 +2729,23 @@ scrollToElementWithoutLink(targetId);
     // }
 
 	// checkchoicequestona++
+	if (CorrectAnswer) {
+		findInputByValue(CorrectAnswer)
+
+	}
 
 }
 
-//Function for Create a New Choice Field in a Choice Question 	
-function addNewChoice(NewaddChoiceAreaId = false, focusval = false, choiceName = false, questionRandomNo = false, choiceID = false, choice_mathEnabled= false)
+//Function for Create a New Choice Field in a Choice Question 
+function addNewChoice(NewaddChoiceAreaId = false, focusval = false, choiceName = false, questionRandomNo = false, choiceID = false, choice_mathEnabled= false,CorrectAnswer)
 // function addNewChoice(choiceObj)
 	{    
-	
-	 addChoice = "";
 
+	 addChoice = "";
+		
         	const Choice_Group_Dynamic_UUID = uuidv4(); 		
 	        const text_field_created_time = Date.now();
 			var rnd_no = Math.random();
-
 			addChoice += 		 
 			`<div class="col-lg-12 col-md-4" id="newChoiceGroup_`+text_field_created_time+rnd_no+`">
 				<input type="hidden" id="Choice_Group_Dynamic_UUID_ID_`+text_field_created_time+rnd_no+`" value="${choiceID == false ? Choice_Group_Dynamic_UUID : choiceID}">
@@ -2401,12 +2758,13 @@ function addNewChoice(NewaddChoiceAreaId = false, focusval = false, choiceName =
 						<div class="items2 col-lg-4">
 							<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>
+							<input class="correctAnswerBox " style="width:14px; height:14px;  margin-left:10px"  type="checkbox" id="ChoiceCorrectAnswer_`+text_field_created_time+rnd_no+`"  value="${choiceID == false ? Choice_Group_Dynamic_UUID : choiceID}">&nbsp;&nbsp;<span class="correctAnswer">Correct Answer</span>&nbsp;&nbsp;&nbsp;
 						</div>
 					</div>
 			</div>`
             
 			if(questionRandomNo)
-			{
+			{ 
 				var addChoiceAreaId = 'addChoiceArea_'+questionRandomNo;
 				var addChoiceAreaId2 = document.getElementById(addChoiceAreaId);
 				addChoiceAreaId2.insertAdjacentHTML('beforeend', addChoice);
@@ -2519,12 +2877,19 @@ $(newChoiceDeleteButtonId).on('click', function() {
 	json2nav();
 	clearSidebarWrapper();
 	navpane();
-			
+
+			if (CorrectAnswer) {
+				findInputByValue(CorrectAnswer)
+
+			}
+
+
 	 }
 
 //Function for Create a New Text Question in the Section and Question Group
 function textQuestion(QuestionObj) 
 {
+	// console.log(QuestionObj);
 	var group_area_id = ""
  if(QuestionObj.hasOwnProperty('group_question_area_id'))
 {
@@ -2546,7 +2911,6 @@ if(QuestionObj.hasOwnProperty('questionRandomNo')) {
 } else{
 	addTextQuestionId = text_field_created_time;
 }
-
 var mathEnabled = "";
 if(QuestionObj.hasOwnProperty('mathEnabled'))
 {
@@ -2559,6 +2923,7 @@ else
 
 
 var questionAreaType = "";
+
 if(QuestionObj.hasOwnProperty('question_area_id')){
 questionAreaID = QuestionObj.question_area_id;
 questionAreaType = questionAreaID.split("_")[0];
@@ -2578,7 +2943,9 @@ else{
 
 var sectionRandomID = localStorage.getItem('sectionId');
 var QuestionGroup_ID = localStorage.getItem('QuestionGroupId');
-
+var ss =`${QuestionObj.hasOwnProperty('questionId') ? QuestionObj.questionId : '<p><br></p>'}`
+var ssa=ss.replace('<p>','').replace('</p>','').replace('<br>','');
+// console.log(ssa);
 
 textQuestion += 
 `<div class="col-lg-12 question hidedrag element Question-Border-Top" draggable="true"  id="removeAndCloneTextQuestion_${addTextQuestionId}" style="" onclick="toggleClasses(this)" onmouseover="showButtons(this)">
@@ -2634,7 +3001,7 @@ textQuestion +=
 	<div class="col-lg-12 col-md-12" style="margin-top: -20px">
 		<input type="hidden" id="Text_Question_UUID_ID_${addTextQuestionId}" value="${QuestionObj.hasOwnProperty('questionUUID') ? QuestionObj.questionUUID : Text_Question_UUID}">
 		<div class="form_box">
-			<label class="titleSpace">Question:<span id='partOf_${addTextQuestionId}'></label>
+			<label class="titleSpace">Question:<span id='partOf_${addTextQuestionId}'> <input type='text'style="border: 2px solid #EEECFE; height:34px;width: 200px !important;margin-left: 4px;" id='QuestionTextIdSet_${addTextQuestionId}' class='QuestionTextIdSet' contenteditable="true" value="${ssa}" placeholder="SNo...."></label>
 			<div type="text" class="richText" id="textQuestionName_${addTextQuestionId}" contenteditable="true" style=" border: 2px solid #EEECFE;  margin-top: 4px;">${QuestionObj.hasOwnProperty('questionTitle') ? QuestionObj.questionTitle : ''}</div> 
 		</div>
 	</div>
@@ -2689,8 +3056,10 @@ else if(QuestionObj.hasOwnProperty('group_question_area_id'))
 	var sectionDiv = document.getElementById(QuestionObj.group_question_area_id); 
 	sectionDiv.insertAdjacentHTML('beforeend', textQuestion);
 }
+array_of_Id.push('QuestionTextIdSet_' + addTextQuestionId);
 array_of_Id.push('textQuestionName_' + addTextQuestionId);
 
+
 var ChoiceMathSwitch ='math_' + addTextQuestionId;
 var textQuestionSubtitle_math = 'textQuestionSubtitle_math_' + addTextQuestionId;
 var textQuestionSubtitle = 'textQuestionSubtitle_' + addTextQuestionId;
@@ -2892,6 +3261,22 @@ var tempQuestionTitle = inputElement.querySelector('.ql-editor').innerHTML;
 
 
 
+	});
+
+	var Texti = 'QuestionTextIdSet_'+ addTextQuestionId;
+var inputElemen = document.getElementById(Texti);
+// console.log(inputElement);
+var tempQuestionTitle = inputElemen.innerHTML;
+
+	$(inputElemen).keyup(function(event) {
+		json2nav();
+		clearSidebarWrapper();
+		navpane();
+		check_Remove_Empty_Question(Texti);
+    	// SetQuestionGroupTitle(QuestionGroup_ID,addTextQuestionId)
+
+
+
 	});
 
   // function for calling html2json using Mark Calculation
@@ -2911,15 +3296,21 @@ var tempQuestionTitle = inputElement.querySelector('.ql-editor').innerHTML;
 //function for new TextQuestion add scroll to the TextQuestion prevent default
 
 var EditScroll = localStorage.getItem('scroll')
+// console.log(EditScroll);
 if(EditScroll !== '1')
 {
 	const targetId = 'textQuestionName_' + addTextQuestionId; 
     scrollToElementWithoutLink(targetId);
 }
 
+// console.log(array_of_Id);
 const arrayString = JSON.stringify(array_of_Id);
+// console.log(arrayString);
+console.log('7');
 collect_Empty_Question_Id(arrayString, Textid);
 
+
+
 // if (checktextquestona != 0) {
 // 	SetQuestionGroupTitle(QuestionGroup_ID,addTextQuestionId);
 // }
@@ -2981,25 +3372,36 @@ function SetQuestionGroupTitle(QuestionGroup_ID,QuestionId){
 //function for find empty question id
 function collect_Empty_Question_Id(arrayString, ID) {
 
+	// console.log(ID);
+	// console.log(arrayString);
 	const input_text_value = document.getElementById(ID);
-   
+//    console.log(input_text_value);
 	var attrId = ""
+	// console.log(input_text_value);
 	if(input_text_value !== null)
 	{
-		attrId = input_text_value.querySelector('.ql-editor').innerHTML;
+		// console.log("ikl");
+		if (input_text_value.className == 'QuestionTextIdSet') {
+			attrId =input_text_value.innerHTML
+		} else {
+			attrId = input_text_value.querySelector('.ql-editor').innerHTML;
+
+		}
 	}
 	else{
 		attrId = '<p><br></p>';
 	}
     
 	var value = localStorage.getItem('EditNavExpend');
-	if (!value && attrId === '<p><br></p>') {
-  
+	// console.log(value);
+	
+	if (!value && attrId === '<p><br></p>' ) {
 	  localStorage.setItem('JSON_FOR_EMPTY_QUESTION', arrayString);
 	}
 	else{
 		localStorage.removeItem('JSON_FOR_EMPTY_QUESTION');
 		array_of_Id = [];
+		
 	}
 }
 
@@ -3008,24 +3410,48 @@ function check_Empty_Question()
 	var title_id = localStorage.getItem('JSON_FOR_EMPTY_QUESTION');
 	if (title_id) {
 	var parsedArray = JSON.parse(title_id);
-
-	parsedArray.forEach(function(Id, index) {
-		attrId = document.getElementById(Id).querySelector('.ql-editor').innerHTML;
+	
+	parsedArray.forEach(function(Id, index,array) {
+	
+		 if (index === array.length - 1) {
+		var idclass= document.getElementById(Id).className;
+		if ( idclass === 'QuestionTextIdSet' || idclass === 'QuestionsGroupIdset' || idclass === 'QuestionChoiceId' ) {
+			attrId = document.getElementById(Id).innerHTML
+		}else if(idclass === 'multipleAnswerorNot'){ 
+			attrId ="";
+			var remove = Id.replace('multipleAnswer_','')
+			Id ='ChoiceCorrectAnswer_'+remove;
+		}else {
+			attrId = document.getElementById(Id).querySelector('.ql-editor').innerHTML;
+		}
 		if(attrId === '<p><br></p>')
 		{
 			scrollToElementWithoutLink(Id);
 			document.getElementById(Id).focus();
+		}else if(attrId == ''){
+			scrollToElementWithoutLink(Id);
+			document.getElementById(Id).focus();
+		}
+
+
+		else{
+			scrollToElementWithoutLink(Id);
+			document.getElementById(Id).focus();
+		}
 		}
       });
 	}
 }
 
 function check_Remove_Empty_Question(IdToRemove) {
-//   console.log('IdToRemove : ', IdToRemove);
-   array_of_Id = []; 
+  console.log('IdToRemove : ', IdToRemove);
 
   var title_id = localStorage.getItem('JSON_FOR_EMPTY_QUESTION');
-//   console.log(title_id)
+
+  array_of_Id=[];
+  var a = IdToRemove;
+var newVariableWithoutNumbers = a.replace(/\d/g, ''); // This removes all digits
+
 
 	var count = "";
 	if(title_id !== null && title_id !== '')
@@ -3035,6 +3461,7 @@ function check_Remove_Empty_Question(IdToRemove) {
 	}
 	else
 	{
+		
 		count = 0
 	}
 	
@@ -3042,7 +3469,12 @@ function check_Remove_Empty_Question(IdToRemove) {
 
 
   const input_text_value = document.getElementById(IdToRemove);
-  const attrId = input_text_value.querySelector('.ql-editor')?.innerHTML;
+
+  if (newVariableWithoutNumbers == 'removeAndCloneQroupQuestion_') {
+	 const attrId= '';
+  } else {
+	 const attrId = input_text_value.querySelector('.ql-editor')?.innerHTML;
+  }
   var parsedArray = [];
   if (count !== 0) {
 
@@ -3065,19 +3497,30 @@ function check_Remove_Empty_Question(IdToRemove) {
 		else{
 			var newArray = parsedArray.push(IdToRemove);
 			const newArrayString = JSON.stringify(newArray);
+			// console.log(newArrayString);
 			collect_Empty_Question_Id(newArrayString);
 		  }
       }
     }
 	const newArrayString = JSON.stringify(parsedArray);
 	collect_Empty_Question_Id(newArrayString);
-
-  } else if(attrId == '<p><br></p>') {
-
+  }  else if(attrId == '<p><br></p>') {
+	// console.log(attrId);
 	var newArray = parsedArray.push(IdToRemove);
 	const newArrayString = JSON.stringify(parsedArray);
+	// console.log(newArrayString);
 	collect_Empty_Question_Id(newArrayString);
   }
+
+  var title_i = localStorage.getItem('JSON_FOR_EMPTY_QUESTION');
+    var parsedArra = JSON.parse(title_i);
+  var againpushlist =[];
+  parsedArra.forEach(function (para) {
+
+	againpushlist.push(para)
+	array_of_Id=againpushlist; 
+	// console.log(array_of_Id);
+  })
 }
 
 
@@ -3174,10 +3617,24 @@ function ReArrangeQuestionsGroup(e){
 
 //function for Add a new secton, questiongroup and Questions to scroll to go that place
 function scrollToElementWithoutLink(elementId) {
+	// console.log(elementId);
+	var modifiedA = elementId.replace(/\d/g, '');
+
     const element = document.getElementById(elementId);
     if (element) {
-        element.scrollIntoView({ behavior: "smooth", block: "center" });
+		element.scrollIntoView({ behavior: "smooth", block: "center" });
+		if (modifiedA == 'removeAndCloneQroupQuestion_') {
+		// alert('Please Choose the Correct Answer')
+		const Swal = require('sweetalert2');
+				Swal.fire({
+    				title            : 'Alert!!!',
+   					text             : 'Please Choose Correct Answer.',
+    				icon             : 'info',
+    				confirmButtonText: 'OK'
+				});
+	}
     }
+	
 }
 
 //Function for Add Group Question inside the Group QUestion Like Question
@@ -3241,7 +3698,6 @@ function addNewGroupQuestions(e, type)
 
 //Function for Add Choice Field in the Choice Question Area
 function ConstructAddNewChoiceID(e){
-   
 	var addChoiceArea = e.target.id;
 	var addChoiceAreaTime = addChoiceArea.split("_")[1];
 	var addChoiceAreaId = 'addChoiceArea_'+addChoiceAreaTime;
@@ -3350,7 +3806,6 @@ function removeQuestionGroup(index) {
 	if (result.isConfirmed) {
 		if (element) {
 			element.remove();
-			console.log("pjm;lkm");
 			json2nav();
 			clearSidebarWrapper();
 			navpane();
@@ -3694,32 +4149,205 @@ setInterval(clearClipboardAttributes, 2000);
 		$('.ql-blank').removeClass('ql-blank');
 	}
    setInterval(removeQlBlank,2000)
-  </script>
-<!-- 
-  <script>
-	quill.on('editor-change', function(eventName, ...args) {
-     if (eventName === 'text-change' && args[1].ops) {
-       args[1].ops.forEach(function(op) {
-         if (op.insert && op.insert.image) {
-           // Handle image insertion
-           var imageUrl = op.insert.image;
-           console.log('Image inserted:', imageUrl);
-         }
-       });
-     }
-   });
-  </script> -->
+</script>
 
 
-<!-- <script>
-function removebold(){
-	var removebold = document.getElementsByClassName('section main-heading')
-	console.log(removebold[0].innerHTML);
-	// removebold[0].innerHTML=removebold[0].innerHTML.replace('<strong>','').replace('</strong>','')
-	// console.log(removebold[0].innerHTML.replace('<strong>','').replace('</strong>',''));
+
+<script>
+function imagebuttonidset() {
 	
+
+	var imagebutton = document.querySelectorAll('.ql-image')
+	// for (var i = 0; i < imageButtonlength; i++) {
+    imagebutton.attr = ('id','ql-image');
+// }
 }
-setInterval(removebold, 1000)
-</script> -->
+
+setInterval(imagebuttonidset,3000)
+  </script>
+
+
+  <script>
+
+	function getidoffulldiv(e){
+		var correct_answer_input= e.querySelectorAll('.correctAnswerBox');
+		// console.log(a);
+		var countforcorrectanswer =correct_answer_input.length;
+
+		correct_answer_input.forEach(function (element,index) {
+			var inde =index + 1;
+        	element.classList.add(`checkbox${inde}`);
+    	});
+
+	var multipleAnswerorNot =e.querySelector('.multipleAnswerorNot')
+		
+		if (multipleAnswerorNot.checked) {
+			correct_answer_input.forEach(function (aDiv) {
+					aDiv.type= 'checkbox';
+					aDiv.classList.remove('radio-button-input')
+				})
+		} else {
+
+				correct_answer_input.forEach(function (aDiv) {
+					aDiv.type= 'checkbox';
+					aDiv.classList.add('radio-button-input');
+					
+				})
+				// a.forEach(function (element, index) {
+        		// 	element.addEventListener('click', function () {
+            	// 		a.forEach(function (otherInput) {
+                // 			if (otherInput !== element) {
+                //     			otherInput.checked = false;
+                // 			}
+            	// 		});
+        		// 	});
+    			// });
+			// }
+		}
+
+	
+	}
+
+  </script>
+
+  <script>
+
+	function multipleAnswerCheck(e) {
+
+			var element = e.id
+			var element2 = e.querySelectorAll('.correctAnswerBox')
+			element2.forEach(function (element2_element) {
+				if (element2_element.checked) {
+
+					var title_id =localStorage.getItem
+					check_Remove_Empty_Question(element)
+
+
+				}
+			})
+
+	}
+	
+  </script>
+
+
+<script>
+	function radioButtonselectOne(params) {
+		// console.log(params);
+		var radioButtons = params.querySelectorAll('.radio-button-input');
+	radioButtons.forEach(function(radioButton) {
+		// console.log(radioButton);
+	  radioButton.addEventListener('change', function() {
+		// Unselect all radio buttons in the same group
+		radioButtons.forEach(function(rb) {
+			// console.log(rb.type);
+		  if (rb.name === radioButton.name && rb !== radioButton) {
+			if (rb.classList[2] == 'radio-button-input') {
+			rb.checked = false;
+		  }
+		}
+		});
+	  });
+	});
+	}
+
+	// setInterval(radioButtonselectOne, 2000)
+  </script>
+
+
+  <script>
+	function resetthe_radio(e){
+		var a =e.querySelector('.multipleAnswerorNot');
+		var inputSlecter = e.querySelectorAll('.correctAnswerBox ')
+		
+		a.addEventListener('change', function (q) {
+
+			var count =0
+			inputSlecter.forEach(function (para,index) {
+				para.checked =false;	
+				
+				if (count == 0) {
+					var title_id = localStorage.getItem('JSON_FOR_EMPTY_QUESTION');
+					var parsedArray = title_id ? JSON.parse(title_id) : [];
+
+					if (!parsedArray.includes(e.id)) {
+    					parsedArray.push(e.id);
+
+    					const arrayString = JSON.stringify(parsedArray);
+						console.log("4");
+
+    					collect_Empty_Question_Id(arrayString);
+						console.log(arrayString);
+    					localStorage.setItem('JSON_FOR_EMPTY_QUESTION', arrayString);
+					} 
+
+				}
+				count=count +1;
+			})
+			
+		})
+	}
+  </script>
+
+
+	<script>
+
+	function findInputByValue(value) {
+			value.forEach(function (param,index) {
+				// console.log(param.correct_answer);
+			var choiceId = param.correct_answer;
+            const inputs = document.getElementsByTagName('input');
+            for (let i = 0; i < inputs.length; i++) {
+
+				// console.log(choiceId);
+                if (inputs[i].value === choiceId) {
+                    // return inputs[i];
+					inputs[i].checked= true
+                }
+            }
+		})
+            // return null; // Return null if no input with the specified value is found
+        }
+
+	</script>
+
+
+	<script>
+
+		function sendthe_full_div_for_multiple_or_not(params) {
+			
+
+			var aa= document.querySelectorAll('.multipleAnswerorNot')
+			if (aa) {
+				aa.forEach(function (pa) {
+					var fullParentDiv = pa.parentNode.parentNode.parentNode.parentNode.parentNode.parentNode
+					getidoffulldiv(fullParentDiv)
+					radioButtonselectOne(fullParentDiv)
+
+				})
+			}
+			
+			// console.log(aa.checked);
+		}
+
+		setInterval(sendthe_full_div_for_multiple_or_not,1000)
+
+	</script>
+
+	<script>
+		function removeDuplicatesparams_in_localstorage() {
+		var existingData = localStorage.getItem('JSON_FOR_EMPTY_QUESTION') ? JSON.parse(localStorage.getItem('JSON_FOR_EMPTY_QUESTION')) : [];
+
+		function removeDuplicates() {
+   			 var uniqueData = [...new Set(existingData)]; // Use a Set to get unique values
+
+    			localStorage.setItem('JSON_FOR_EMPTY_QUESTION', JSON.stringify(uniqueData));
+
+		}
+
+		removeDuplicates();
+		}
+		setInterval(removeDuplicatesparams_in_localstorage,2000)
+	</script>
 </body>
 </html>
diff --git a/html2json.js b/html2json.js
index d0f33b9..5ab33e6 100644
--- a/html2json.js
+++ b/html2json.js
@@ -2,6 +2,7 @@ function html2json() {
     // console.clear();
 
     $.fn.getTextQuestion = function(element_id) {
+        var questionTitleIdSet = document.getElementById('QuestionTextIdSet_'+element_id).value;
         var questionTitle = document.getElementById('textQuestionName_' + element_id).querySelector('.ql-editor').innerHTML;
         var marks = document.getElementById('Text_Question_Marks_Id_' + element_id).value;
         var questionUUID = document.getElementById('Text_Question_UUID_ID_' + element_id).value;
@@ -21,6 +22,7 @@ function html2json() {
         var questionSubType = 'false';
 
         return {
+            "question_id":questionTitleIdSet,
             "question": questionTitle,
             "question_description": questionSubTitle,
             "question_type": questionType,
@@ -34,12 +36,18 @@ function html2json() {
 
     $.fn.getChoiceQuestion = function(element_id) {
 
+        var questionChoiceId = document.getElementById('QuestionChoiceId_' + element_id).value;
         var questionTitle = document.getElementById('textQuestionName_' + element_id).querySelector('.ql-editor').innerHTML;
         var marks = document.getElementById('Choice_Question_Marks_Id_' + element_id).value;
         var questionUUID = document.getElementById('Choice_Question_UUID_ID_' + element_id).value;
         var isMathEnabled = document.getElementById('math_' + element_id).checked;
         var displayMarks = document.getElementById('Choice_Question_Display_Marks_Id_' + element_id).checked;
         var questionSubTitle = "";
+        // var choiceQuestiondiv = document.getElementById('removeAndCloneQroupQuestion_' + element_id)
+        var choiceQuestioncheckInput = document.getElementById('ChoiceCorrectAnswer_' + element_id)
+
+       
+
         if(isMathEnabled == true)
         {
             questionSubTitle = document.getElementById('textQuestionSubtitle_math_' + element_id).value;
@@ -52,7 +60,7 @@ function html2json() {
         // console.log(questionType);
         var questionSubType = document.getElementById('multipleAnswer_' + element_id).checked;
         var answers = [];
-
+        var correct_answers =[];
         //get choice group
 
         //get default choice details
@@ -74,6 +82,12 @@ function html2json() {
             "no": 'a'
         });
 
+        if (choiceQuestioncheckInput.checked) {
+        correct_answers.push([
+            choiceQuestioncheckInput.value
+        ])
+    }
+
         // console.log('before group');
         //get dynamically added choice detailscolor: #999;
         const alphabets = ['b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'];
@@ -84,7 +98,7 @@ function html2json() {
 
             var groupChoiceId = ((element.id).split('_').slice(-1)[0]).split('.').slice(0)[0];
             var individualChoiceId = (element.id).split('.').slice(-1)[0];
-            console.log('newChoiceTextField_'+groupChoiceId+'.'+individualChoiceId);
+            // console.log('newChoiceTextField_'+groupChoiceId+'.'+individualChoiceId);
             
             var choice_math_Enabled = document.getElementById('choice_math_' + groupChoiceId + '.' + individualChoiceId).checked;
             var choice_name = "";
@@ -100,6 +114,7 @@ function html2json() {
             var id = document.getElementById('newChoiceCommentField_' + groupChoiceId + '.' + individualChoiceId);
             var choice_group_dynamic_uuid = document.getElementById('Choice_Group_Dynamic_UUID_ID_' + groupChoiceId + '.' + individualChoiceId).value;
         
+            choiceQuestioncheckInput = document.getElementById('ChoiceCorrectAnswer_'+groupChoiceId + '.' + individualChoiceId)
             answers.push({
                 "choice_name": choice_name,
                 "is_math_enabled": choice_math_Enabled,
@@ -107,11 +122,18 @@ function html2json() {
                 "no":letter
             });
 
+            if (choiceQuestioncheckInput.checked) {
+                correct_answers.push([
+                    choiceQuestioncheckInput.value
+                ])
+            }
+
 
         });
 
 
         return {
+            "questionChoiceId" : questionChoiceId,
             "question": questionTitle,
             "question_description": questionSubTitle,
             "question_type": questionType,
@@ -120,7 +142,8 @@ function html2json() {
             "display_marks": displayMarks,
             "marks":marks,
             "choice_question_uuid":questionUUID,
-            "answers": answers
+            "answers": answers,
+            "correct_answer": correct_answers
         }
     }
 
@@ -179,12 +202,16 @@ function html2json() {
         // console.log(rand_id);
         // console.log('section_title_text_'+rand_id);
         var groupQuestion = {}
+        // console.log(document.getElementById('Questions_Group_id_' + rand_id).value);
+        var question_id = document.getElementById('Questions_Group_id_' + rand_id);
         var group_title = document.getElementById('subSection_title_text_' + rand_id);
         var group_description = document.getElementById('subSection_description_text_' + rand_id);
         var group_marks = document.getElementById('Question_Group_Marks_Id_' + rand_id);
         var group_uuid = document.getElementById('Question_Group_UUID_ID_' + rand_id);
         var group_display_marks = document.getElementById('Question_Group_Display_Marks_Id_' + rand_id);
         var group_attempt_any = document.getElementById('Question_Attempt_Any_Id_' + rand_id);
+        groupQuestion['question_id'] = ((typeof question_id !== null && question_id !== 'undefined') ? (question_id !== null ? question_id.value : null) : null);
+
         groupQuestion['group_title'] = ((typeof group_title !== null && group_title !== 'undefined') ? (group_title !== null ? group_title.querySelector('.ql-editor').innerHTML : null) : null);
         groupQuestion['group_description'] = ((typeof group_description !== null && group_description !== 'undefined') ? (group_description !== null ? group_description.querySelector('.ql-editor').innerHTML : null) : null);
         groupQuestion['group_marks'] = ((typeof group_marks !== null && group_marks !== 'undefined') ? (group_marks !== null ? group_marks.value : null) : null);
diff --git a/imageresize.min.js b/imageresize.min.js
new file mode 100644
index 0000000..804145d
--- /dev/null
+++ b/imageresize.min.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ImageResize=e():t.ImageResize=e()}(this,function(){return function(t){function e(o){if(n[o])return n[o].exports;var r=n[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,e),r.l=!0,r.exports}var n={};return e.m=t,e.c=n,e.i=function(t){return t},e.d=function(t,n,o){e.o(t,n)||Object.defineProperty(t,n,{configurable:!1,enumerable:!0,get:o})},e.n=function(t){var n=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(n,"a",n),n},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=38)}([function(t,e){function n(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}t.exports=n},function(t,e,n){var o=n(22),r="object"==typeof self&&self&&self.Object===Object&&self,i=o||r||Function("return this")();t.exports=i},function(t,e){function n(t){return null!=t&&"object"==typeof t}t.exports=n},function(t,e,n){function o(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var o=t[e];this.set(o[0],o[1])}}var r=n(75),i=n(76),a=n(77),s=n(78),u=n(79);o.prototype.clear=r,o.prototype.delete=i,o.prototype.get=a,o.prototype.has=s,o.prototype.set=u,t.exports=o},function(t,e,n){function o(t,e){for(var n=t.length;n--;)if(r(t[n][0],e))return n;return-1}var r=n(8);t.exports=o},function(t,e,n){function o(t){return null==t?void 0===t?u:s:c&&c in Object(t)?i(t):a(t)}var r=n(16),i=n(64),a=n(87),s="[object Null]",u="[object Undefined]",c=r?r.toStringTag:void 0;t.exports=o},function(t,e,n){function o(t,e){var n=t.__data__;return r(e)?n["string"==typeof e?"string":"hash"]:n.map}var r=n(73);t.exports=o},function(t,e,n){var o=n(11),r=o(Object,"create");t.exports=r},function(t,e){function n(t,e){return t===e||t!==t&&e!==e}t.exports=n},function(t,e,n){"use strict";function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}n.d(e,"a",function(){return r});var r=function t(e){o(this,t),this.onCreate=function(){},this.onDestroy=function(){},this.onUpdate=function(){},this.overlay=e.overlay,this.img=e.img,this.options=e.options,this.requestUpdate=e.onUpdate}},function(t,e,n){function o(t,e,n){"__proto__"==e&&r?r(t,e,{configurable:!0,enumerable:!0,value:n,writable:!0}):t[e]=n}var r=n(21);t.exports=o},function(t,e,n){function o(t,e){var n=i(t,e);return r(n)?n:void 0}var r=n(48),i=n(65);t.exports=o},function(t,e,n){function o(t){return null!=t&&i(t.length)&&!r(t)}var r=n(13),i=n(30);t.exports=o},function(t,e,n){function o(t){if(!i(t))return!1;var e=r(t);return e==s||e==u||e==a||e==c}var r=n(5),i=n(0),a="[object AsyncFunction]",s="[object Function]",u="[object GeneratorFunction]",c="[object Proxy]";t.exports=o},function(t,e){t.exports=function(t){return t.webpackPolyfill||(t.deprecate=function(){},t.paths=[],t.children||(t.children=[]),Object.defineProperty(t,"loaded",{enumerable:!0,get:function(){return t.l}}),Object.defineProperty(t,"id",{enumerable:!0,get:function(){return t.i}}),t.webpackPolyfill=1),t}},function(t,e,n){var o=n(11),r=n(1),i=o(r,"Map");t.exports=i},function(t,e,n){var o=n(1),r=o.Symbol;t.exports=r},function(t,e){function n(t,e,n){switch(n.length){case 0:return t.call(e);case 1:return t.call(e,n[0]);case 2:return t.call(e,n[0],n[1]);case 3:return t.call(e,n[0],n[1],n[2])}return t.apply(e,n)}t.exports=n},function(t,e,n){function o(t,e,n){(void 0===n||i(t[e],n))&&(void 0!==n||e in t)||r(t,e,n)}var r=n(10),i=n(8);t.exports=o},function(t,e,n){function o(t,e,n,l,f){t!==e&&a(e,function(a,c){if(u(a))f||(f=new r),s(t,e,c,n,o,l,f);else{var p=l?l(t[c],a,c+"",t,e,f):void 0;void 0===p&&(p=a),i(t,c,p)}},c)}var r=n(41),i=n(18),a=n(46),s=n(51),u=n(0),c=n(32);t.exports=o},function(t,e,n){function o(t,e){return a(i(t,e,r),t+"")}var r=n(26),i=n(89),a=n(90);t.exports=o},function(t,e,n){var o=n(11),r=function(){try{var t=o(Object,"defineProperty");return t({},"",{}),t}catch(t){}}();t.exports=r},function(t,e,n){(function(e){var n="object"==typeof e&&e&&e.Object===Object&&e;t.exports=n}).call(e,n(107))},function(t,e,n){var o=n(88),r=o(Object.getPrototypeOf,Object);t.exports=r},function(t,e){function n(t,e){return!!(e=null==e?o:e)&&("number"==typeof t||r.test(t))&&t>-1&&t%1==0&&t<e}var o=9007199254740991,r=/^(?:0|[1-9]\d*)$/;t.exports=n},function(t,e){function n(t){var e=t&&t.constructor;return t===("function"==typeof e&&e.prototype||o)}var o=Object.prototype;t.exports=n},function(t,e){function n(t){return t}t.exports=n},function(t,e,n){var o=n(47),r=n(2),i=Object.prototype,a=i.hasOwnProperty,s=i.propertyIsEnumerable,u=o(function(){return arguments}())?o:function(t){return r(t)&&a.call(t,"callee")&&!s.call(t,"callee")};t.exports=u},function(t,e){var n=Array.isArray;t.exports=n},function(t,e,n){(function(t){var o=n(1),r=n(102),i="object"==typeof e&&e&&!e.nodeType&&e,a=i&&"object"==typeof t&&t&&!t.nodeType&&t,s=a&&a.exports===i,u=s?o.Buffer:void 0,c=u?u.isBuffer:void 0,l=c||r;t.exports=l}).call(e,n(14)(t))},function(t,e){function n(t){return"number"==typeof t&&t>-1&&t%1==0&&t<=o}var o=9007199254740991;t.exports=n},function(t,e,n){var o=n(49),r=n(54),i=n(86),a=i&&i.isTypedArray,s=a?r(a):o;t.exports=s},function(t,e,n){function o(t){return a(t)?r(t,!0):i(t)}var r=n(43),i=n(50),a=n(12);t.exports=o},function(t,e,n){"use strict";e.a={modules:["DisplaySize","Toolbar","Resize"],overlayStyles:{position:"absolute",boxSizing:"border-box",border:"1px dashed #444"},handleStyles:{position:"absolute",height:"12px",width:"12px",backgroundColor:"white",border:"1px solid #777",boxSizing:"border-box",opacity:"0.80"},displayStyles:{position:"absolute",font:"12px/1.0 Arial, Helvetica, sans-serif",padding:"4px 8px",textAlign:"center",backgroundColor:"white",color:"#333",border:"1px solid #777",boxSizing:"border-box",opacity:"0.80",cursor:"default"},toolbarStyles:{position:"absolute",top:"-12px",right:"0",left:"0",height:"0",minWidth:"100px",font:"12px/1.0 Arial, Helvetica, sans-serif",textAlign:"center",color:"#333",boxSizing:"border-box",cursor:"default"},toolbarButtonStyles:{display:"inline-block",width:"24px",height:"24px",background:"white",border:"1px solid #999",verticalAlign:"middle"},toolbarButtonSvgStyles:{fill:"#444",stroke:"#444",strokeWidth:"2"}}},function(t,e,n){"use strict";function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function r(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}var a=n(9);n.d(e,"a",function(){return s});var s=function(t){function e(){var t,n,i,a;o(this,e);for(var s=arguments.length,u=Array(s),c=0;c<s;c++)u[c]=arguments[c];return n=i=r(this,(t=e.__proto__||Object.getPrototypeOf(e)).call.apply(t,[this].concat(u))),i.onCreate=function(){i.display=document.createElement("div"),Object.assign(i.display.style,i.options.displayStyles),i.overlay.appendChild(i.display)},i.onDestroy=function(){},i.onUpdate=function(){if(i.display&&i.img){var t=i.getCurrentSize();if(i.display.innerHTML=t.join(" &times; "),t[0]>120&&t[1]>30)Object.assign(i.display.style,{right:"4px",bottom:"4px",left:"auto"});else if("right"==i.img.style.float){var e=i.display.getBoundingClientRect();Object.assign(i.display.style,{right:"auto",bottom:"-"+(e.height+4)+"px",left:"-"+(e.width+4)+"px"})}else{var n=i.display.getBoundingClientRect();Object.assign(i.display.style,{right:"-"+(n.width+4)+"px",bottom:"-"+(n.height+4)+"px",left:"auto"})}}},i.getCurrentSize=function(){return[i.img.width,Math.round(i.img.width/i.img.naturalWidth*i.img.naturalHeight)]},a=n,r(i,a)}return i(e,t),e}(a.a)},function(t,e,n){"use strict";function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function r(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}var a=n(9);n.d(e,"a",function(){return s});var s=function(t){function e(){var t,n,i,a;o(this,e);for(var s=arguments.length,u=Array(s),c=0;c<s;c++)u[c]=arguments[c];return n=i=r(this,(t=e.__proto__||Object.getPrototypeOf(e)).call.apply(t,[this].concat(u))),i.onCreate=function(){i.boxes=[],i.addBox("nwse-resize"),i.addBox("nesw-resize"),i.addBox("nwse-resize"),i.addBox("nesw-resize"),i.positionBoxes()},i.onDestroy=function(){i.setCursor("")},i.positionBoxes=function(){var t=-parseFloat(i.options.handleStyles.width)/2+"px",e=-parseFloat(i.options.handleStyles.height)/2+"px";[{left:t,top:e},{right:t,top:e},{right:t,bottom:e},{left:t,bottom:e}].forEach(function(t,e){Object.assign(i.boxes[e].style,t)})},i.addBox=function(t){var e=document.createElement("div");Object.assign(e.style,i.options.handleStyles),e.style.cursor=t,e.style.width=i.options.handleStyles.width+"px",e.style.height=i.options.handleStyles.height+"px",e.addEventListener("mousedown",i.handleMousedown,!1),i.overlay.appendChild(e),i.boxes.push(e)},i.handleMousedown=function(t){i.dragBox=t.target,i.dragStartX=t.clientX,i.preDragWidth=i.img.width||i.img.naturalWidth,i.setCursor(i.dragBox.style.cursor),document.addEventListener("mousemove",i.handleDrag,!1),document.addEventListener("mouseup",i.handleMouseup,!1)},i.handleMouseup=function(){i.setCursor(""),document.removeEventListener("mousemove",i.handleDrag),document.removeEventListener("mouseup",i.handleMouseup)},i.handleDrag=function(t){if(i.img){var e=t.clientX-i.dragStartX;i.dragBox===i.boxes[0]||i.dragBox===i.boxes[3]?i.img.width=Math.round(i.preDragWidth-e):i.img.width=Math.round(i.preDragWidth+e),i.requestUpdate()}},i.setCursor=function(t){[document.body,i.img].forEach(function(e){e.style.cursor=t})},a=n,r(i,a)}return i(e,t),e}(a.a)},function(t,e,n){"use strict";function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function r(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}function i(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}var a=n(105),s=n.n(a),u=n(104),c=n.n(u),l=n(106),f=n.n(l),p=n(9);n.d(e,"a",function(){return b});var d=window.Quill.imports.parchment,h=new d.Attributor.Style("float","float"),y=new d.Attributor.Style("margin","margin"),v=new d.Attributor.Style("display","display"),b=function(t){function e(){var t,n,i,a;o(this,e);for(var u=arguments.length,l=Array(u),p=0;p<u;p++)l[p]=arguments[p];return n=i=r(this,(t=e.__proto__||Object.getPrototypeOf(e)).call.apply(t,[this].concat(l))),i.onCreate=function(){i.toolbar=document.createElement("div"),Object.assign(i.toolbar.style,i.options.toolbarStyles),i.overlay.appendChild(i.toolbar),i._defineAlignments(),i._addToolbarButtons()},i.onDestroy=function(){},i.onUpdate=function(){},i._defineAlignments=function(){i.alignments=[{icon:s.a,apply:function(){v.add(i.img,"inline"),h.add(i.img,"left"),y.add(i.img,"0 1em 1em 0")},isApplied:function(){return"left"==h.value(i.img)}},{icon:c.a,apply:function(){v.add(i.img,"block"),h.remove(i.img),y.add(i.img,"auto")},isApplied:function(){return"auto"==y.value(i.img)}},{icon:f.a,apply:function(){v.add(i.img,"inline"),h.add(i.img,"right"),y.add(i.img,"0 0 1em 1em")},isApplied:function(){return"right"==h.value(i.img)}}]},i._addToolbarButtons=function(){var t=[];i.alignments.forEach(function(e,n){var o=document.createElement("span");t.push(o),o.innerHTML=e.icon,o.addEventListener("click",function(){t.forEach(function(t){return t.style.filter=""}),e.isApplied()?(h.remove(i.img),y.remove(i.img),v.remove(i.img)):(i._selectButton(o),e.apply()),i.requestUpdate()}),Object.assign(o.style,i.options.toolbarButtonStyles),n>0&&(o.style.borderLeftWidth="0"),Object.assign(o.children[0].style,i.options.toolbarButtonSvgStyles),e.isApplied()&&i._selectButton(o),i.toolbar.appendChild(o)})},i._selectButton=function(t){t.style.filter="invert(20%)"},a=n,r(i,a)}return i(e,t),e}(p.a)},function(t,e,n){var o=n(17),r=n(20),i=n(63),a=n(101),s=r(function(t){return t.push(void 0,i),o(a,void 0,t)});t.exports=s},function(t,e,n){"use strict";function o(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var r=n(37),i=n.n(r),a=n(33),s=n(34),u=n(36),c=n(35),l={DisplaySize:s.a,Toolbar:u.a,Resize:c.a},f=function t(e){var n=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};o(this,t),this.initializeModules=function(){n.removeModules(),n.modules=n.moduleClasses.map(function(t){return new(l[t]||t)(n)}),n.modules.forEach(function(t){t.onCreate()}),n.onUpdate()},this.onUpdate=function(){n.repositionElements(),n.modules.forEach(function(t){t.onUpdate()})},this.removeModules=function(){n.modules.forEach(function(t){t.onDestroy()}),n.modules=[]},this.handleClick=function(t){if(t.target&&t.target.tagName&&"IMG"===t.target.tagName.toUpperCase()){if(n.img===t.target)return;n.img&&n.hide(),n.show(t.target)}else n.img&&n.hide()},this.show=function(t){n.img=t,n.showOverlay(),n.initializeModules()},this.showOverlay=function(){n.overlay&&n.hideOverlay(),n.quill.setSelection(null),n.setUserSelect("none"),document.addEventListener("keyup",n.checkImage,!0),n.quill.root.addEventListener("input",n.checkImage,!0),n.overlay=document.createElement("div"),Object.assign(n.overlay.style,n.options.overlayStyles),n.quill.root.parentNode.appendChild(n.overlay),n.repositionElements()},this.hideOverlay=function(){n.overlay&&(n.quill.root.parentNode.removeChild(n.overlay),n.overlay=void 0,document.removeEventListener("keyup",n.checkImage),n.quill.root.removeEventListener("input",n.checkImage),n.setUserSelect(""))},this.repositionElements=function(){if(n.overlay&&n.img){var t=n.quill.root.parentNode,e=n.img.getBoundingClientRect(),o=t.getBoundingClientRect();Object.assign(n.overlay.style,{left:e.left-o.left-1+t.scrollLeft+"px",top:e.top-o.top+t.scrollTop+"px",width:e.width+"px",height:e.height+"px"})}},this.hide=function(){n.hideOverlay(),n.removeModules(),n.img=void 0},this.setUserSelect=function(t){["userSelect","mozUserSelect","webkitUserSelect","msUserSelect"].forEach(function(e){n.quill.root.style[e]=t,document.documentElement.style[e]=t})},this.checkImage=function(t){n.img&&(46!=t.keyCode&&8!=t.keyCode||window.Quill.find(n.img).deleteAt(0),n.hide())},this.quill=e;var s=!1;r.modules&&(s=r.modules.slice()),this.options=i()({},r,a.a),s!==!1&&(this.options.modules=s),document.execCommand("enableObjectResizing",!1,"false"),this.quill.root.addEventListener("click",this.handleClick,!1),this.quill.root.parentNode.style.position=this.quill.root.parentNode.style.position||"relative",this.moduleClasses=this.options.modules,console.log("this.options.modules",this.options.modules),this.modules=[]};e.default=f,window.Quill&&window.Quill.register("modules/imageResize",f)},function(t,e,n){function o(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var o=t[e];this.set(o[0],o[1])}}var r=n(66),i=n(67),a=n(68),s=n(69),u=n(70);o.prototype.clear=r,o.prototype.delete=i,o.prototype.get=a,o.prototype.has=s,o.prototype.set=u,t.exports=o},function(t,e,n){function o(t){var e=-1,n=null==t?0:t.length;for(this.clear();++e<n;){var o=t[e];this.set(o[0],o[1])}}var r=n(80),i=n(81),a=n(82),s=n(83),u=n(84);o.prototype.clear=r,o.prototype.delete=i,o.prototype.get=a,o.prototype.has=s,o.prototype.set=u,t.exports=o},function(t,e,n){function o(t){var e=this.__data__=new r(t);this.size=e.size}var r=n(3),i=n(92),a=n(93),s=n(94),u=n(95),c=n(96);o.prototype.clear=i,o.prototype.delete=a,o.prototype.get=s,o.prototype.has=u,o.prototype.set=c,t.exports=o},function(t,e,n){var o=n(1),r=o.Uint8Array;t.exports=r},function(t,e,n){function o(t,e){var n=a(t),o=!n&&i(t),l=!n&&!o&&s(t),p=!n&&!o&&!l&&c(t),d=n||o||l||p,h=d?r(t.length,String):[],y=h.length;for(var v in t)!e&&!f.call(t,v)||d&&("length"==v||l&&("offset"==v||"parent"==v)||p&&("buffer"==v||"byteLength"==v||"byteOffset"==v)||u(v,y))||h.push(v);return h}var r=n(53),i=n(27),a=n(28),s=n(29),u=n(24),c=n(31),l=Object.prototype,f=l.hasOwnProperty;t.exports=o},function(t,e,n){function o(t,e,n){var o=t[e];s.call(t,e)&&i(o,n)&&(void 0!==n||e in t)||r(t,e,n)}var r=n(10),i=n(8),a=Object.prototype,s=a.hasOwnProperty;t.exports=o},function(t,e,n){var o=n(0),r=Object.create,i=function(){function t(){}return function(e){if(!o(e))return{};if(r)return r(e);t.prototype=e;var n=new t;return t.prototype=void 0,n}}();t.exports=i},function(t,e,n){var o=n(62),r=o();t.exports=r},function(t,e,n){function o(t){return i(t)&&r(t)==a}var r=n(5),i=n(2),a="[object Arguments]";t.exports=o},function(t,e,n){function o(t){return!(!a(t)||i(t))&&(r(t)?d:u).test(s(t))}var r=n(13),i=n(74),a=n(0),s=n(97),u=/^\[object .+?Constructor\]$/,c=Function.prototype,l=Object.prototype,f=c.toString,p=l.hasOwnProperty,d=RegExp("^"+f.call(p).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");t.exports=o},function(t,e,n){function o(t){return a(t)&&i(t.length)&&!!s[r(t)]}var r=n(5),i=n(30),a=n(2),s={};s["[object Float32Array]"]=s["[object Float64Array]"]=s["[object Int8Array]"]=s["[object Int16Array]"]=s["[object Int32Array]"]=s["[object Uint8Array]"]=s["[object Uint8ClampedArray]"]=s["[object Uint16Array]"]=s["[object Uint32Array]"]=!0,s["[object Arguments]"]=s["[object Array]"]=s["[object ArrayBuffer]"]=s["[object Boolean]"]=s["[object DataView]"]=s["[object Date]"]=s["[object Error]"]=s["[object Function]"]=s["[object Map]"]=s["[object Number]"]=s["[object Object]"]=s["[object RegExp]"]=s["[object Set]"]=s["[object String]"]=s["[object WeakMap]"]=!1,t.exports=o},function(t,e,n){function o(t){if(!r(t))return a(t);var e=i(t),n=[];for(var o in t)("constructor"!=o||!e&&u.call(t,o))&&n.push(o);return n}var r=n(0),i=n(25),a=n(85),s=Object.prototype,u=s.hasOwnProperty;t.exports=o},function(t,e,n){function o(t,e,n,o,g,x,m){var _=t[n],j=e[n],w=m.get(j);if(w)return void r(t,n,w);var O=x?x(_,j,n+"",t,e,m):void 0,S=void 0===O;if(S){var E=l(j),A=!E&&p(j),z=!E&&!A&&v(j);O=j,E||A||z?l(_)?O=_:f(_)?O=s(_):A?(S=!1,O=i(j,!0)):z?(S=!1,O=a(j,!0)):O=[]:y(j)||c(j)?(O=_,c(_)?O=b(_):(!h(_)||o&&d(_))&&(O=u(j))):S=!1}S&&(m.set(j,O),g(O,j,o,x,m),m.delete(j)),r(t,n,O)}var r=n(18),i=n(56),a=n(57),s=n(58),u=n(71),c=n(27),l=n(28),f=n(99),p=n(29),d=n(13),h=n(0),y=n(100),v=n(31),b=n(103);t.exports=o},function(t,e,n){var o=n(98),r=n(21),i=n(26),a=r?function(t,e){return r(t,"toString",{configurable:!0,enumerable:!1,value:o(e),writable:!0})}:i;t.exports=a},function(t,e){function n(t,e){for(var n=-1,o=Array(t);++n<t;)o[n]=e(n);return o}t.exports=n},function(t,e){function n(t){return function(e){return t(e)}}t.exports=n},function(t,e,n){function o(t){var e=new t.constructor(t.byteLength);return new r(e).set(new r(t)),e}var r=n(42);t.exports=o},function(t,e,n){(function(t){function o(t,e){if(e)return t.slice();var n=t.length,o=c?c(n):new t.constructor(n);return t.copy(o),o}var r=n(1),i="object"==typeof e&&e&&!e.nodeType&&e,a=i&&"object"==typeof t&&t&&!t.nodeType&&t,s=a&&a.exports===i,u=s?r.Buffer:void 0,c=u?u.allocUnsafe:void 0;t.exports=o}).call(e,n(14)(t))},function(t,e,n){function o(t,e){var n=e?r(t.buffer):t.buffer;return new t.constructor(n,t.byteOffset,t.length)}var r=n(55);t.exports=o},function(t,e){function n(t,e){var n=-1,o=t.length;for(e||(e=Array(o));++n<o;)e[n]=t[n];return e}t.exports=n},function(t,e,n){function o(t,e,n,o){var a=!n;n||(n={});for(var s=-1,u=e.length;++s<u;){var c=e[s],l=o?o(n[c],t[c],c,n,t):void 0;void 0===l&&(l=t[c]),a?i(n,c,l):r(n,c,l)}return n}var r=n(44),i=n(10);t.exports=o},function(t,e,n){var o=n(1),r=o["__core-js_shared__"];t.exports=r},function(t,e,n){function o(t){return r(function(e,n){var o=-1,r=n.length,a=r>1?n[r-1]:void 0,s=r>2?n[2]:void 0;for(a=t.length>3&&"function"==typeof a?(r--,a):void 0,s&&i(n[0],n[1],s)&&(a=r<3?void 0:a,r=1),e=Object(e);++o<r;){var u=n[o];u&&t(e,u,o,a)}return e})}var r=n(20),i=n(72);t.exports=o},function(t,e){function n(t){return function(e,n,o){for(var r=-1,i=Object(e),a=o(e),s=a.length;s--;){var u=a[t?s:++r];if(n(i[u],u,i)===!1)break}return e}}t.exports=n},function(t,e,n){function o(t,e,n,a,s,u){return i(t)&&i(e)&&(u.set(e,t),r(t,e,void 0,o,u),u.delete(e)),t}var r=n(19),i=n(0);t.exports=o},function(t,e,n){function o(t){var e=a.call(t,u),n=t[u];try{t[u]=void 0}catch(t){}var o=s.call(t);return e?t[u]=n:delete t[u],o}var r=n(16),i=Object.prototype,a=i.hasOwnProperty,s=i.toString,u=r?r.toStringTag:void 0;t.exports=o},function(t,e){function n(t,e){return null==t?void 0:t[e]}t.exports=n},function(t,e,n){function o(){this.__data__=r?r(null):{},this.size=0}var r=n(7);t.exports=o},function(t,e){function n(t){var e=this.has(t)&&delete this.__data__[t];return this.size-=e?1:0,e}t.exports=n},function(t,e,n){function o(t){var e=this.__data__;if(r){var n=e[t];return n===i?void 0:n}return s.call(e,t)?e[t]:void 0}var r=n(7),i="__lodash_hash_undefined__",a=Object.prototype,s=a.hasOwnProperty;t.exports=o},function(t,e,n){function o(t){var e=this.__data__;return r?void 0!==e[t]:a.call(e,t)}var r=n(7),i=Object.prototype,a=i.hasOwnProperty;t.exports=o},function(t,e,n){function o(t,e){var n=this.__data__;return this.size+=this.has(t)?0:1,n[t]=r&&void 0===e?i:e,this}var r=n(7),i="__lodash_hash_undefined__";t.exports=o},function(t,e,n){function o(t){return"function"!=typeof t.constructor||a(t)?{}:r(i(t))}var r=n(45),i=n(23),a=n(25);t.exports=o},function(t,e,n){function o(t,e,n){if(!s(n))return!1;var o=typeof e;return!!("number"==o?i(n)&&a(e,n.length):"string"==o&&e in n)&&r(n[e],t)}var r=n(8),i=n(12),a=n(24),s=n(0);t.exports=o},function(t,e){function n(t){var e=typeof t;return"string"==e||"number"==e||"symbol"==e||"boolean"==e?"__proto__"!==t:null===t}t.exports=n},function(t,e,n){function o(t){return!!i&&i in t}var r=n(60),i=function(){var t=/[^.]+$/.exec(r&&r.keys&&r.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}();t.exports=o},function(t,e){function n(){this.__data__=[],this.size=0}t.exports=n},function(t,e,n){function o(t){var e=this.__data__,n=r(e,t);return!(n<0)&&(n==e.length-1?e.pop():a.call(e,n,1),--this.size,!0)}var r=n(4),i=Array.prototype,a=i.splice;t.exports=o},function(t,e,n){function o(t){var e=this.__data__,n=r(e,t);return n<0?void 0:e[n][1]}var r=n(4);t.exports=o},function(t,e,n){function o(t){return r(this.__data__,t)>-1}var r=n(4);t.exports=o},function(t,e,n){function o(t,e){var n=this.__data__,o=r(n,t);return o<0?(++this.size,n.push([t,e])):n[o][1]=e,this}var r=n(4);t.exports=o},function(t,e,n){function o(){this.size=0,this.__data__={hash:new r,map:new(a||i),string:new r}}var r=n(39),i=n(3),a=n(15);t.exports=o},function(t,e,n){function o(t){var e=r(this,t).delete(t);return this.size-=e?1:0,e}var r=n(6);t.exports=o},function(t,e,n){function o(t){return r(this,t).get(t)}var r=n(6);t.exports=o},function(t,e,n){function o(t){return r(this,t).has(t)}var r=n(6);t.exports=o},function(t,e,n){function o(t,e){var n=r(this,t),o=n.size;return n.set(t,e),this.size+=n.size==o?0:1,this}var r=n(6);t.exports=o},function(t,e){function n(t){var e=[];if(null!=t)for(var n in Object(t))e.push(n);return e}t.exports=n},function(t,e,n){(function(t){var o=n(22),r="object"==typeof e&&e&&!e.nodeType&&e,i=r&&"object"==typeof t&&t&&!t.nodeType&&t,a=i&&i.exports===r,s=a&&o.process,u=function(){try{return s&&s.binding&&s.binding("util")}catch(t){}}();t.exports=u}).call(e,n(14)(t))},function(t,e){function n(t){return r.call(t)}var o=Object.prototype,r=o.toString;t.exports=n},function(t,e){function n(t,e){return function(n){return t(e(n))}}t.exports=n},function(t,e,n){function o(t,e,n){return e=i(void 0===e?t.length-1:e,0),function(){for(var o=arguments,a=-1,s=i(o.length-e,0),u=Array(s);++a<s;)u[a]=o[e+a];a=-1;for(var c=Array(e+1);++a<e;)c[a]=o[a];return c[e]=n(u),r(t,this,c)}}var r=n(17),i=Math.max;t.exports=o},function(t,e,n){var o=n(52),r=n(91),i=r(o);t.exports=i},function(t,e){function n(t){var e=0,n=0;return function(){var a=i(),s=r-(a-n);if(n=a,s>0){if(++e>=o)return arguments[0]}else e=0;return t.apply(void 0,arguments)}}var o=800,r=16,i=Date.now;t.exports=n},function(t,e,n){function o(){this.__data__=new r,this.size=0}var r=n(3);t.exports=o},function(t,e){function n(t){var e=this.__data__,n=e.delete(t);return this.size=e.size,n}t.exports=n},function(t,e){function n(t){return this.__data__.get(t)}t.exports=n},function(t,e){function n(t){return this.__data__.has(t)}t.exports=n},function(t,e,n){function o(t,e){var n=this.__data__;if(n instanceof r){var o=n.__data__;if(!i||o.length<s-1)return o.push([t,e]),this.size=++n.size,this;n=this.__data__=new a(o)}return n.set(t,e),this.size=n.size,this}var r=n(3),i=n(15),a=n(40),s=200;t.exports=o},function(t,e){function n(t){if(null!=t){try{return r.call(t)}catch(t){}try{return t+""}catch(t){}}return""}var o=Function.prototype,r=o.toString;t.exports=n},function(t,e){function n(t){return function(){return t}}t.exports=n},function(t,e,n){function o(t){return i(t)&&r(t)}var r=n(12),i=n(2);t.exports=o},function(t,e,n){function o(t){if(!a(t)||r(t)!=s)return!1;var e=i(t);if(null===e)return!0;var n=f.call(e,"constructor")&&e.constructor;return"function"==typeof n&&n instanceof n&&l.call(n)==p}var r=n(5),i=n(23),a=n(2),s="[object Object]",u=Function.prototype,c=Object.prototype,l=u.toString,f=c.hasOwnProperty,p=l.call(Object);t.exports=o},function(t,e,n){var o=n(19),r=n(61),i=r(function(t,e,n,r){o(t,e,n,r)});t.exports=i},function(t,e){function n(){return!1}t.exports=n},function(t,e,n){function o(t){return r(t,i(t))}var r=n(59),i=n(32);t.exports=o},function(t,e){t.exports='<svg viewbox="0 0 18 18">\n  <line class="ql-stroke" x1="15" x2="3" y1="9" y2="9"></line>\n  <line class="ql-stroke" x1="14" x2="4" y1="14" y2="14"></line>\n  <line class="ql-stroke" x1="12" x2="6" y1="4" y2="4"></line>\n</svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18">\n  <line class="ql-stroke" x1="3" x2="15" y1="9" y2="9"></line>\n  <line class="ql-stroke" x1="3" x2="13" y1="14" y2="14"></line>\n  <line class="ql-stroke" x1="3" x2="9" y1="4" y2="4"></line>\n</svg>'},function(t,e){t.exports='<svg viewbox="0 0 18 18">\n  <line class="ql-stroke" x1="15" x2="3" y1="9" y2="9"></line>\n  <line class="ql-stroke" x1="15" x2="5" y1="14" y2="14"></line>\n  <line class="ql-stroke" x1="15" x2="9" y1="4" y2="4"></line>\n</svg>'},function(t,e){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(t){"object"==typeof window&&(n=window)}t.exports=n}])});
\ No newline at end of file
diff --git a/json2html.js b/json2html.js
index aebdf74..5d3c4ba 100644
--- a/json2html.js
+++ b/json2html.js
@@ -12,7 +12,6 @@ function jsonToHtml(jsonData) {
 	
 	if(jsonData == "" || jsonData == null)
 	{
-
 	document.getElementById('Question_title').querySelector('.ql-editor').innerHTML = "";
 	document.getElementById('Question_description').querySelector('.ql-editor').innerHTML = "";
 	document.getElementById('Max_Marks').value = "";
@@ -92,6 +91,7 @@ function jsonToHtml(jsonData) {
 
 function QuestionsForEach(Question, questionAreaId, questionRandomNo){
 
+// console.log(Question);
     var questionTypeFormets = "";		
 	if(Question.question_type)
 	{
@@ -101,6 +101,7 @@ function QuestionsForEach(Question, questionAreaId, questionRandomNo){
 	{
 		questionTypeFormets ='question_group';
 	}
+	var questionId           = Question.question_id
 	var questionTitle        = Question.question;
 	var questionDescription  = Question.question_description;
 	var questionType         = questionTypeFormets;
@@ -110,12 +111,13 @@ function QuestionsForEach(Question, questionAreaId, questionRandomNo){
 	var questionUUID         = Question.attributes.Id;
 	var questionDisplayMarks = Question.display_marks;
 	var Choice               = Question.answers;
+		
 	
-
 	var QuestionObj = {         
 		"question_area_id"     :questionAreaId,
 		'questionRandomNo'     :questionRandomNo,
 
+		'questionId'           :Question.question_id,
 		'questionTitle'        :Question.question,
 		'questionDescription'  :Question.question_description,
 		'questionType'         :questionTypeFormets,
@@ -125,7 +127,7 @@ function QuestionsForEach(Question, questionAreaId, questionRandomNo){
 		'questionUUID'         :Question.attributes.Id,
 		'questionDisplayMarks' :Question.display_marks,
 		'Choice'               :Question.answers,
-	}
+			}
 				
 											
 	if(questionType == 'text')
@@ -134,10 +136,9 @@ function QuestionsForEach(Question, questionAreaId, questionRandomNo){
 		// textQuestion(false, false, false, questionTitle, questionDescription, questionSubType, mathEnabled, questionAreaId, questionRandomNo, questionMarks, questionUUID, questionDisplayMarks);
 	}
 	else if (questionType == 'group')
-	{  							
-		groupQuestion(false, false, false, questionTitle, questionDescription, questionType, questionSubType, mathEnabled, Choice, questionAreaId, questionRandomNo, questionMarks, questionUUID, questionDisplayMarks,);
+	{  				
+		groupQuestion(false, false, false, questionTitle, questionDescription, questionType, questionSubType, mathEnabled, Choice, questionAreaId, questionRandomNo, questionMarks, questionUUID, questionDisplayMarks,questionId);
 		// groupQuestion(QuestionObj);
-
 		Choice = Choice.slice(1);
 		Choice.forEach(function(choicenames, index) {
 		var choiceName = choicenames.choice_name;
@@ -150,7 +151,6 @@ function QuestionsForEach(Question, questionAreaId, questionRandomNo){
 	}
 	else if (questionType == 'question_group')
 	{   
-		
 		generateGroupQuestion(Question, questionAreaId, questionRandomNo);
 		
 	}
@@ -161,12 +161,12 @@ function QuestionsForEach(Question, questionAreaId, questionRandomNo){
 //function for Generate QuestionGroup 
 function generateGroupQuestion(Question, questionAreaId, questionRandomNo)
 {
-   
 		var idObj = {"section_question_area_id":questionAreaId, 'question_group_obj': Question, 'questions_randon_id':questionRandomNo};
 
 		addQuestionGroup(idObj);
-		
 		Question.questions.forEach(function(GroupQuestions, index) {
+			// Question.forEach(function(GroupQuestions, index) {
+
 			const QuestionGroupRandomNo = Date.now();
 			var questionGroupAreaId = 'group_question_area_'+questionRandomNo;
 			QuestionsForEach(GroupQuestions, questionGroupAreaId, QuestionGroupRandomNo);
diff --git a/json2xml.js b/json2xml.js
index 9a1060e..1376640 100644
--- a/json2xml.js
+++ b/json2xml.js
@@ -1,8 +1,7 @@
 function json2xml() {
     // console.clear();
     var obj = localStorage.getItem("json");
-    // console.log(obj);
-    // console.log('***********************************************************');
+        // console.log('***********************************************************');
 
     function createXMLDocument(namespace = null) {
         if (typeof document.implementation.createDocument === 'function') {
@@ -66,6 +65,15 @@ function json2xml() {
             'type': (question['question_type'] == 'text' ? 'Descriptive' : 'Mcq')
             
         }, '');
+
+        if (question['question_id'] !== undefined) {
+            var questionChoiceId =createElementWithText(doc, element, 'Text', question['question_id'])
+        } else {
+            // If question['question_id'] is undefined, create a new variable
+            var questionIdSet = createElementWithText(doc, element , 'Text', question['questionChoiceId'])
+        }
+
+
         var questionTitle = createElementWithText(doc, element, 'Text', question['question']);
         var questionDesc = createElementWithText(doc, element, 'Subtext', question['question_description']);
         var marks = createElementWithText(doc, element, 'Marks', question['marks']);
@@ -75,14 +83,14 @@ function json2xml() {
         if (question['question_type'] == 'group') {
             var hasMultipleAnswers = createElementWithText(doc, element, 'HasMultipleAnswers', (question['question_sub_type'] === true ? 'true' : 'false'), {});
             var choicesElement = createElementWithText(doc, element, 'Choices', '', {});
-            for (choice in question['answers']) {
+                        for (choice in question['answers']) {
                 var choiceElement = createElementWithText(doc, choicesElement, 'Choice', '', {});
-                var id = createElementWithText(doc, choiceElement, 'Id', question['answers'][choice]['choice_uuid'], {});
+                                var id = createElementWithText(doc, choiceElement, 'Id', question['answers'][choice]['choice_uuid'], {});
                 var no = createElementWithText(doc, choiceElement, 'No', question['answers'][choice]['no'], {});
                 var text = createElementWithText(doc, choiceElement, 'Text', question['answers'][choice]['choice_name'], {});
                 var is_math_enabled = createElementWithText(doc, choiceElement, 'Math', (question['answers'][choice]['is_math_enabled'] === true ? 'true' : 'false'), {});
 
-            }
+                        }
             // choicesElement.appendChild();
         }
 
@@ -112,7 +120,7 @@ function json2xml() {
     //     'No': singleQuestion['group_title'],
     //     'Order': 0
     // });
-
+    var groupQuestionId = createElementWithText(doc, element, 'Text', singleQuestion['group_id']);
     var groupQuestionTitle = createElementWithText(doc, element, 'Text', singleQuestion['group_title']);
     var groupQuestionDesc = createElementWithText(doc, element, 'Subtext', singleQuestion['group_description']);
     var groupQuestionMarks = createElementWithText(doc, element, 'Marks', singleQuestion['group_marks']);
@@ -151,6 +159,7 @@ function json2xml() {
 
     //start of the busi logic
     questionPaper = JSON.parse(obj);
+    // console.log(questionPaper);
     var ns1 = 'http://www.w3.org/2001/XMLSchema';
     var xmlDoc = createXMLDocument(namespace = ns1);
     var rootElement = xmlDoc.createElement('QuestionPaper');
@@ -177,7 +186,7 @@ function json2xml() {
         //create section related xml nodes
         var tempSection = questionPaper['sections'][section];
 
-        console.log(tempSection);
+        // console.log(tempSection);
 
         var sectionElement = createElementWithText(xmlDoc, rootItemsElement, 'Question', '', {
             'xsi:type': 'QuestionPaperSection',
@@ -199,15 +208,15 @@ function json2xml() {
         if (tempSection['questions'].length != 0) {
             for (question in tempSection['questions']) {
                 var singleQuestion = tempSection['questions'][question];
-                if (singleQuestion.hasOwnProperty('question_type')) // normal questions
+                                if (singleQuestion.hasOwnProperty('question_type')) // normal questions
                 {
                     var singleQuestionElement = getXMLNodesOfQuestionData(singleQuestion);
-                    //attach each single question into section item node
+                                        //attach each single question into section item node
                     sectionItemElement.appendChild(singleQuestionElement);
                 } else // handle question group
                 {
                     var groupQuestionElement =  getXMLNodesOfGroupQuestionData(singleQuestion);
-                    sectionItemElement.appendChild(groupQuestionElement);
+                                        sectionItemElement.appendChild(groupQuestionElement);
                 }
 
             }
diff --git a/package-lock.json b/package-lock.json
index 884dd68..e66084a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "bootstrap-icons": "^1.11.1",
         "cheerio": "^1.0.0-rc.12",
+        "cropperjs": "^1.6.1",
         "desandro-matches-selector": "^2.0.2",
         "dotenv": "^16.3.1",
         "electron-context-menu": "^3.6.1",
@@ -769,6 +770,11 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
+    "node_modules/cropperjs": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.6.1.tgz",
+      "integrity": "sha512-F4wsi+XkDHCOMrHMYjrTEE4QBOrsHHN5/2VsVAaRq8P7E5z7xQpT75S+f/9WikmBEailas3+yo+6zPIomW+NOA=="
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
diff --git a/package.json b/package.json
index 73206d0..48a2b23 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
   "dependencies": {
     "bootstrap-icons": "^1.11.1",
     "cheerio": "^1.0.0-rc.12",
+    "cropperjs": "^1.6.1",
     "desandro-matches-selector": "^2.0.2",
     "dotenv": "^16.3.1",
     "electron-context-menu": "^3.6.1",
diff --git a/style.css b/style.css
index dd1dcad..27fe93d 100644
--- a/style.css
+++ b/style.css
@@ -3760,4 +3760,9 @@ width:85px;
     text-decoration: none;
     font-weight: 100;
     font-style: normal !important;
-} */
\ No newline at end of file
+} */
+
+.correctAnswer{
+font-weight: 500;
+font-size: 14px;
+}
\ No newline at end of file
diff --git a/xml2json.js b/xml2json.js
index e8a7d6a..a3a8578 100644
--- a/xml2json.js
+++ b/xml2json.js
@@ -24,40 +24,44 @@ function getQuestionsNodes(questionNode,type)
 		var questionObj = {};
 		if(type == 1)
 		{
-				questionObj['question'] = questionNode.childNodes[0].firstChild.nodeValue;
-				questionObj['question_description'] = (questionNode.childNodes[1].firstChild !== null? questionNode.childNodes[1].firstChild.nodeValue : "");
+				questionObj['question_id'] = questionNode.childNodes[0].firstChild !== null? questionNode.childNodes[0].firstChild.nodeValue : "" ;
+				questionObj['question'] = questionNode.childNodes[1].firstChild.nodeValue;
+				questionObj['question_description'] = (questionNode.childNodes[2].firstChild !== null? questionNode.childNodes[2].firstChild.nodeValue : "");
 				questionObj['question_type'] = 'text';
 				questionObj['attributes'] = getAttributesOfXMLNode(questionNode);
 				questionObj['question_sub_type'] = 'false';
-				questionObj['marks'] = (questionNode.childNodes[2].firstChild !== null ? questionNode.childNodes[2].firstChild.nodeValue : "");
-				questionObj['display_marks'] = questionNode.childNodes[3].firstChild.nodeValue;
-				questionObj['is_math_enabled'] = questionNode.childNodes[4].firstChild.nodeValue;
+				questionObj['marks'] = (questionNode.childNodes[3].firstChild !== null ? questionNode.childNodes[3].firstChild.nodeValue : "");
+				questionObj['display_marks'] = questionNode.childNodes[4].firstChild.nodeValue;
+				questionObj['is_math_enabled'] = questionNode.childNodes[5].firstChild.nodeValue;
+				// console.log(questionObj);
 
 		}
 		else
 		{
-				questionObj['question'] = questionNode.childNodes[0].firstChild.nodeValue;
-				questionObj['question_description'] = (questionNode.childNodes[1].firstChild !== null? questionNode.childNodes[1].firstChild.nodeValue : "");
+				questionObj['question_id'] = questionNode.childNodes[0].firstChild !== null ? questionNode.childNodes[0].firstChild.nodeValue : "";
+				questionObj['question'] = questionNode.childNodes[1].firstChild.nodeValue;
+				questionObj['question_description'] = (questionNode.childNodes[2].firstChild !== null? questionNode.childNodes[2].firstChild.nodeValue : "");
 				questionObj['question_type'] = 'group';
 				questionObj['attributes'] = getAttributesOfXMLNode(questionNode);
 				questionObj['question_sub_type'] = questionNode.childNodes[5].firstChild.nodeValue;
-				questionObj['marks'] = (questionNode.childNodes[2].firstChild !== null ? questionNode.childNodes[2].firstChild.nodeValue : "");
-				questionObj['display_marks'] = questionNode.childNodes[3].firstChild.nodeValue;
-				questionObj['is_math_enabled'] = questionNode.childNodes[4].firstChild.nodeValue;
+				questionObj['marks'] = (questionNode.childNodes[3].firstChild !== null ? questionNode.childNodes[3].firstChild.nodeValue : "");
+				questionObj['display_marks'] = questionNode.childNodes[4].firstChild.nodeValue;
+				questionObj['is_math_enabled'] = questionNode.childNodes[6].firstChild.nodeValue;
 				questionObj['answers'] = [];
-
-				var choiceList = questionNode.childNodes[6].childNodes;
+				
+				var choiceList = questionNode.childNodes[7].childNodes;
 				
 				if(choiceList.length > 0)
 				{
 					for (let k = 0; k < choiceList.length ;k++) 
 					{
 						var tempChoiceobj = {};
+console.log(choiceList)
 						 tempChoiceobj['id'] = choiceList[k].childNodes[0].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);
+// console.log(tempChoiceobj);
 						 questionObj['answers'].push(tempChoiceobj);
 					}
 				}
@@ -69,16 +73,16 @@ function getQuestionsNodes(questionNode,type)
 function getQuestionGroupNodes(questionGroup)
 {
 	var questionGroupObj = {};
-	
-				questionGroupObj['group_title'] = questionGroup.childNodes[0].firstChild.nodeValue;
-				questionGroupObj['group_description'] = (questionGroup.childNodes[1].firstChild !== null ? questionGroup.childNodes[1].firstChild.nodeValue : "");
-				questionGroupObj['group_marks'] = (questionGroup.childNodes[2].firstChild !== null ? questionGroup.childNodes[2].firstChild.nodeValue : "");
-				questionGroupObj['group_display_marks'] = questionGroup.childNodes[3].firstChild.nodeValue;
-				questionGroupObj['group_attempt_any'] = (questionGroup.childNodes[4].firstChild !== null ? questionGroup.childNodes[4].firstChild.nodeValue : "");
+				questionGroupObj['question_id'] = questionGroup.childNodes[0].firstChild.nodeValue;
+				questionGroupObj['group_title'] = questionGroup.childNodes[1].firstChild.nodeValue;
+				questionGroupObj['group_description'] = (questionGroup.childNodes[2].firstChild !== null ? questionGroup.childNodes[2].firstChild.nodeValue : "");
+				questionGroupObj['group_marks'] = (questionGroup.childNodes[3].firstChild !== null ? questionGroup.childNodes[3].firstChild.nodeValue : "");
+				questionGroupObj['group_display_marks'] = questionGroup.childNodes[4].firstChild.nodeValue;
+				questionGroupObj['group_attempt_any'] = (questionGroup.childNodes[5].firstChild !== null ? questionGroup.childNodes[5].firstChild.nodeValue : "");
 				questionGroupObj['attributes'] = getAttributesOfXMLNode(questionGroup);
 				questionGroupObj['questions'] = [];
 				//handle questions
-				var questionList = questionGroup.childNodes[5].childNodes;
+				var questionList = questionGroup.childNodes[6].childNodes;
 				// console.log('No of quetions in GQ:' + questionList.length);
 				for(let q = 0; q < questionList.length ;q++)
 				{
@@ -128,7 +132,7 @@ jsonObj['sections'] = [];
 		var tempObj = {};
 
         // console.log('Section :' + i + '-' + sectionsList[i].childNodes[0]);
-		tempObj['section_title'] = sectionsList[i].childNodes[0].firstChild.nodeValue;
+		tempObj['section_title'] = (sectionsList[i].childNodes[0].firstChild !== null ? sectionsList[i].childNodes[0].firstChild.nodeValue : "");
 		tempObj['section_description'] = sectionsList[i].childNodes[1].firstChild.nodeValue;
 		tempObj['section_marks'] = (sectionsList[i].childNodes[2].firstChild !== null ? sectionsList[i].childNodes[2].firstChild.nodeValue : "");
 		tempObj['section_display_marks'] = sectionsList[i].childNodes[3].firstChild.nodeValue;
diff --git a/xml2json_for_Questionpaper_preview.js b/xml2json_for_Questionpaper_preview.js
index c454b56..eacd369 100644
--- a/xml2json_for_Questionpaper_preview.js
+++ b/xml2json_for_Questionpaper_preview.js
@@ -2,7 +2,7 @@
 function  xml2json(xmlData) {
 // console.clear();
 console.log('xml to json converstion');
-// console.log(xmlData);
+// console.log(xmlData);z
 
 function getAttributesOfXMLNode(node)
 {
@@ -24,29 +24,31 @@ function getQuestionsNodes(questionNode,type)
 		var questionObj = {};
 		if(type == 1)
 		{
-			questionObj['question'] = questionNode.childNodes[0].firstChild.nodeValue;
-			questionObj['question_description'] = (questionNode.childNodes[1].firstChild !== null? questionNode.childNodes[1].firstChild.nodeValue : "");
+			questionObj['questionId'] = questionNode.childNodes[0].firstChild !== null ? questionNode.childNodes[0].firstChild.nodeValue : "";
+			questionObj['question'] = questionNode.childNodes[1].firstChild.nodeValue;
+			questionObj['question_description'] = (questionNode.childNodes[2].firstChild !== null? questionNode.childNodes[2].firstChild.nodeValue : "");
 			questionObj['question_type'] = 'text';
 			questionObj['attributes'] = getAttributesOfXMLNode(questionNode);
 			questionObj['question_sub_type'] = 'false';
-			questionObj['marks'] = (questionNode.childNodes[2].firstChild !== null ? questionNode.childNodes[2].firstChild.nodeValue : "");
-			questionObj['display_marks'] = questionNode.childNodes[3].firstChild.nodeValue;
-			questionObj['is_math_enabled'] = questionNode.childNodes[4].firstChild.nodeValue;
+			questionObj['marks'] = (questionNode.childNodes[3].firstChild !== null ? questionNode.childNodes[3].firstChild.nodeValue : "");
+			questionObj['display_marks'] = questionNode.childNodes[4].firstChild.nodeValue;
+			questionObj['is_math_enabled'] = questionNode.childNodes[5].firstChild.nodeValue;
 		 
 	}
 	else
 	{
-			questionObj['question'] = questionNode.childNodes[0].firstChild.nodeValue;
-			questionObj['question_description'] = (questionNode.childNodes[1].firstChild !== null? questionNode.childNodes[1].firstChild.nodeValue : "");
+			questionObj['questionId'] = questionNode.childNodes[0].firstChild.nodeValue;
+			questionObj['question'] = questionNode.childNodes[1].firstChild.nodeValue;
+			questionObj['question_description'] = (questionNode.childNodes[2].firstChild !== null? questionNode.childNodes[2].firstChild.nodeValue : "");
 			questionObj['question_type'] = 'group';
 			questionObj['attributes'] = getAttributesOfXMLNode(questionNode);
-			questionObj['question_sub_type'] = questionNode.childNodes[5].firstChild.nodeValue;
-			questionObj['marks'] = (questionNode.childNodes[2].firstChild !== null ? questionNode.childNodes[2].firstChild.nodeValue : "");
-			questionObj['display_marks'] = questionNode.childNodes[3].firstChild.nodeValue;
-			questionObj['is_math_enabled'] = questionNode.childNodes[4].firstChild.nodeValue;
+			questionObj['question_sub_type'] = questionNode.childNodes[6].firstChild.nodeValue;
+			questionObj['marks'] = (questionNode.childNodes[3].firstChild !== null ? questionNode.childNodes[3].firstChild.nodeValue : "");
+			questionObj['display_marks'] = questionNode.childNodes[4].firstChild.nodeValue;
+			questionObj['is_math_enabled'] = questionNode.childNodes[5].firstChild.nodeValue;
 			questionObj['answers'] = [];
 
-				var choiceList = questionNode.childNodes[6].childNodes;
+				var choiceList = questionNode.childNodes[7].childNodes;
 				
 				if(choiceList.length > 0)
 				{
@@ -70,20 +72,23 @@ function getQuestionsNodes(questionNode,type)
 function getQuestionGroupNodes(questionGroup)
 {
 	var questionGroupObj = {};
-	questionGroupObj['group_title'] = questionGroup.childNodes[0].firstChild.nodeValue;
-	questionGroupObj['group_description'] = (questionGroup.childNodes[1].firstChild !== null ? questionGroup.childNodes[1].firstChild.nodeValue : "");
-	questionGroupObj['group_marks'] = (questionGroup.childNodes[2].firstChild !== null ? questionGroup.childNodes[2].firstChild.nodeValue : "");
-	questionGroupObj['group_display_marks'] = questionGroup.childNodes[3].firstChild.nodeValue;
-	questionGroupObj['group_attempt_any'] = (questionGroup.childNodes[4].firstChild !== null ? questionGroup.childNodes[4].firstChild.nodeValue : "");
+	questionGroupObj['question_id'] = (questionGroup.childNodes[0].firstChild !== null ? questionGroup.childNodes[0].firstChild.nodeValue : "");
+
+	questionGroupObj['group_title'] = questionGroup.childNodes[1].firstChild.nodeValue;
+	questionGroupObj['group_description'] = (questionGroup.childNodes[2].firstChild !== null ? questionGroup.childNodes[2].firstChild.nodeValue : "");
+	questionGroupObj['group_marks'] = (questionGroup.childNodes[3].firstChild !== null ? questionGroup.childNodes[3].firstChild.nodeValue : "");
+	questionGroupObj['group_display_marks'] = questionGroup.childNodes[4].firstChild.nodeValue;
+	questionGroupObj['group_attempt_any'] = (questionGroup.childNodes[5].firstChild !== null ? questionGroup.childNodes[5].firstChild.nodeValue : "");
 	questionGroupObj['attributes'] = getAttributesOfXMLNode(questionGroup);
 	questionGroupObj['questions'] = [];
 				//handle questions
-				var questionList = questionGroup.childNodes[5].childNodes;
+				var questionList = questionGroup.childNodes[6].childNodes;
 				// console.log('No of quetions in GQ:' + questionList.length);
 				for(let q = 0; q < questionList.length ;q++)
 				{
 						
 						var questionType = questionList[q].getAttribute("xsi:type");
+						console.log(questionType);
 						if(questionType == 'DescriptiveQuestion')
 						{
 								questionGroupObj['questions'].push(getQuestionsNodes(questionList[q],1));