PREVIEWALGIN QUILLTABLE CODEMERGE : AADHAVAN

QuestionPaperPreview.js

@@ -2,6 +2,7 @@
 function QuestionPaperPreview(jsonData){
     // The provided JSON data
     // console.log(jsonData)
+
     
 // start Remove <p> tag 
     var jsonDat = jsonData;
@@ -305,10 +306,25 @@ function QuestionPaperPreview(jsonData){
     const formattedQuestionPaper = convertJSONToQuestionPaper(jsonData, 0, 1, 1);
     const questionPaperElement = document.getElementById("questionPaper");
     questionPaperElement.innerHTML = formattedQuestionPaper; // Use innerHTML here
+
+    $("#overlay").hide();
+
     }
 
   
 
+
+
+
+
+
+
+
+
+
+
+
+
 function removeHtmlTags(inputString) {
 
     const cheerio = require('cheerio');

QuestionPreview.html

@@ -121,7 +121,7 @@ tr{
 			text-wrap: wrap;
 			/* display: inline-flex; */
 			/* flex-direction: column; */
-			text-decoration: underline;
+			/* text-decoration: underline; */
 			/* justify-content: flex-start; */
 			position: relative;
 			top: -27px;
@@ -346,11 +346,17 @@ color: #1d3557 !important;
 
 
 	<!-- loder -->
-    <div class="loader-wrapper">
+    <!-- <div class="loader-wrapper">
       <div class="loader"></div>
       <div class="loder-section left-section"></div>
       <div class="loder-section right-section"></div>
-    </div> 
+    </div>  -->
+
+	<div id="overlay">
+		<div class="cv-spinner">
+		  <span class="spinner"></span>
+		</div>
+	</div>
 
 
 <!-- main-header -->
@@ -434,8 +440,10 @@ color: #1d3557 !important;
 
 
     <script>
-        var fs = require('fs'); 
+
-		var path =require('path'); 
+		$("#overlay").show();
+        const fs = require('fs'); 
+		const path =require('path'); 
 
 		// require('dotenv').config();
 		//get value from .env

dashboard.html

@@ -68,7 +68,10 @@ background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
 /* Modal Content */
 .modal-content {
 background-color: #fefefe;
-margin: auto;
+margin: auto;.loaded .loader {
+    top: -100%;
+    opacity: 0;
+  }
 padding: 20px;
 border: 1px solid #888;
 width: 80%;
@@ -204,11 +207,17 @@ margin-left: -16px;
 
 
 	<!-- loder -->
-    <div class="loader-wrapper">
+    <!-- <div class="loader-wrapper">
       <div class="loader"></div>
       <div class="loder-section left-section"></div>
       <div class="loder-section right-section"></div>
-    </div> 
+    </div>  -->
+
+	<div id="overlay">
+		<div class="cv-spinner">
+		  <span class="spinner"></span>
+		</div>
+	</div>
 
 
 <!-- main-header -->
@@ -266,7 +275,8 @@ margin-left: -16px;
     </div>
 
 	<!-- jquery js -->	
-	<script src="./node_modules/jquery/dist/jquery.min.js" onload="window.$ = window.jQuery = module.exports;"></script>
+	<script src="assets/js/vendor/jquery-3.2.1.min.js" onload="window.$ = window.jQuery = module.exports;"></script>
+	<!-- <script src="./node_modules/jquery/dist/jquery.min.js" onload="window.$ = window.jQuery = module.exports;"></script> -->
     <!-- bootstrap js -->	
 	<script src="assets/js/bootstrap.min.js"></script>
 	<!-- carousel js -->
@@ -288,7 +298,7 @@ margin-left: -16px;
 	<!-- venobox min js -->
 	<script src="venobox/venobox.min.js"></script>
 	<!-- isotope js -->
-	<script src="assets/js/isotope.pkgd.min.js"></script>
+	<!-- <script src="assets/js/isotope.pkgd.min.js"></script> -->
 	<!-- jquery nivo slider pack js -->
 	<script src="assets/js/jquery.nivo.slider.pack.js"></script>
 	<!-- jquery meanmenu js -->	
@@ -452,6 +462,7 @@ function downloadFile(filename) {
 
 	console.log(xmlPath);
 const xmlFilePath = `${xmlPath}${filename}`;
+console.log(xmlFilePath)
   
 const xmlFileNameParts = filename.split('.xml');
 const xmlBaseName = xmlFileNameParts[0];
@@ -501,76 +512,72 @@ if(fileList !== false)
    
 	console.log('isEncrypted NOT');
 
-  //Download XML FIle
+//   //Download XML FIle
-  console.log(xmlFilePath);
+//   console.log(xmlFilePath);
-  fs.writeFile(filePathToSave, xmlFilePath, 'utf-8', (err) => {
+//   fs.writeFile(filePathToSave, xmlFilePath, 'utf-8', (err) => {
      
-	 var errorMessage = "";
+// 	 var errorMessage = "";
-	if (err) {
+// 	if (err) {
-           //  console.log(err.code);
+//            //  console.log(err.code);
-		if(err.code == 'EACCES'){
+// 		if(err.code == 'EACCES'){
 
-			errorMessage = `Permission Denied.<br> Path: ${filePathToSave}`;
-		}
-		else if(err.code == 'ENOENT'){
 
-			errorMessage = `No Such File Directory. <br> Path: ${filePathToSave}`;
+// Download XML File
-		}
+try {
-		else{
-			errorMessage = `Unknown Error. <br> Path: ${filePathToSave}`;
-		}
 
-      Swal.fire({
+  const content = fs.readFileSync(xmlFilePath, 'utf-8');
-        title: "File Download Failed",
+  console.log('xml', content);	
-		html: errorMessage,
+  fs.writeFileSync(filePathToSave, content, 'utf-8');
-        icon: "error"
+  Swal.fire({
-      });
+    title: "File Downloaded",
-    } else {
+    icon: "success"
-      Swal.fire({
-        title: "File Downloaded",
-        icon: "success"
-      });
-    }
   });
+} catch (err) {
+  let errorMessage = "";
+  if (err.code === 'EACCES') {
+    errorMessage = `Permission Denied.<br> Path: ${filePathToSave}`;
+  } else if (err.code === 'ENOENT') {
+    errorMessage = `No Such File Directory. <br> Path: ${filePathToSave}`;
+  } else {
+    errorMessage = `Unknown Error. <br> Path: ${filePathToSave}`;
+  }
 
-  //Download JSON FIle
+  Swal.fire({
-  
+    title: "File Download Failed",
-  if(fileList !== false)
+    html: errorMessage,
-  {
+    icon: "error"
-
-  fs.writeFile(jsonFilePathToSave, jsonFilePath, 'utf-8', (err) => {
-     
-	 var errorMessage = "";
-	if (err) {
-            console.log(err.code);
-		if(err.code == 'EACCES'){
-			errorMessage = `Permission Denied.<br> Path: ${jsonFilePathToSave}`;
-			console.log(errorMessage);
-		}
-		else if(err.code == 'ENOENT'){
-			errorMessage = `No Such File Directory. <br> Path: ${jsonFilePathToSave}`;
-			console.log(errorMessage);
-		}
-		else{
-			errorMessage = `Unknown Error. <br> Path: ${jsonFilePathToSave}`;
-			console.log(errorMessage);
-		}
-
-      Swal.fire({
-        title: "File Download Failed",
-		html: errorMessage,
-        icon: "error"
-      });
-    } else {
-      Swal.fire({
-        title: "File Downloaded",
-        icon: "success"
-      });
-    }
   });
-
 }
 
+// Download JSON File
+if (fileList !== false) {
+  try {
+	const content = fs.readFileSync(jsonFilePath, 'utf-8');
+	console.log('json', content);
+    fs.writeFileSync(jsonFilePathToSave, content, 'utf-8');
+    Swal.fire({
+      title: "File Downloaded",
+      icon: "success"
+    });
+  } catch (err) {
+    let errorMessage = "";
+    if (err.code === 'EACCES') {
+      errorMessage = `Permission Denied.<br> Path: ${jsonFilePathToSave}`;
+    } else if (err.code === 'ENOENT') {
+      errorMessage = `No Such File Directory. <br> Path: ${jsonFilePathToSave}`;
+    } else {
+      errorMessage = `Unknown Error. <br> Path: ${jsonFilePathToSave}`;
+    }
+
+    Swal.fire({
+      title: "File Download Failed",
+      html: errorMessage,
+      icon: "error"
+    });
+  }
+}
+
+
   }
 
 }
@@ -597,6 +604,30 @@ function findFile(filePath) {
   }
 }
 
+function copyFile(sourceFilePath, destinationFilePath) {
+  // Resolve absolute paths
+  const sourcePath = path.resolve(sourceFilePath);
+  const destinationPath = path.resolve(destinationFilePath);
+
+  // Read the content of the source file
+  fs.readFile(sourcePath, 'utf8', (err, data) => {
+    if (err) {
+      console.error(`Error reading file: ${err.message}`);
+      return;
+    }
+
+    // Write the content to the destination file
+    fs.writeFile(destinationPath, data, 'utf8', (err) => {
+      if (err) {
+        console.error(`Error writing file: ${err.message}`);
+        return;
+      }
+
+      console.log(`File copied from ${sourcePath} to ${destinationPath}`);
+    });
+  });
+}
+
 </script>
 	
 

html2json.js

@@ -306,6 +306,6 @@ function html2json() {
     // console.log((formData));
     // console.log(JSON.stringify(formData, null, 1));
     localStorage.setItem("json", JSON.stringify((formData)));
-    // console.log(JSON.stringify(formData));
+    console.log(JSON.stringify(formData));
     // console.log(OBJtoXML(({'question_paper' : formData})));
 }

index.js

@@ -1,10 +1,11 @@
   const path = require('path');
   const fs = require('fs');
   const xml2js = require('xml2js');
- 
-   
-  document.addEventListener('DOMContentLoaded', async () => {
 
+  $("#overlay").show();
+ 
+  document.addEventListener('DOMContentLoaded', async () => {
+    
   function getFilesInFolder(folderName) {
           
    const xmlFilePath = path.join(__dirname, folderName);
@@ -104,10 +105,11 @@ async function loadMultipleXMLs() {
 
 
 
+
 // Call the function to load and display XML files
 loadMultipleXMLs();
 
-
+$("#overlay").hide();
 
  });
 

json2html.js

@@ -89,6 +89,7 @@ function jsonToHtml(jsonData) {
 	localStorage.removeItem('scroll');
 	localStorage.removeItem('EditNavExpend');
 	localStorage.removeItem('json_Decode_Data_For_Mcq_Crt_Ans');
+	$("#overlay").hide();
 
 }
 
@@ -113,7 +114,8 @@ function QuestionsForEach(Question, questionAreaId, questionRandomNo,index){
 	var questionUUID         = Question.attributes.Id;
 	var questionDisplayMarks = Question.display_marks;
 	var Choice               = Question.answers;
-	var CorrectAnswer        =Question.correct_answer;
+	var CorrectAnswer        = Question.correct_answer;
+
 		
 	
 	var QuestionObj = {         
@@ -141,10 +143,7 @@ function QuestionsForEach(Question, questionAreaId, questionRandomNo,index){
 	}
 	else if (questionType == 'group')
 	{  				
-		// console.log(Question);
-		console.log(CorrectAnswer);
 		groupQuestion(false, false, false, questionTitle, questionDescription, questionType, questionSubType, mathEnabled, Choice, questionAreaId, questionRandomNo, questionMarks, questionUUID, questionDisplayMarks,questionId,CorrectAnswer[0]);
-		// groupQuestion(QuestionObj);
 		Choice = Choice.slice(1);
 		Choice.forEach(function(choicenames, indexs) {
 		var choiceName = choicenames.choice_name;
@@ -159,6 +158,8 @@ function QuestionsForEach(Question, questionAreaId, questionRandomNo,index){
 		
 	}
 
+	// $("#overlay").hide();
+
 }
 
 
@@ -176,3 +177,4 @@ function generateGroupQuestion(Question, questionAreaId, questionRandomNo)
 			QuestionsForEach(GroupQuestions, questionGroupAreaId, QuestionGroupRandomNo , index);
 });
 }
+

json2xml.js

@@ -1,144 +1,7 @@
 function json2xml() {
     // console.clear();
     var obj = localStorage.getItem("json");
-    // console.log(obj);
+
-    // var obj = `{
-    //     "question_paper_title": "<p><br></p>",
-    //     "question_paper_description": "<p><br></p>",
-    //     "max_marks": "",
-    //     "course_ID": "",
-    //     "course_Code": "",
-    //     "subject_ID": "",
-    //     "subject_Code": "",
-    //     "paper_No": "",
-    //     "subject_Name": "",
-    //     "sub_Paper_Prefix": "",
-    //     "question_Paper_uuid": "f676ad21-b0d2-4a80-8c77-6cd2b35f1b34",
-    //     "sections": [
-    //       {
-    //         "section_title": "<p>0</p>",
-    //         "section_description": "<p><br></p>",
-    //         "section_marks": "0",
-    //         "section_uuid": "7c62e594-3b93-444f-9fa6-a05f87869db6",
-    //         "section_display_marks": true,
-    //         "section_attempt_any": "",
-    //         "questions": [
-    //           {
-    //             "question": "<p>1</p>",
-    //             "question_description": "<p><br></p>",
-    //             "question_type": "group",
-    //             "question_sub_type": false,
-    //             "is_math_enabled": false,
-    //             "display_marks": true,
-    //             "marks": "",
-    //             "choice_question_uuid": "40f37294-e7cb-4f19-9166-72f7a04f6391",
-    //             "answers": [
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "387d9b85-4702-4e77-a8c3-29d713b7689e",
-    //                 "no": "a"
-    //               },
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "1a6be686-9e7c-4b07-bf15-b9e07a01fd62",
-    //                 "no": "b"
-    //               },
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "0640c05b-522e-422c-8050-0d5982aa3c74",
-    //                 "no": "c"
-    //               },
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "e59f90b0-79d5-413e-85a4-ee3c181230d8",
-    //                 "no": "d"
-    //               }
-    //             ],
-    //             "correct_answer": ["1a6be686-9e7c-4b07-bf15-b9e07a01fd62"]
-    //           },
-    //           {
-    //             "question": "<p>2</p>",
-    //             "question_description": "<p><br></p>",
-    //             "question_type": "group",
-    //             "question_sub_type": false,
-    //             "is_math_enabled": false,
-    //             "display_marks": true,
-    //             "marks": "",
-    //             "choice_question_uuid": "7a1c83e7-e9ae-4424-9336-6135eaa6b833",
-    //             "answers": [
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "0cbb8330-8ce9-4d69-b547-68cee529a636",
-    //                 "no": "a"
-    //               },
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "25dc4fdc-7bcf-4bea-aaa5-dc42a22c08b5",
-    //                 "no": "b"
-    //               },
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "5b0da327-076f-488c-a46e-0b8251c83283",
-    //                 "no": "c"
-    //               },
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "d3934305-d6fd-4601-8b1b-08067f47a8dd",
-    //                 "no": "d"
-    //               }
-    //             ],
-    //             "correct_answer": ["d3934305-d6fd-4601-8b1b-08067f47a8dd"]
-    //           },
-    //           {
-    //             "question": "<p>3</p>",
-    //             "question_description": "<p><br></p>",
-    //             "question_type": "group",
-    //             "question_sub_type": false,
-    //             "is_math_enabled": false,
-    //             "display_marks": true,
-    //             "marks": "",
-    //             "choice_question_uuid": "6f929b53-9ebc-40fb-800e-46c42b75f2d9",
-    //             "answers": [
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "f839312c-8de5-4cd5-8d6c-3ffd3b9efea6",
-    //                 "no": "a"
-    //               },
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "905db769-82b2-4240-af06-fe0b15ee1f73",
-    //                 "no": "b"
-    //               },
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "6a16126f-8100-49f8-ae33-71d4848030cf",
-    //                 "no": "c"
-    //               },
-    //               {
-    //                 "choice_name": "<p><br></p>",
-    //                 "is_math_enabled": false,
-    //                 "choice_uuid": "143f648a-d52c-42ff-9428-1c080326e1c8",
-    //                 "no": "d"
-    //               }
-    //             ],
-    //             "correct_answer": ["143f648a-d52c-42ff-9428-1c080326e1c8", "6a16126f-8100-49f8-ae33-71d4848030cf"]
-    //           }
-    //         ]
-    //       }
-    //     ]
-    //   }
-    //   `
     // console.log(obj);
     // console.log('***********************************************************');
 

nav_pane.js

@@ -20,16 +20,50 @@ function navpane() {
 
     function removeParagraphTags(html) {
         // return html.replace(/<p>/g, '').replace(/<\/p>/g, '');
-        // var html = html.replaceAll(/<p>|<\/p>|<strong>|<\/strong>|<em>|<\/em>|<s>|<\/s>|<u>|<\/u>|<br>|style/g, '');
-        var html = html.replace(/<[^>]*>/g, '');
-        // console.log(html);
 
+        var html = html.replace(/<[^>]*>/g, '');
         // if (html.length >= 30) {
         //     html=html.slice(0, 25) + '...';
         // }
         return html
+
     }
     
+    //function for remove <img> tag
+    function removeTagsAndTruncate(html, maxLength) {
+
+        const doc = new DOMParser().parseFromString(html, 'text/html');
+
+        // Remove <p> tags
+        const paragraphs = doc.getElementsByTagName('p');
+        for (let i = paragraphs.length - 1; i >= 0; i--) {
+            const paragraph = paragraphs[i];
+            paragraph.parentNode.replaceChild(document.createTextNode(paragraph.textContent), paragraph);
+        }
+    
+        // Remove <img> tags
+        const images = doc.getElementsByTagName('img');
+        for (let i = images.length - 1; i >= 0; i--) {
+            const image = images[i];
+            image.parentNode.removeChild(image);
+        }
+    
+        // Get the text content
+        const textContent = doc.body.textContent;
+    
+        // Truncate the content
+        var truncatedContent = "";
+        if(textContent.length > 20)
+        {
+            truncatedContent = textContent.substring(0, maxLength) + '...';
+        }
+        else{
+            truncatedContent = textContent;
+        }
+    
+        return truncatedContent;
+    }
+
     function createTreeWithHeading(data, container) {
         const treeTitle = removeParagraphTags(data.question_paper_title);
         const heading = document.createElement('a');
@@ -447,13 +481,23 @@ function navpane() {
                 nodeDiv.style.paddingLeft='0px';
                     currentlyHighlightedElement =null
             });
-            if (nodeData.question.length > 20) {
-                // questionLink.innerHTML = removeParagraphTags(nodeData.question.substring(0, 20) + '...');
-                questionLink.innerHTML = removeParagraphTags(nodeData.question);
 
-            } else {
+
-                questionLink.innerHTML = removeParagraphTags(nodeData.question);
+
-            }
+            // if (nodeData.question.length > 20) {
+            //     // questionLink.innerHTML = removeParagraphTags(nodeData.question.substring(0, 20) + '...');
+            //     questionLink.innerHTML = removeParagraphTags(nodeData.question);
+
+            // } else {
+            //     questionLink.innerHTML = removeParagraphTags(nodeData.question);
+            // }
+   
+            
+                questionLink.innerHTML = removeTagsAndTruncate(nodeData.question, 20);
+           
+
+            // console.log('questionLink : ', questionLink)
+
     
             nodeDiv.appendChild(questionLink);
         } else if (nodeData.group_title) {

package-lock.json

@@ -74,9 +74,9 @@
       }
     },
     "node_modules/@electron/asar": {
-      "version": "3.2.7",
+      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.7.tgz",
+      "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.8.tgz",
-      "integrity": "sha512-8FaSCAIiZGYFWyjeevPQt+0e9xCK9YmJ2Rjg5SXgdsXon6cRnU0Yxnbe6CvJbQn26baifur2Y2G5EBayRIsjyg==",
+      "integrity": "sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg==",
       "dev": true,
       "dependencies": {
         "commander": "^5.0.0",
@@ -152,9 +152,9 @@
       }
     },
     "node_modules/@electron/notarize/node_modules/universalify": {
-      "version": "2.0.0",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
@@ -208,18 +208,18 @@
       }
     },
     "node_modules/@electron/osx-sign/node_modules/universalify": {
-      "version": "2.0.0",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
       }
     },
     "node_modules/@electron/universal": {
-      "version": "1.4.2",
+      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.5.1.tgz",
-      "integrity": "sha512-ymGwXYBUGFS1DuTqYJwZ0p1gIlELKOf21zPJefij/amzV66vTXRNJ2mAtW0uRsaHfV+pzYTJVrt5oco44DFOMg==",
+      "integrity": "sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==",
       "dev": true,
       "dependencies": {
         "@electron/asar": "^3.2.1",
@@ -262,9 +262,9 @@
       }
     },
     "node_modules/@electron/universal/node_modules/universalify": {
-      "version": "2.0.0",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
@@ -351,9 +351,9 @@
       }
     },
     "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.3",
+      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
-      "integrity": "sha512-V46MYLFp08Wf2mmaBhvgjStM3tPa+2GAdy/iqoX+noX1//zje2x4XmrIU0cAwyClATsTmahbtoQ2EwP7I5WSiA=="
+      "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="
     },
     "node_modules/@types/keyv": {
       "version": "3.1.4",
@@ -365,27 +365,27 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.18.7",
+      "version": "18.18.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.7.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.13.tgz",
-      "integrity": "sha512-bw+lEsxis6eqJYW8Ql6+yTqkE6RuFtsQPSe5JxXbqYRFQEER5aJA9a5UH9igqDWm3X4iLHIKOHlnAXLM4mi7uQ==",
+      "integrity": "sha512-vXYZGRrSCreZmq1rEjMRLXJhiy8MrIeVasx+PCVlP414N7CJLHnMf+juVvjdprHyH+XRy3zKZLHeNueOpJCn0g==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
     "node_modules/@types/responselike": {
-      "version": "1.0.2",
+      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
-      "integrity": "sha512-/4YQT5Kp6HxUDb4yhRkm0bJ7TbjvTddqX7PZ5hz6qV3pxSo72f/6YPRo+Mu2DU307tm9IioO69l7uAwn5XNcFA==",
+      "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/yauzl": {
-      "version": "2.10.2",
+      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==",
+      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "dev": true,
       "optional": true,
       "dependencies": {
@@ -662,9 +662,9 @@
       "optional": true
     },
     "node_modules/bootstrap-icons": {
-      "version": "1.11.1",
+      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.1.tgz",
+      "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.2.tgz",
-      "integrity": "sha512-F0DDp7nKUX+x/QtpfRZ+XHFya60ng9nfdpdS59vDDfs4Uhuxp7zym/QavMsu/xx51txkoM9eVmpE7D08N35blw==",
+      "integrity": "sha512-TgdiPv+IM9tgDb+dsxrnGIyocsk85d2M7T0qIgkvPedZeoZfyeG/j+yiAE4uHCEayKef2RP05ahQ0/e9Sv75Wg==",
       "funding": [
         {
           "type": "github",
@@ -1084,16 +1084,19 @@
       }
     },
     "node_modules/deep-equal": {
-      "version": "1.1.1",
+      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
       "dependencies": {
-        "is-arguments": "^1.0.4",
+        "is-arguments": "^1.1.1",
-        "is-date-object": "^1.0.1",
+        "is-date-object": "^1.0.5",
-        "is-regex": "^1.0.4",
+        "is-regex": "^1.1.4",
-        "object-is": "^1.0.1",
+        "object-is": "^1.1.5",
         "object-keys": "^1.1.1",
-        "regexp.prototype.flags": "^1.2.0"
+        "regexp.prototype.flags": "^1.5.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1230,6 +1233,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
       "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "deprecated": "Use your platform's native DOMException instead",
       "dependencies": {
         "webidl-conversions": "^7.0.0"
       },
@@ -1285,9 +1289,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "26.4.2",
+      "version": "26.6.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-26.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-26.6.1.tgz",
-      "integrity": "sha512-BOfQUOIvsq5NnssWOMqcZnA5M0ull620wvQoJq3WhXN1wJAsWu+cdjHvREyxnHbArPkV+F+x3YAi5Dt+UKoqhw==",
+      "integrity": "sha512-4Vz9u0Jt/khPa/en2l8Jv6SWEfsK/ieWYtchl5j0clbNSjdeTucnEFOhz9B9WwsAmfQjxBnpuMZpmdBuyxq+wg==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -1422,9 +1426,9 @@
       }
     },
     "node_modules/electron-packager/node_modules/universalify": {
-      "version": "2.0.0",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
@@ -1499,9 +1503,9 @@
       }
     },
     "node_modules/electron-wix-msi/node_modules/universalify": {
-      "version": "2.0.0",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
@@ -1814,9 +1818,9 @@
       }
     },
     "node_modules/flora-colossus/node_modules/universalify": {
-      "version": "2.0.0",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
@@ -1941,9 +1945,9 @@
       }
     },
     "node_modules/galactus/node_modules/universalify": {
-      "version": "2.0.0",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
@@ -2552,9 +2556,9 @@
       }
     },
     "node_modules/is-online/node_modules/http2-wrapper": {
-      "version": "2.2.0",
+      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
-      "integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==",
+      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
       "dependencies": {
         "quick-lru": "^5.1.1",
         "resolve-alpn": "^1.2.0"
@@ -2968,6 +2972,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
       "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "deprecated": "Use your platform's native DOMException instead",
       "dependencies": {
         "webidl-conversions": "^4.0.2"
       }
@@ -3633,9 +3638,9 @@
       }
     },
     "node_modules/public-ip/node_modules/http2-wrapper": {
-      "version": "2.2.0",
+      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
-      "integrity": "sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==",
+      "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==",
       "dependencies": {
         "quick-lru": "^5.1.1",
         "resolve-alpn": "^1.2.0"
@@ -3710,9 +3715,9 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.3.0",
+      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "engines": {
         "node": ">=6"
       }
@@ -4404,9 +4409,9 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.32",
+      "version": "11.10.1",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.32.tgz",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.10.1.tgz",
-      "integrity": "sha512-44tNNe2oLe7T94mT6dus4hc9G7qg6jZU/K5qZzpNS6e5HGPrSF6Kie6oZ7B5puIJydB34V2h/8f5EhIFivYo4A==",
+      "integrity": "sha512-qu145oBuFfjYr5yZW9OSdG6YmRxDf8CnkgT/sXMfrXGe+asFy2imC2vlaLQ/L/naZ/JZna1MPAY56G4qYM0VUQ==",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"

style.css

@@ -3046,7 +3046,7 @@ a.main_sticky {
 
 /*Loader*/
 
-.loader-wrapper {
+/* .loader-wrapper {
     position: fixed;
     top: 0;
     bottom: 0;
@@ -3056,8 +3056,8 @@ a.main_sticky {
     height: 100%;
     transition: 0.8s 1s ease;
     z-index: 666;
-}
+} */
-.loader {
+/* .loader {
   position: relative;
   display: block;
   z-index: 201;
@@ -3104,10 +3104,10 @@ a.main_sticky {
   -moz-animation: spin 2.5s linear infinite;
   -o-animation: spin 2.5s linear infinite;
   animation: spin 2.5s linear infinite;
-}
+} */
 /* Here comes the Magic */
 
-@-webkit-keyframes spin {
+/* @-webkit-keyframes spin {
   0% {
     -webkit-transform: rotate(0deg);
     -moz-transform: rotate(0deg);
@@ -3150,38 +3150,36 @@ a.main_sticky {
     -o-transform: rotate(360deg);
     transform: rotate(360deg);
   }
-}
+} */
 
-.loader-wrapper .loder-section {
+/* .loader-wrapper .loder-section {
     position: fixed;
     top: 0;
     width: 55%;
     height: 100%;
     background: #111;
     z-index: 2;
-}
+} */
-.loader-wrapper .loder-section.left-section {
+/* .loader-wrapper .loder-section.left-section {
-  left: 0;
+    left: 0;
-  transition: 1s 1.5s ease;
+    transition: 15s 2s ease;
-}
+  }
-.loader-wrapper .loder-section.right-section {
+  .loader-wrapper .loder-section.right-section {
-  right: 0;
+    right: 0;
-  transition: 1s 1.5s ease;
+    transition: 15s 2s ease;
-}
+  }
-
+  
-/* When page loaded */
+  When page loaded
-.loaded .loder-section {
+  .loaded .loader-wrapper {
     display: none; 
-    transition: 1s 1.5s ease;
+    transition: 10s 1.5s ease;
-}
+  } */
-.loaded .loader-wrapper {
+  /* .loaded .loader {
-    display: none; 
-    transition: 1s 1.5s ease;
-}
-.loaded .loader {
     top: -100%;
     opacity: 0;
-}
+  } */
+
+
 
 
 /*  New Add CSS Class */
@@ -3588,6 +3586,15 @@ margin-top: 5px;
 font-weight: 500;
 font-size: 14px;
 }
+
+.math2{
+font-weight: 500;
+font-size: 14px;
+color: #061738;
+position: relative;
+right: 40px;
+}
+
 .mathQuestions{
 font-weight: 500;
 float: right;
@@ -3760,6 +3767,7 @@ width:85px;
 
 
 
+
 /* #questionPaper {
     font-size:small;
     text-decoration: none;
@@ -3772,3 +3780,36 @@ font-weight: 500;
 font-size: 14px;
 }
 
+
+
+#overlay{   
+    position: fixed;
+    top: 0;
+    z-index: 100;
+    width: 100%;
+    height:100%;
+    display: none;
+    background: rgba(0,0,0,0.8);
+  }
+  .cv-spinner {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;  
+  }
+  .spinner {
+    width: 120px;
+    height: 120px;
+    border: 16px #ddd solid;
+    border-top: 16px #2e93e6 solid;
+    border-radius: 50%;
+    animation: sp-anime 0.8s infinite linear;
+  }
+  @keyframes sp-anime {
+    100% { 
+      transform: rotate(360deg); 
+    }
+  }
+  .is-hide{
+    display:none;
+  }

xml2json.js

@@ -67,7 +67,7 @@ function getQuestionsNodes(questionNode,type)
 						 questionObj['answers'].push(tempChoiceobj);
 					}
 				}
-				if(jsonDecodeData !== null)
+				if(jsonDecodeData !== 'null' && jsonDecodeData !== null)
 				{   
 					var jsonParsedData = JSON.parse(jsonDecodeData);