tango-app-api-trax 3.9.0-nike → 3.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.9.0-nike",
+    "version": "3.9.2",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -483,6 +483,8 @@ export async function redoChecklist( req, res ) {
       redoStatus: true,
       reinitiateStatus: true,
       questionAnswers: question,
+      ...( checklistDetails.checklistStatus != 'submit' && checklistDetails.redoStatus ) ? { redoEdit: true } : {},
+      ...( ( checklistDetails.redoEdit === undefined && checklistConfigDetails.redoValidity ) ) ? { scheduleEndTime_iso: dayjs( checklistDetails.scheduleEndTime_iso ).add( checklistConfigDetails.redoValidity, 'day' ).format() } :{},
     };
 
     let response = await processedChecklist.updateOne( { _id: req.body.payload._id }, updateData );
@@ -495,6 +497,9 @@ export async function redoChecklist( req, res ) {
       // } else {
       //   currentDateTime = dayjs();
       // }
+      if ( req.body?.payload?.answerName ) {
+        userAnswer = userAnswer?.filter( ( ele ) => ele.answer == req.body.payload.answerName );
+      }
       data = {
         checklistId: checklistDetails.sourceCheckList_id,
         checkListName: checklistDetails.checkListName,

package/src/controllers/internalTrax.controller.js

@@ -3734,7 +3734,7 @@ export const downloadInsertPdf = async ( req, res ) => {
       Buffer.from( pdfBuffer );
 
     let pdfName;
-    if ( doc.store_id ) {
+    if ( doc?.store_id ) {
       pdfName = `${safeName(
           doc.store_id + '_' + ( doc.storeName || 'store' ),
       )}.pdf`;

package/src/controllers/mobileTrax.controller.js

@@ -1552,6 +1552,557 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
 
     requestData.questionAnswers = sectionFormat;
     logger.error( { message: requestData.questionAnswers, error: 'QuestionanswersPayload' } );
+
+    if ( requestData.submittype == 'submit' ) {
+      for ( let section of sectionFormat ) {
+        for ( let question of section.questions ) {
+          let mustValidate = !question.linkType || ( question.linkType && question.linkquestionenabled );
+          if ( mustValidate && ( !question.userAnswer || !question.userAnswer.length ) ) {
+            return res.sendError( 'Please Fill All Fields', 400 );
+          }
+        }
+      }
+    }
+
+    next();
+  } catch ( error ) {
+    logger.error( { function: 'sopMobilechecklistMultiSectionFormatter', error: error, body: req.body } );
+    return res.sendError( error, 500 );
+  }
+};
+
+export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next ) {
+  try {
+    let requestData = req.body;
+    requestData.questionAnswers = typeof requestData.questionAnswers == 'string' ? JSON.parse( requestData.questionAnswers ) : requestData.questionAnswers;
+    let getChecklistQA = await processedchecklist.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 1, redoEdit: 1 } );
+    let reqAnswers = requestData.questionAnswers;
+    logger.error( { functionName: 'updatedPayload', message: reqAnswers } );
+    let CLQAnswers = getChecklistQA.questionAnswers;
+
+    if ( requestData.submittype == 'submit' ) {
+      if ( getChecklistQA?.redoEdit ) {
+        requestData.submittype = 'draft';
+      }
+      reqAnswers.forEach( ( reqA ) => {
+        if ( ![ 'multiplechoicemultiple', 'multipleImage', 'image/video' ].includes( reqA?.answerType ) && ( reqA.answerType == 'dropDown' && !reqA.allowMultiple ) ) {
+          if ( ( !reqA.linkType && ( reqA.answer == null || reqA.answer == '' ) ) || ( reqA.linkType && reqA.linkquestionenabled && ( reqA.answer == null || reqA.answer == '' ) ) ) {
+            return res.sendError( 'Please Fill All Fields', 400 );
+          }
+        }
+      } );
+    }
+
+    if ( requestData?.editSubmit && requestData?.editSubmit == 'true' ) {
+      let sampleData = reqAnswers[0];
+      CLQAnswers.forEach( ( section ) => {
+        let requestSection = reqAnswers.filter( ( reqSection ) => reqSection.sectionName == section?.sectionOldName || reqSection.sectionName == section?.sectionName );
+        if ( requestSection.length ) {
+          requestSection.forEach( ( item ) => item.section_id = section.section_id );
+          section.questions.forEach( ( question ) => {
+            let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
+            if ( !sectionQuestion.length ) {
+              let data = { ...requestSection[0] };
+              data.answerType = question.answerType;
+              data.qno = question.qno;
+              data.uniqueqno = question.uniqueqno;
+              data.uniqueqid = question.uniqueqid;
+              data.qname = question.qname;
+              data.oldQname = question?.oldQname || question.qname;
+              data.answer = 'null';
+              data.remarks = '';
+              data.validationAnswer = '';
+              data.Multianswer = [];
+              data.linkType = question.linkType;
+              data.linkquestionenabled = question.linkType;
+              data.linkedQuestion = null;
+              data.showLinked = null;
+              data.parentanswer = '';
+              data.dateRangeType = false;
+              reqAnswers.push( data );
+            }
+          } );
+        } else {
+          section.questions.forEach( ( ele ) => {
+            let data = { ...sampleData };
+            data.section_id = section.section_id;
+            data.sectionName = section.sectionName;
+            data.answerType = ele.answerType;
+            data.qno = ele.qno;
+            data.uniqueqno = ele.uniqueqno;
+            data.uniqueqid = ele.uniqueqid;
+            data.qname = ele.qname;
+            data.oldQname = ele?.oldQname || ele.qname;
+            data.answer = 'null';
+            data.remarks = '';
+            data.validationAnswer = '';
+            data.Multianswer = [];
+            data.linkType = ele.linkType;
+            data.linkquestionenabled = ele.linkType;
+            data.linkedQuestion = null;
+            data.showLinked = null;
+            data.parentanswer = '';
+            data.dateRangeType = false;
+            reqAnswers.push( data );
+          } );
+        }
+      } );
+    }
+
+    let sectionFormat = [];
+    let uniqueSections = {};
+    reqAnswers.forEach( ( item ) => {
+      const key = `${item.section_id}-${item.sectionName}`;
+      if ( !uniqueSections[key] ) {
+        uniqueSections[key] = { id: item.section_id, name: item.sectionName };
+      }
+    } );
+    const uniqueArray = Object.values( uniqueSections );
+    for ( let section of uniqueArray ) {
+      let CLQSection = CLQAnswers.find( ( item ) => item.section_id.toString() == section.id.toString() );
+      if ( CLQSection ) {
+        let newArray = [];
+        let qaAnswers = CLQSection.questions;
+        let requestSection = reqAnswers.filter( ( item ) => item.section_id == section.id );
+        for ( let i = 0; i < requestSection.length; i++ ) {
+          for ( let j = 0; j < qaAnswers.length; j++ ) {
+            if ( requestSection[i].qname == qaAnswers[j].oldQname || requestSection[i].qname == qaAnswers[j].qname ) {
+              if ( qaAnswers[j].answerType == 'yes/no' ) {
+                let qaans = qaAnswers[j].answers;
+                let yn = [];
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
+                  for ( let k = 0; k < qaans.length; k++ ) {
+                    if ( requestSection[i].answer == qaans[k].answer ) {
+                      if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
+                        if ( requestSection[i].validationAnswer ) {
+                          let validateAns = decodeURIComponent( requestSection[i].validationAnswer.split( '?' )[0] );
+                          if ( validateAns.length ) {
+                            let splitImgUrl = validateAns.split( '/' );
+                            if ( splitImgUrl.length > 1 ) {
+                              splitImgUrl.splice( 0, 3 );
+                              qaans[k].validationAnswer = splitImgUrl.join( '/' ) || '';
+                            }
+                          }
+                        }
+                      } else {
+                        // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
+                        qaans[k].validationAnswer = requestSection[i].validationAnswer || '';
+                      }
+                      if ( requestSection[i]?.runAIData && requestSection[i]?.runAIData?.length ) {
+                        qaans[k].runAIData = requestSection[i].runAIData;
+                      }
+                      yn.push( qaans[k] );
+                    }
+                  }
+                }
+                let structure = {};
+                structure.qno = qaAnswers[j].qno;
+                structure.uniqueqno = qaAnswers[j].uniqueqno;
+                structure.uniqueqid = qaAnswers[j].uniqueqid;
+                structure.qname = qaAnswers[j].qname;
+                structure.answerType = qaAnswers[j].answerType;
+                structure.runAI = qaAnswers[j].runAI;
+                structure.runAIDescription = qaAnswers[j].runAIDescription;
+                structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
+                  structure.remarks = requestSection[i].remarks;
+                }
+                structure.answers = qaAnswers[j].answers;
+                structure.userAnswer = yn;
+                structure.linkType = qaAnswers[j].linkType;
+                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
+                structure.parentanswer = requestSection[i].parentanswer;
+                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage || '';
+                structure.multiQuestionReferenceImage = qaAnswers[j].multiQuestionReferenceImage || [];
+                structure.descriptivetype = qaAnswers[j].descriptivetype;
+                structure.compliance = qaAnswers[j]?.compliance;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
+                if ( qaAnswers[j]?.taskId ) {
+                  structure.taskId = qaAnswers[j]?.taskId;
+                  structure.task = true;
+                }
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
+                  structure.redo = false;
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
+                  structure.redo = qaAnswers[j]?.redo;
+                }
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
+                newArray.push( structure );
+              } else if ( qaAnswers[j].answerType == 'multiplechoicesingle' || ( qaAnswers[j].answerType == 'dropdown' && !qaAnswers[j].allowMultiple ) ) {
+                let qaans = qaAnswers[j].answers;
+                let ms = [];
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
+                  for ( let k = 0; k < qaans.length; k++ ) {
+                    if ( requestSection[i].answer == qaans[k].answer ) {
+                      if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
+                        if ( requestSection[i].validationAnswer ) {
+                          let validationAnswer = decodeURIComponent( requestSection[i].validationAnswer.split( '?' )[0] );
+                          if ( validationAnswer.length ) {
+                            let splitImgUrl = validationAnswer.split( '/' );
+                            if ( splitImgUrl.length > 1 ) {
+                              splitImgUrl.splice( 0, 3 );
+                              qaans[k].validationAnswer = splitImgUrl.join( '/' ) || '';
+                            }
+                          }
+                        }
+                      } else {
+                        if ( qaans[k].validationType == 'Capture Multiple Image with description' ) {
+                          qaans[k]['validationImage']=[];
+                          if ( requestSection[i].validationImage.length ) {
+                            for ( let image of requestSection[i].validationImage ) {
+                              let validationAnswer = decodeURIComponent( image.split( '?' )[0] );
+                              if ( validationAnswer.length ) {
+                                let splitImgUrl = validationAnswer.split( '/' );
+                                if ( splitImgUrl.length > 1 ) {
+                                  splitImgUrl.splice( 0, 3 );
+                                  qaans[k].validationImage.push( splitImgUrl.join( '/' ) || '' );
+                                }
+                              };
+                            }
+                          }
+                        }
+                        // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
+                        qaans[k].validationAnswer = requestSection[i].validationAnswer || '';
+                      }
+                      if ( requestSection[i]?.runAIData && requestSection[i]?.runAIData?.length ) {
+                        qaans[k].runAIData = requestSection[i].runAIData;
+                      }
+                      ms.push( qaans[k] );
+                    }
+                  }
+                }
+                let structure = {};
+                structure.qno = qaAnswers[j].qno;
+                structure.uniqueqno = qaAnswers[j].uniqueqno;
+                structure.uniqueqid = qaAnswers[j].uniqueqid;
+                structure.qname = qaAnswers[j].qname;
+                structure.answerType = qaAnswers[j].answerType;
+                structure.runAI = qaAnswers[j].runAI;
+                structure.runAIDescription = qaAnswers[j].runAIDescription;
+                structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
+                  structure.remarks = requestSection[i].remarks;
+                }
+                structure.answers = qaAnswers[j].answers;
+                structure.userAnswer = ms;
+                structure.linkType = qaAnswers[j].linkType;
+                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
+                structure.parentanswer = requestSection[i].parentanswer;
+                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage || '';
+                structure.multiQuestionReferenceImage = qaAnswers[j].multiQuestionReferenceImage || [];
+                structure.descriptivetype = qaAnswers[j].descriptivetype;
+                structure.allowMultiple = qaAnswers[j].allowMultiple;
+                structure.compliance = qaAnswers[j]?.compliance;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
+                if ( qaAnswers[j]?.taskId ) {
+                  structure.taskId = qaAnswers[j]?.taskId;
+                  structure.task = true;
+                }
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
+                  structure.redo = false;
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
+                  structure.redo = qaAnswers[j]?.redo;
+                }
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
+                newArray.push( structure );
+              } else if ( qaAnswers[j].answerType == 'multiplechoicemultiple' || ( qaAnswers[j].answerType == 'dropdown' && qaAnswers[j].allowMultiple ) ) {
+                let qaans = qaAnswers[j].answers;
+                let mcmo = [];
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit || ( getChecklistQA?.redoEdit && qaAnswers[j].answers.some( ( ans ) => ans.redo ) ) ) {
+                  for ( let k = 0; k < qaans.length; k++ ) {
+                    let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
+                    for ( let s = 0; s < separatedArray.length; s++ ) {
+                      if ( ( separatedArray[s].answer == qaans[k].answer ) ) {
+                        console.log( qaans[k].redo, separatedArray[s].redo, qaans[k].redo == separatedArray[s].redo, qaans[k].answer );
+                        if ( ( getChecklistQA?.redoEdit && qaans[k].redo == separatedArray[s].redo ) || !getChecklistQA?.redoEdit ) {
+                          if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
+                            if ( separatedArray[s].validationAnswer ) {
+                              let validationAnswer = decodeURIComponent( separatedArray[s].validationAnswer.split( '?' )[0] );
+                              if ( validationAnswer.length ) {
+                                let splitImgUrl = validationAnswer.split( '/' );
+                                if ( splitImgUrl.length > 1 ) {
+                                  splitImgUrl.splice( 0, 3 );
+                                  qaans[k].validationAnswer = splitImgUrl.join( '/' ) || '';
+                                }
+                              }
+                            }
+                          } else {
+                            // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
+                            qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
+                          }
+                          if ( separatedArray[s]?.runAIData && separatedArray[s]?.runAIData?.length ) {
+                            qaans[k].runAIData = separatedArray[s].runAIData;
+                          }
+                          mcmo.push( qaans[k] );
+                        }
+                      }
+                    }
+                  }
+                }
+                qaAnswers[j].answers.forEach( ( ele ) => {
+                  if ( typeof ele?.redo === 'boolean' && requestData.submittype === 'submit' ) {
+                    ele.redo = false;
+                  }
+                } );
+
+                let structure = {};
+                structure.qno = qaAnswers[j].qno;
+                structure.uniqueqno = qaAnswers[j].uniqueqno;
+                structure.qno = qaAnswers[j].qno;
+                structure.qname = qaAnswers[j].qname;
+                structure.answerType = qaAnswers[j].answerType;
+                structure.runAI = qaAnswers[j].runAI;
+                structure.runAIDescription = qaAnswers[j].runAIDescription;
+                structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
+                  structure.remarks = requestSection[i].remarks;
+                }
+                structure.answers = qaAnswers[j].answers;
+                structure.userAnswer = mcmo;
+                structure.linkType = qaAnswers[j].linkType;
+                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
+                structure.parentanswer = requestSection[i].parentanswer;
+                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage || '';
+                structure.multiQuestionReferenceImage = qaAnswers[j].multiQuestionReferenceImage || [];
+                structure.descriptivetype = qaAnswers[j].descriptivetype;
+                structure.allowMultiple = qaAnswers[j].allowMultiple;
+                structure.compliance = qaAnswers[j]?.compliance;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
+                if ( qaAnswers[j]?.taskId ) {
+                  structure.taskId = qaAnswers[j]?.taskId;
+                  structure.task = true;
+                }
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
+                  structure.redo = false;
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
+                  structure.redo = qaAnswers[j]?.redo;
+                }
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
+                newArray.push( structure );
+              } else if ( [ 'image/video', 'multipleImage' ].includes( qaAnswers[j].answerType ) ) {
+                let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
+                let mcmi = [];
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
+                // for (let k = 0; k < qaans.length; k++) {
+                  for ( let s = 0; s < separatedArray.length; s++ ) {
+                    if ( separatedArray[s].answer && separatedArray[s].answer !='' ) {
+                      let newAnswer = {};
+                      let validationAnswer = decodeURIComponent( separatedArray[s].answer.split( '?' )[0] );
+                      if ( validationAnswer.length ) {
+                        let splitImgUrl = validationAnswer.split( '/' );
+                        if ( splitImgUrl.length > 1 ) {
+                          splitImgUrl.splice( 0, 3 );
+                          newAnswer.answer = splitImgUrl.join( '/' ) || '';
+                        }
+                      }
+
+                      newAnswer.answeroptionNumber = 0;
+                      newAnswer.sopFlag = false;
+                      newAnswer.validation = false;
+                      newAnswer.validationType = '';
+                      newAnswer.referenceImage = '';
+                      newAnswer.allowUploadfromGallery = false;
+                      newAnswer.descriptivetype = '';
+                      newAnswer.showLinked = false;
+                      newAnswer.linkedQuestion = 0;
+                      newAnswer.nestedQuestion = [];
+                      newAnswer.index = s;
+                      newAnswer.runAI = qaAnswers[j].answers[0]?.runAI || false;
+                      newAnswer.runAIFeatures = qaAnswers[j].answers[0]?.runAIFeatures || [];
+                      newAnswer.runAIDescription = qaAnswers[j].answers[0]?.runAIDescription || '';
+                      if ( qaAnswers[j].answerType == 'image/video' ) {
+                        newAnswer.answerType = separatedArray[s].answerType;
+                      }
+                      if ( separatedArray[s]?.runAIData && separatedArray[s]?.runAIData?.length ) {
+                        newAnswer.runAIData = separatedArray[s].runAIData;
+                      }
+                      mcmi.push( newAnswer );
+                    }
+                  }
+                }
+                // }
+                let structure = {};
+                structure.qno = qaAnswers[j].qno;
+                structure.uniqueqno = qaAnswers[j].uniqueqno;
+                structure.uniqueqid = qaAnswers[j].uniqueqid;
+                structure.qname = qaAnswers[j].qname;
+                structure.answerType = qaAnswers[j].answerType;
+                structure.runAI = qaAnswers[j].runAI;
+                structure.runAIDescription = qaAnswers[j].runAIDescription;
+                structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
+                  structure.remarks = requestSection[i].remarks;
+                }
+                structure.answers = qaAnswers[j].answers;
+                structure.userAnswer = mcmi;
+                structure.linkType = qaAnswers[j].linkType;
+                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
+                structure.parentanswer = requestSection[i].parentanswer;
+                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage || '';
+                structure.multiQuestionReferenceImage = qaAnswers[j].multiQuestionReferenceImage || [];
+                structure.descriptivetype = qaAnswers[j].descriptivetype;
+                structure.compliance = qaAnswers[j]?.compliance;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
+                if ( qaAnswers[j]?.taskId ) {
+                  structure.taskId = qaAnswers[j]?.taskId;
+                  structure.task = true;
+                }
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
+                  structure.redo = false;
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
+                  structure.redo = qaAnswers[j]?.redo;
+                }
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
+                newArray.push( structure );
+              } else {
+                let des = [];
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
+                  if ( requestSection[i].answer != 'null' && requestSection[i].answer != '' && requestSection[i].answer != null ) {
+                    let validationAnswer = '';
+                    if ( requestSection[i].answer.split( '?' ).length > 1 || requestSection[i].answer.includes( 'https://' ) ) {
+                      validationAnswer = decodeURIComponent( requestSection[i].answer.split( '?' )[0] );
+                    }
+                    if ( validationAnswer.length ) {
+                      let splitImgUrl = validationAnswer.split( '/' );
+                      if ( splitImgUrl.length > 1 ) {
+                        splitImgUrl.splice( 0, 3 );
+                        requestSection[i].answer = splitImgUrl.join( '/' );
+                      }
+                    }
+                    let ansstructure = {
+                      answer: requestSection[i].answer,
+                      answeroptionNumber: 1,
+                      sopFlag: false,
+                      validation: false,
+                      validationType: '',
+                      validationAnswer: '',
+                      referenceImage: qaAnswers[j].answers[0].referenceImage || '',
+                      multiReferenceImage: qaAnswers[j].answers[0].multiReferenceImage || [],
+                      showLinked: qaAnswers[j].answers[0].showLinked,
+                      linkedQuestion: qaAnswers[j].answers[0].linkedQuestion,
+                      runAI: qaAnswers[j].answers[0]?.runAI || false,
+                      runAIFeatures: qaAnswers[j]?.answers[0]?.runAIFeatures || [],
+                      runAIDescription: qaAnswers[j].answers[0]?.runAIDescription || '',
+                    };
+                    if ( qaAnswers[j].answerType == 'date' ) {
+                      ansstructure.dateRangeType = requestSection[i].dateRangeType || false;
+                      if ( qaAnswers[j].compliance ) {
+                        if ( qaAnswers[j].compliance ) {
+                          let ansArray = requestSection[i].answer.split( ',' );
+                          if ( ansArray.includes( '-' ) ) {
+                            ansArray = requestSection[i].answer.split( '-' );
+                          }
+                          if ( ansArray.length > 1 && ansArray.some( ( date ) => dayjs( date, 'DD MMM YYYY' ).format( 'DD-MM-YYYY' ) >= qaAnswers[j]?.answers[0]?.startDate && dayjs( date, 'DD MMM YYYY' ) <= qaAnswers[j]?.answers[0]?.endDate ) ) {
+                            ansstructure.complianceScore = qaAnswers[j]?.answers[0]?.matchedCount;
+                          } else if ( ansArray.length > 1 && ( dayjs( ansArray?.[0], 'DD MMM YYYY' ).format( 'DD-MM-YYYY' ) >= qaAnswers[j]?.answers[0]?.startDate && dayjs( ansArray?.[1], 'DD MMM YYYY' ).format( 'DD-MM-YYYY' ) <= qaAnswers[j]?.answers[0]?.endDate ) ) {
+                            ansstructure.complianceScore = qaAnswers[j]?.answers[0]?.matchedCount;
+                          } else if ( dayjs( requestSection[i].answer, 'DD MMM YYYY' ) >= qaAnswers[j]?.answers[0]?.startDate && dayjs( requestSection[i].answer, 'DD MMM YYYY' ) <= qaAnswers[j]?.answers[0]?.endDate ) {
+                            ansstructure.complianceScore = qaAnswers[j]?.answers[0]?.matchedCount;
+                          } else {
+                            ansstructure.complianceScore = qaAnswers[j]?.answers[0]?.notMatchedCount;
+                          }
+                        }
+                      }
+                    }
+                    if ( qaAnswers[j].answerType == 'linearscale' ) {
+                      if ( qaAnswers[j].compliance ) {
+                        let linearAnswer = requestSection[i].answer.split( 'to' );
+                        if ( parseInt( linearAnswer?.[0] ) >= qaAnswers[j]?.answers[0]?.minValue && parseInt( linearAnswer?.[1] ) <= qaAnswers[j]?.answers[0]?.maxValue ) {
+                          ansstructure.complianceScore = qaAnswers[j]?.answers[0]?.matchedCount;
+                        } else {
+                          ansstructure.complianceScore = qaAnswers[j]?.answers[0]?.notMatchedCount;
+                        }
+                      }
+                      ansstructure.linearType = qaAnswers[j]?.answers[0]?.linearType;
+                      ansstructure.matchedCount = qaAnswers[j]?.answers[0]?.matchedCount;
+                      ansstructure.notMatchedCount = qaAnswers[j]?.answers[0]?.notMatchedCount;
+                    }
+                    if ( qaAnswers[j].answerType == 'image' ) {
+                      ansstructure.matchedCount = qaAnswers[j]?.answers[0]?.matchedCount;
+                      ansstructure.notMatchedCount = qaAnswers[j]?.answers[0]?.notMatchedCount;
+                    }
+                    if ( requestSection[i]?.runAIData && requestSection[i]?.runAIData?.length ) {
+                      ansstructure.runAIData = requestSection[i].runAIData;
+                    }
+                    des.push( ansstructure );
+                  }
+                }
+                let structure = {};
+                structure.qno = qaAnswers[j].qno;
+                structure.uniqueqno = qaAnswers[j].uniqueqno;
+                structure.uniqueqid = qaAnswers[j].uniqueqid;
+                structure.qname = qaAnswers[j].qname;
+                structure.answerType = qaAnswers[j].answerType;
+                structure.runAI = qaAnswers[j].runAI;
+                structure.runAIDescription = qaAnswers[j].runAIDescription;
+                structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
+                  structure.remarks = requestSection[i].remarks;
+                }
+                structure.answers = qaAnswers[j].answers;
+                structure.userAnswer = des;
+                structure.linkType = qaAnswers[j].linkType;
+                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
+                structure.parentanswer = requestSection[i].parentanswer;
+                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage || '';
+                structure.multiQuestionReferenceImage = qaAnswers[j].multiQuestionReferenceImage || [];
+                structure.descriptivetype = qaAnswers[j].descriptivetype;
+                // structure.parentQuestion = requestSection[i]?.parentQuestion || qaAnswers[j].qno;
+                structure.oldQname = qaAnswers[j]?.oldQname || qaAnswers[j].qname;
+                structure.compliance = qaAnswers[j]?.compliance;
+                if ( qaAnswers[j]?.taskId ) {
+                  structure.taskId = qaAnswers[j]?.taskId;
+                  structure.task = true;
+                }
+                if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'submit' ) {
+                  structure.redo = false;
+                } else if ( typeof qaAnswers[j]?.redo === 'boolean' && requestData.submittype === 'draft' ) {
+                  structure.redo = qaAnswers[j]?.redo;
+                }
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
+                newArray.push( structure );
+              }
+            }
+          }
+        }
+        let sectionData = {
+          'section_id': section.id,
+          'sectionName': section.name,
+          'questions': newArray,
+        };
+        sectionFormat.push( sectionData );
+      }
+    }
+
+
+    requestData.questionAnswers = sectionFormat;
+    logger.error( { message: requestData.questionAnswers, error: 'QuestionanswersPayload' } );
+
+    if ( requestData.submittype == 'submit' ) {
+      for ( let section of sectionFormat ) {
+        for ( let question of section.questions ) {
+          let mustValidate = !question.linkType || ( question.linkType && question.linkquestionenabled );
+          if ( mustValidate && ( !question.userAnswer || !question.userAnswer.length ) ) {
+            return res.sendError( 'Please Fill All Fields', 400 );
+          }
+        }
+      }
+    }
+
     next();
   } catch ( error ) {
     logger.error( { function: 'sopMobilechecklistMultiSectionFormatter', error: error, body: req.body } );
@@ -2315,8 +2866,11 @@ export async function submitChecklist( req, res ) {
             }
           }
         }
-
-        return res.sendSuccess( 'Checklist Updated Successfully' );
+        if ( getchecklist?.[0]?.redoEdit ) {
+          return res.sendSuccess( 'New Questions Added So,Checklist moved back to In Progress. Please complete the updated checklist.' );
+        } else {
+          return res.sendSuccess( 'Checklist Updated Successfully' );
+        }
       } else {
         return res.sendError( 'something went wrong please try again', 500 );
       }