ProjectB/projectb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MERGEERROR FIX : AADHAVAN

Browse Source
This commit is contained in:
aadhavan 2023-11-30 12:49:09 +05:30
parent 3b9f4ccc7f
commit 45966d5ea2
1 changed files with 207 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

372
addform.html
View File

@ -845,6 +845,16 @@ h1.title{
</div> </div>
<!-- sidebar end --> <!-- sidebar end -->
<script> <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 () { document.addEventListener('DOMContentLoaded', function () {
// Initialize Quill with your specific configuration // Initialize Quill with your specific configuration
var quill = new Quill('#workarea', { 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') var ids = document.getElementById('workarea_math')
console.log(ids) console.log(ids)
@ -1338,8 +1345,8 @@ var xmlPath ="" //get the xml filepath in .env file local variable
$(document).ready(function() { $(document).ready(function() {
const targetId = 'Question_title'; // const targetId = 'Question_title';
scrollToElementWithoutLink(targetId); // scrollToElementWithoutLink(targetId);
require('dotenv').config(); require('dotenv').config();
@ -1607,14 +1614,13 @@ function saveFile(flag=0) {
<script> <script>
const { v4: uuidv4 } = require('uuid'); const { v4: uuidv4 } = require('uuid');
const Quill = require('quill'); var Quill = require('quill');
const table = require('quill1-table'); const ImageResize = require('quill-image-resize').default;
var table = require('quill1-table');
Quill.register('modules/table', table); var tab = require('quill-table');
const tab = require('quill-table');
Quill.register('modules/imageResize', ImageResize); Quill.register('modules/imageResize', ImageResize);
Quill.register('modules/table', table);
const Question_Paper_UUID = uuidv4(); const Question_Paper_UUID = uuidv4();
var QuestionPaper_UUID = document.getElementById('QuestionPaper_UUID_ID') var QuestionPaper_UUID = document.getElementById('QuestionPaper_UUID_ID')
QuestionPaper_UUID.value = Question_Paper_UUID; QuestionPaper_UUID.value = Question_Paper_UUID;
@ -1691,6 +1697,10 @@ var toolbarOptions2 = [
var quill = new Quill('#Question_title', { var quill = new Quill('#Question_title', {
theme: 'snow', theme: 'snow',
modules: { modules: {
imageResize:{
displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
},
toolbar: { toolbar: {
container: toolbarOptions, container: toolbarOptions,
handlers: { handlers: {
@ -1751,40 +1761,53 @@ var quill = new Quill('#QuestionsGroupIdset ', {
var quill = new Quill('#Question_description', { var quill = new Quill('#Question_description', {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions,
clipboard: {
matchVisual: true,
},
imageResize:{ imageResize:{
displaySize:true, displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
}, },
handlers: { toolbar: {
container: toolbarOptions,
handlers: {
table: function () { table: function () {
// this.quill.getModule('table').insert();
this.quill.getModule('table').insert(); this.quill.getModule('table').insert();
}, },
}, },
}, },
table: { table: {
cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key cellSelectionOnClick: true,
// Other options for quill1-table module...
},
keyboard: keyboardOptions,
}, },
keyboard: keyboardOptions
}); });
var quill = new Quill('#workarea', { var quill = new Quill('#workarea', {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions,
clipboard: {
matchVisual: true,
},
imageResize:{ imageResize:{
displaySize:true, displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ], 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 sectionText = (random_no == false) ? 'section_title_text_' + text_field_created_time : 'section_title_text_' + random_no;
var quill = new Quill('#'+sectionText, { var quill = new Quill('#'+sectionText, {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions,
clipboard: {
matchVisual: true,
},
imageResize:{ imageResize:{
displaySize:true, displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
}, },
toolbar: {
container: toolbarOptions,
handlers: { handlers: {
table: function () { table: function () {
// this.quill.getModule('table').insert();
this.quill.getModule('table').insert(); this.quill.getModule('table').insert();
}, },
}, },
}, },
table: { table: {
cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key 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 sectionDescription = (random_no == false) ? 'section_description_text_' + text_field_created_time : 'section_description_text_' + random_no;
var quill = new Quill('#'+sectionDescription, { var quill = new Quill('#'+sectionDescription, {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions,
clipboard: {
matchVisual: true,
},
imageResize:{ imageResize:{
displaySize:true, displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
}, },
toolbar: {
container: toolbarOptions,
handlers: { handlers: {
table: function () { table: function () {
// this.quill.getModule('table').insert();
this.quill.getModule('table').insert(); this.quill.getModule('table').insert();
}, },
}, },
}, },
table: { table: {
cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key 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; 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 subSectionText = 'subSection_title_text_' + QuestionGroup_ID;
var quill = new Quill('#'+subSectionText, { var quill = new Quill('#'+subSectionText, {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions, imageResize:{
clipboard: { displaySize:true,
matchVisual: true, modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
}, },
imageResize:{ toolbar: {
displaySize:true, container: toolbarOptions,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] handlers: {
}, table: function () {
handlers: { // this.quill.getModule('table').insert();
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 subSectionDescription = 'subSection_description_text_' + QuestionGroup_ID;
var quill = new Quill('#'+subSectionDescription, { var quill = new Quill('#'+subSectionDescription, {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions, imageResize:{
clipboard: { displaySize:true,
matchVisual: true, modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
},
imageResize:{
displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ]
},
handlers: {
table: function () {
this.quill.getModule('table').insert();
}, },
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 typetwoQuestionName = 'textQuestionName_' + addChoiceAreaId;
var quill = new Quill('#'+typetwoQuestionName, { var quill = new Quill('#'+typetwoQuestionName, {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions,
clipboard: {
matchVisual: true,
},
imageResize:{ imageResize:{
displaySize:true, displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
}, },
handlers: { toolbar: {
container: toolbarOptions,
handlers: {
table: function () { table: function () {
// this.quill.getModule('table').insert();
this.quill.getModule('table').insert(); this.quill.getModule('table').insert();
}, },
}, },
}, },
table: { table: {
cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key cellSelectionOnClick: true,
// Other options for quill1-table module...
},
keyboard: keyboardOptions,
}, },
keyboard: keyboardOptions
}); });
var typetwoQuestionSubtitle = 'textQuestionSubtitle_' + addChoiceAreaId; var typetwoQuestionSubtitle = 'textQuestionSubtitle_' + addChoiceAreaId;
var quill = new Quill('#'+typetwoQuestionSubtitle, { var quill = new Quill('#'+typetwoQuestionSubtitle, {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions,
clipboard: {
matchVisual: true,
},
imageResize:{ imageResize:{
displaySize:true, displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
}, },
handlers: { toolbar: {
container: toolbarOptions,
handlers: {
table: function () { table: function () {
// this.quill.getModule('table').insert();
this.quill.getModule('table').insert(); this.quill.getModule('table').insert();
}, },
}, },
}, },
table: { table: {
cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key cellSelectionOnClick: true,
// Other options for quill1-table module...
},
keyboard: keyboardOptions,
}, },
keyboard: keyboardOptions
}); });
var choiceTextField = 'choiceTextField_' + addChoiceAreaId; var choiceTextField = 'choiceTextField_' + addChoiceAreaId;
var quill = new Quill('#'+choiceTextField, { var quill = new Quill('#'+choiceTextField, {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions,
clipboard: {
matchVisual: true,
},
imageResize:{ imageResize:{
displaySize:true, displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
}, },
handlers: { toolbar: {
container: toolbarOptions,
handlers: {
table: function () { table: function () {
// this.quill.getModule('table').insert();
this.quill.getModule('table').insert(); this.quill.getModule('table').insert();
}, },
}, },
}, },
table: { table: {
cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key cellSelectionOnClick: true,
// Other options for quill1-table module...
},
keyboard: keyboardOptions,
}, },
keyboard: keyboardOptions,
placeholder: 'Enter Choice', placeholder: 'Enter Choice',
}); });
@ -3373,25 +3410,27 @@ $(newChoiceDeleteButtonId).on('click', function() {
var newChoiceTextField = document.getElementById('newChoiceTextField_'+text_field_created_time+rnd_no); var newChoiceTextField = document.getElementById('newChoiceTextField_'+text_field_created_time+rnd_no);
var quill = new Quill(newChoiceTextField, { var quill = new Quill(newChoiceTextField, {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions, imageResize:{
clipboard: { displaySize:true,
matchVisual: true, modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
}, },
imageResize:{ toolbar: {
displaySize:true, container: toolbarOptions,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] handlers: {
}, table: function () {
handlers: { // this.quill.getModule('table').insert();
table: function () {
this.quill.getModule('table').insert(); this.quill.getModule('table').insert();
}, },
}, },
}, },
table: { table: {
cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key cellSelectionOnClick: true,
}, // Other options for quill1-table module...
keyboard: keyboardOptions, },
keyboard: keyboardOptions,
},
placeholder: 'Enter Choice', placeholder: 'Enter Choice',
}); });
@ -3775,50 +3814,53 @@ else
var typeOneQuestionName = 'textQuestionName_' + addTextQuestionId; var typeOneQuestionName = 'textQuestionName_' + addTextQuestionId;
var quill = new Quill('#'+typeOneQuestionName, { var quill = new Quill('#'+typeOneQuestionName, {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions,
clipboard: {
matchVisual: true,
},
imageResize:{ imageResize:{
displaySize:true, displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
}, },
handlers: { toolbar: {
container: toolbarOptions,
handlers: {
table: function () { table: function () {
// this.quill.getModule('table').insert();
this.quill.getModule('table').insert(); this.quill.getModule('table').insert();
}, },
}, },
}, },
table: { table: {
cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key cellSelectionOnClick: true,
// Other options for quill1-table module...
},
keyboard: keyboardOptions,
}, },
keyboard: keyboardOptions
}); });
var typeOneQuestionSubtitle = 'textQuestionSubtitle_' + addTextQuestionId; var typeOneQuestionSubtitle = 'textQuestionSubtitle_' + addTextQuestionId;
var quill = new Quill('#'+typeOneQuestionSubtitle, { var quill = new Quill('#'+typeOneQuestionSubtitle, {
theme: 'snow', theme: 'snow',
modules: { modules: {
toolbar: toolbarOptions,
clipboard: {
matchVisual: true,
},
imageResize:{ imageResize:{
displaySize:true, displaySize:true,
modules: [ 'Resize', 'DisplaySize', 'Toolbar' ] modules: [ 'Resize', 'DisplaySize', 'Toolbar' ],
}, },
handlers: { toolbar: {
container: toolbarOptions,
handlers: {
table: function () { table: function () {
// this.quill.getModule('table').insert();
this.quill.getModule('table').insert(); this.quill.getModule('table').insert();
}, },
}, },
}, },
table: { table: {
cellSelectionOnClick: true // true: cell selection on click, false: cell selection with CTRL key cellSelectionOnClick: true,
// Other options for quill1-table module...
},
keyboard: keyboardOptions,
}, },
keyboard: keyboardOptions
}); });