From 45966d5ea2c224f568aac1474df4ce88bcde060b Mon Sep 17 00:00:00 2001
From: aadhavan <aadhavanvalli@gmail.com>
Date: Thu, 30 Nov 2023 12:49:09 +0530
Subject: [PATCH] MERGEERROR FIX : AADHAVAN

---
 addform.html | 372 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 207 insertions(+), 165 deletions(-)

diff --git a/addform.html b/addform.html
index fbd1079..3d15d45 100644
--- a/addform.html
+++ b/addform.html
@@ -845,6 +845,16 @@ h1.title{
             	</div>
 			<!-- sidebar end -->
 			<script>
+
+
+var toolbarOptions = [
+  ['bold', 'italic', 'underline', 'strike'],        
+  [{ 'script': 'sub'}, { 'script': 'super' }],     
+  [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+  ['image'],         
+  [{ 'align': ['justify', 'center', 'right', ] }],
+];
+
 				document.addEventListener('DOMContentLoaded', function () {
 					// Initialize Quill with your specific configuration
 					var quill = new Quill('#workarea', {
@@ -1277,9 +1287,6 @@ $('#workarea_math').click(function(){
 	});
 
 
-const { v4: uuidv4 } = require('uuid');
-const Quill = require('quill');	
-const ImageResize = require('quill-image-resize').default;
 
 var ids = document.getElementById('workarea_math')
 				console.log(ids)
@@ -1338,8 +1345,8 @@ var xmlPath ="" //get the xml filepath in .env file local variable
 
 $(document).ready(function() {
 
-	const targetId = 'Question_title'; 
-    scrollToElementWithoutLink(targetId);
+	// const targetId = 'Question_title'; 
+    // scrollToElementWithoutLink(targetId);
 
 	
 	require('dotenv').config();
@@ -1607,14 +1614,13 @@ function saveFile(flag=0) {
 <script>
 
 const { v4: uuidv4 } = require('uuid');
-const Quill = require('quill');
-const table = require('quill1-table');
-
-Quill.register('modules/table', table);
-const tab = require('quill-table');
-
-
+var Quill = require('quill');	
+const ImageResize = require('quill-image-resize').default;
+var table = require('quill1-table');
+var tab = require('quill-table');
 Quill.register('modules/imageResize', ImageResize);	
+Quill.register('modules/table', table);
+
 const Question_Paper_UUID = uuidv4();
 var QuestionPaper_UUID = document.getElementById('QuestionPaper_UUID_ID')
 QuestionPaper_UUID.value = Question_Paper_UUID;
@@ -1691,6 +1697,10 @@ var toolbarOptions2 = [
 var quill = new Quill('#Question_title', {
   theme: 'snow', 
   modules: {
+	imageResize:{
+		displaySize:true,		
+		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
+	},
     toolbar: {
       container: toolbarOptions,
       handlers: {
@@ -1751,40 +1761,53 @@ var quill = new Quill('#QuestionsGroupIdset ', {
 
 var quill = new Quill('#Question_description', {
 	theme: 'snow', 
-	modules: {
-	toolbar: toolbarOptions,
-	clipboard: {
-		matchVisual: true,
-	},
+  modules: {
 	imageResize:{
-		displaySize:true,
-		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
+		displaySize:true,		
+		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
 	},
-	handlers: {
+    toolbar: {
+      container: toolbarOptions,
+      handlers: {
         table: function () {
+			// this.quill.getModule('table').insert();
+
           this.quill.getModule('table').insert();
         },
       },
-	},
-	table:  {
-    cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
+    },
+    table: {
+      cellSelectionOnClick: true,
+      // Other options for quill1-table module...
+    },
+    keyboard: keyboardOptions,
   },
-  keyboard: keyboardOptions
 
 });
 
 var quill = new Quill('#workarea', {
 	theme: 'snow', 
-	modules: {
-	toolbar: toolbarOptions,
-	clipboard: {
-		matchVisual: true,
-	},
+  modules: {
 	imageResize:{
 		displaySize:true,		
 		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
-	}
-}
+	},
+    toolbar: {
+      container: toolbarOptions,
+      handlers: {
+        table: function () {
+			// this.quill.getModule('table').insert();
+
+          this.quill.getModule('table').insert();
+        },
+      },
+    },
+    table: {
+      cellSelectionOnClick: true,
+      // Other options for quill1-table module...
+    },
+    keyboard: keyboardOptions,
+  },
 });
 
 
@@ -2117,49 +2140,53 @@ inputFields.forEach(inputField => {
 			var sectionText = (random_no == false) ? 'section_title_text_' + text_field_created_time : 'section_title_text_' + random_no;  
 			var quill = new Quill('#'+sectionText, {
 				theme: 'snow', 
-					modules: {
-					toolbar: toolbarOptions,
-					clipboard: {
-						matchVisual: true,
-					},
+				modules: {
 					imageResize:{
-						displaySize:true,
-						modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
+						displaySize:true,		
+						modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
 					},
+					toolbar: {
+					container: toolbarOptions,
 					handlers: {
 						table: function () {
+							// this.quill.getModule('table').insert();
+
 						this.quill.getModule('table').insert();
 						},
 					},
 					},
-					table:  {
-					cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
+					table: {
+					cellSelectionOnClick: true,
+					// Other options for quill1-table module...
+					},
+					keyboard: keyboardOptions,
 				},
-				keyboard: keyboardOptions
 			});
 			
 			var sectionDescription = (random_no == false) ? 'section_description_text_' + text_field_created_time : 'section_description_text_' + random_no;  
 			var quill = new Quill('#'+sectionDescription, {
 				theme: 'snow', 
-					modules: {
-					toolbar: toolbarOptions,
-					clipboard: {
-						matchVisual: true,
-					},
+				modules: {
 					imageResize:{
-						displaySize:true,
-						modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
+						displaySize:true,		
+						modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
 					},
+					toolbar: {
+					container: toolbarOptions,
 					handlers: {
 						table: function () {
+							// this.quill.getModule('table').insert();
+
 						this.quill.getModule('table').insert();
 						},
 					},
 					},
-					table:  {
-					cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
+					table: {
+					cellSelectionOnClick: true,
+					// Other options for quill1-table module...
+					},
+					keyboard: keyboardOptions,
 				},
-				keyboard: keyboardOptions
 			});
 
 			    var section_title_Div = (random_no == false) ? 'section_title_text_' + text_field_created_time : 'section_title_text_' + random_no;
@@ -2453,49 +2480,53 @@ function addQuestionGroup(idObj)
 			var subSectionText = 'subSection_title_text_' + QuestionGroup_ID;
 			var quill = new Quill('#'+subSectionText, {
 				theme: 'snow', 
-				modules: {
-				toolbar: toolbarOptions,
-				clipboard: {
-					matchVisual: true,
-				},
-				imageResize:{
-					displaySize:true,
-					modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
-				},
-				handlers: {
-					table: function () {
-					this.quill.getModule('table').insert();
+					modules: {
+						imageResize:{
+							displaySize:true,		
+							modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
+						},
+						toolbar: {
+						container: toolbarOptions,
+						handlers: {
+							table: function () {
+								// this.quill.getModule('table').insert();
+
+							this.quill.getModule('table').insert();
+							},
+						},
+						},
+						table: {
+						cellSelectionOnClick: true,
+						// Other options for quill1-table module...
+						},
+						keyboard: keyboardOptions,
 					},
-				},
-				},
-				table:  {
-				cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
-			},
-			keyboard: keyboardOptions
 			});
 			
 			var subSectionDescription = 'subSection_description_text_' + QuestionGroup_ID;
 			var quill = new Quill('#'+subSectionDescription, {
 				theme: 'snow', 
 				modules: {
-				toolbar: toolbarOptions,
-				clipboard: {
-					matchVisual: true,
-				},
-				imageResize:{
-					displaySize:true,
-					modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
-				},
-				handlers: {
-					table: function () {
-					this.quill.getModule('table').insert();
+					imageResize:{
+						displaySize:true,		
+						modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
 					},
+					toolbar: {
+					container: toolbarOptions,
+					handlers: {
+						table: function () {
+							// this.quill.getModule('table').insert();
+
+						this.quill.getModule('table').insert();
+						},
+					},
+					},
+					table: {
+					cellSelectionOnClick: true,
+					// Other options for quill1-table module...
+					},
+					keyboard: keyboardOptions,
 				},
-				},
-				table:  {
-				cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
-			},
-			keyboard: keyboardOptions
 			});
 
 		
@@ -3074,73 +3105,79 @@ function groupQuestion(question_id = false, section_id = false , group_question_
 var typetwoQuestionName =  'textQuestionName_' + addChoiceAreaId;
 var quill = new Quill('#'+typetwoQuestionName, {
 	theme: 'snow', 
-	modules: {
-	toolbar: toolbarOptions,
-	clipboard: {
-		matchVisual: true,
-	},
+  modules: {
 	imageResize:{
-		displaySize:true,
-		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
+		displaySize:true,		
+		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
 	},
-	handlers: {
+    toolbar: {
+      container: toolbarOptions,
+      handlers: {
         table: function () {
+			// this.quill.getModule('table').insert();
+
           this.quill.getModule('table').insert();
         },
       },
-	},
-	table:  {
-    cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
+    },
+    table: {
+      cellSelectionOnClick: true,
+      // Other options for quill1-table module...
+    },
+    keyboard: keyboardOptions,
   },
-  keyboard: keyboardOptions
 });
 
 var typetwoQuestionSubtitle = 'textQuestionSubtitle_' + addChoiceAreaId;
 var quill = new Quill('#'+typetwoQuestionSubtitle, {
 	theme: 'snow', 
-	modules: {
-	toolbar: toolbarOptions,
-	clipboard: {
-		matchVisual: true,
-	},
+  modules: {
 	imageResize:{
-		displaySize:true,
-		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
+		displaySize:true,		
+		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
 	},
-	handlers: {
+    toolbar: {
+      container: toolbarOptions,
+      handlers: {
         table: function () {
+			// this.quill.getModule('table').insert();
+
           this.quill.getModule('table').insert();
         },
       },
-	},
-	table:  {
-    cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
+    },
+    table: {
+      cellSelectionOnClick: true,
+      // Other options for quill1-table module...
+    },
+    keyboard: keyboardOptions,
   },
-  keyboard: keyboardOptions
 });
 
 var choiceTextField = 'choiceTextField_' + addChoiceAreaId;
 var quill = new Quill('#'+choiceTextField, {
 	theme: 'snow', 
-	modules: {
-	toolbar: toolbarOptions,
-	clipboard: {
-		matchVisual: true,
-	},
+  modules: {
 	imageResize:{
-		displaySize:true,
-		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
+		displaySize:true,		
+		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
 	},
-	handlers: {
+    toolbar: {
+      container: toolbarOptions,
+      handlers: {
         table: function () {
+			// this.quill.getModule('table').insert();
+
           this.quill.getModule('table').insert();
         },
       },
-	},
-	table:  {
-    cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
+    },
+    table: {
+      cellSelectionOnClick: true,
+      // Other options for quill1-table module...
+    },
+    keyboard: keyboardOptions,
   },
-  keyboard: keyboardOptions,
 	placeholder: 'Enter Choice',
 });
 
@@ -3373,25 +3410,27 @@ $(newChoiceDeleteButtonId).on('click', function() {
 	var newChoiceTextField = document.getElementById('newChoiceTextField_'+text_field_created_time+rnd_no);
 	var quill = new Quill(newChoiceTextField, {
 		theme: 'snow', 
-	modules: {
-	toolbar: toolbarOptions,
-	clipboard: {
-		matchVisual: true,
-	},
-	imageResize:{
-		displaySize:true,
-		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
-	},
-	handlers: {
-        table: function () {
-          this.quill.getModule('table').insert();
-        },
-      },
-	},
-	table:  {
-    cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
-  },
-  keyboard: keyboardOptions,
+		modules: {
+			imageResize:{
+				displaySize:true,		
+				modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
+			},
+			toolbar: {
+			container: toolbarOptions,
+			handlers: {
+				table: function () {
+					// this.quill.getModule('table').insert();
+
+				this.quill.getModule('table').insert();
+				},
+			},
+			},
+			table: {
+			cellSelectionOnClick: true,
+			// Other options for quill1-table module...
+			},
+			keyboard: keyboardOptions,
+		},
 	placeholder: 'Enter Choice',
 	});
 
@@ -3775,50 +3814,53 @@ else
   var typeOneQuestionName = 'textQuestionName_' + addTextQuestionId;
 	var quill = new Quill('#'+typeOneQuestionName, {
 		theme: 'snow', 
-	modules: {
-	toolbar: toolbarOptions,
-	clipboard: {
-		matchVisual: true,
-	},
+  modules: {
 	imageResize:{
-		displaySize:true,
-		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
+		displaySize:true,		
+		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
 	},
-	handlers: {
+    toolbar: {
+      container: toolbarOptions,
+      handlers: {
         table: function () {
+			// this.quill.getModule('table').insert();
+
           this.quill.getModule('table').insert();
         },
       },
-	},
-	table:  {
-    cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
+    },
+    table: {
+      cellSelectionOnClick: true,
+      // Other options for quill1-table module...
+    },
+    keyboard: keyboardOptions,
   },
-  keyboard: keyboardOptions
-		
 	});
 	
 	var typeOneQuestionSubtitle = 'textQuestionSubtitle_' + addTextQuestionId;
 	var quill = new Quill('#'+typeOneQuestionSubtitle, {
 		theme: 'snow', 
-	modules: {
-	toolbar: toolbarOptions,
-	clipboard: {
-		matchVisual: true,
-	},
+  modules: {
 	imageResize:{
-		displaySize:true,
-		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
+		displaySize:true,		
+		modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
 	},
-	handlers: {
+    toolbar: {
+      container: toolbarOptions,
+      handlers: {
         table: function () {
+			// this.quill.getModule('table').insert();
+
           this.quill.getModule('table').insert();
         },
       },
-	},
-	table:  {
-    cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key
+    },
+    table: {
+      cellSelectionOnClick: true,
+      // Other options for quill1-table module...
+    },
+    keyboard: keyboardOptions,
   },
-  keyboard: keyboardOptions
 	});