tango-app-api-trax 3.8.23 → 3.8.24-nike

package/src/controllers/mobileTrax.controller.js

@@ -118,7 +118,7 @@ export async function startChecklist( req, res ) {
         $and: [
           { _id: new ObjectId( requestData.processedcheckListId ) },
           { userId: req.user._id },
-          { date_string: requestData.date },
+          { $or: [ { date_string: requestData.date }, { redoStatus: true } ] },
         ],
       },
     } );
@@ -137,7 +137,9 @@ export async function startChecklist( req, res ) {
     let updateQuery = {};
     updateQuery._id = new ObjectId( requestData.processedcheckListId );
     updateQuery.userId = req.user._id;
-    updateQuery.date_string = requestData.date;
+    if ( getBeforeChecklist?.[0]?.date_string == dayjs().format( 'YYYY-MM-DD' ) ) {
+      updateQuery.date_string = requestData.date;
+    }
 
     if ( PCLQusestion && PCLQusestion?.questionAnswers && PCLQusestion?.questionAnswers.length > 0 ) {
       await PCLQusestion.questionAnswers.forEach( ( section ) => {
@@ -317,7 +319,7 @@ export async function startChecklist( req, res ) {
       return res.sendError( 'something went wrong please try again', 500 );
     }
   } catch ( e ) {
-    // console.log( 'e =>', e );
+    console.log( 'e =>', e );
     logger.error( { function: 'startChecklist', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
@@ -467,7 +469,7 @@ export async function startTask( req, res ) {
     } );
     const getUpdatedTask = await processedTask.aggregate( findQuery );
 
-
+    let cdnurl = JSON.parse( process.env.CDNURL );
     if ( !( task.checkListFrom && task.checkListFrom == 'api' ) ) {
       // const bucket = JSON.parse( process.env.BUCKET );
       await Promise.all(
@@ -661,12 +663,12 @@ export async function sopMobilechecklistQuestionValidatorv1( req, res, next ) {
             let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
             if ( sectionQuestion.length ) {
               if ( requestData.submittype == 'submit' ) {
-                if ( ( [ 'multipleImage', 'multiplechoicemultiple' ].includes( question.answerType ) || ( question.answerType =='dropdown' && question.allowMultiple ) ) ) {
+                if ( ( [ 'multipleImage', 'multiplechoicemultiple', 'image/video' ].includes( question.answerType ) || ( question.answerType =='dropdown' && question.allowMultiple ) ) ) {
                   if ( ( !sectionQuestion[0].linkType || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled ) ) && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
                     validationCount++;
                   }
                 } else {
-                  if ( ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) && ( question.answerType =='dropdown' && !question.allowMultiple ) ) && ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) ) {
+                  if ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) {
                     validationCount++;
                   }
                 }
@@ -1082,12 +1084,15 @@ export async function sopMobilechecklistMultiSectionFormatterv1( 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 } );
+    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 == '' ) ) ) {
@@ -1172,26 +1177,31 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
           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 qaans = JSON.parse( JSON.stringify( qaAnswers[j].answers ) );
                 let yn = [];
-                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( '/' ) || '';
+                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 || '';
                       }
-                    } 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] );
                     }
-                    yn.push( qaans[k] );
                   }
                 }
                 let structure = {};
@@ -1203,7 +1213,9 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.runAI = qaAnswers[j].runAI;
                 structure.runAIDescription = qaAnswers[j].runAIDescription;
                 structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
-                structure.remarks = requestSection[i].remarks;
+                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;
@@ -1229,41 +1241,46 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 };
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicesingle' || ( qaAnswers[j].answerType == 'dropdown' && !qaAnswers[j].allowMultiple ) ) {
-                let qaans = qaAnswers[j].answers;
+                let qaans = JSON.parse( JSON.stringify( qaAnswers[j].answers ) ); ;
                 let ms = [];
-                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( '/' ) || '';
+                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( '/' ) || '' );
-                              }
-                            };
+                      } 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 || '';
                       }
-                      // 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] );
                     }
-                    ms.push( qaans[k] );
                   }
                 }
                 let structure = {};
@@ -1275,7 +1292,9 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.runAI = qaAnswers[j].runAI;
                 structure.runAIDescription = qaAnswers[j].runAIDescription;
                 structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
-                structure.remarks = requestSection[i].remarks;
+                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;
@@ -1302,32 +1321,44 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 };
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicemultiple' || ( qaAnswers[j].answerType == 'dropdown' && qaAnswers[j].allowMultiple ) ) {
-                let qaans = qaAnswers[j].answers;
+                let qaans = JSON.parse( JSON.stringify( qaAnswers[j].answers ) );
                 let mcmo = [];
-                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 ) {
-                      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( '/' ) || '';
+                if ( ( getChecklistQA?.redoEdit && qaAnswers[j].redo == requestSection[i].redo ) || !getChecklistQA?.redoEdit ) {
+                  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 ) ) {
+                        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;
                           }
                         }
-                      } else {
-                        // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
-                        qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
+                        mcmo.push( qaans[k] );
                       }
-
-                      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;
@@ -1337,7 +1368,9 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.runAI = qaAnswers[j].runAI;
                 structure.runAIDescription = qaAnswers[j].runAIDescription;
                 structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
-                structure.remarks = requestSection[i].remarks;
+                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;
@@ -1366,37 +1399,42 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
               } 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( '/' ) || '';
+                  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;
+                      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 );
                     }
-                    mcmi.push( newAnswer );
                   }
                 }
                 // }
@@ -1409,7 +1447,9 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.runAI = qaAnswers[j].runAI;
                 structure.runAIDescription = qaAnswers[j].runAIDescription;
                 structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
-                structure.remarks = requestSection[i].remarks;
+                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;
@@ -1436,71 +1476,76 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 newArray.push( structure );
               } else {
                 let des = [];
-                if ( requestSection[i].answer != 'null' && requestSection[i].answer != '' && requestSection[i].answer != null ) {
-                  let validationAnswer = '';
-                  if ( requestSection[i].answer.split( '?' ).length > 1 ) {
-                    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( '/' );
+                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] );
                     }
-                  }
-                  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 ( 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 ) {
-                        let ansArray = requestSection[i].answer.split( ',' );
-                        if ( ansArray.includes( '-' ) ) {
-                          ansArray = requestSection[i].answer.split( '-' );
+                        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 ( 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 ) {
+                      }
+                    }
+                    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 == '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;
-                      }
+                    if ( qaAnswers[j].answerType == 'image' ) {
+                      ansstructure.matchedCount = qaAnswers[j]?.answers[0]?.matchedCount;
+                      ansstructure.notMatchedCount = 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 );
                   }
-                  des.push( ansstructure );
                 }
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
@@ -1511,7 +1556,9 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 structure.runAI = qaAnswers[j].runAI;
                 structure.runAIDescription = qaAnswers[j].runAIDescription;
                 structure.allowUploadfromGallery = qaAnswers[j].allowUploadfromGallery;
-                structure.remarks = requestSection[i].remarks;
+                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;
@@ -1552,6 +1599,18 @@ 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 } );
@@ -1932,7 +1991,7 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 let des = [];
                 if ( requestSection[i].answer != 'null' && requestSection[i].answer != '' && requestSection[i].answer != null ) {
                   let validationAnswer = '';
-                  if ( requestSection[i].answer.split( '?' ).length > 1 ) {
+                  if ( requestSection[i].answer.split( '?' ).length > 1 || requestSection[i].answer.includes( 'https://' ) ) {
                     validationAnswer = decodeURIComponent( requestSection[i].answer.split( '?' )[0] );
                   }
                   if ( validationAnswer.length ) {
@@ -2031,7 +2090,13 @@ function QuestionFlag( req, res ) {
 
 async function updateRecurringFlagTracker( processedChecklist, questionAnswers, currentDateTime ) {
   try {
-    if ( !processedChecklist?.store_id || !processedChecklist?.sourceCheckList_id ) return;
+    if ( !processedChecklist?.sourceCheckList_id ) return;
+
+    const isUserBased = processedChecklist?.coverage === 'user';
+    const storeId = isUserBased ? '' : ( processedChecklist?.store_id || '' );
+    const userId = isUserBased ? ( processedChecklist?.userId ? String( processedChecklist.userId ) : ( processedChecklist?.userEmail || '' ) ) : '';
+    if ( !isUserBased && !storeId ) return;
+    if ( isUserBased && !userId ) return;
 
     const today = currentDateTime ? currentDateTime.format( 'YYYY-MM-DD' ) : dayjs().format( 'YYYY-MM-DD' );
     const yesterday = dayjs( today, 'YYYY-MM-DD' ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
@@ -2039,7 +2104,7 @@ async function updateRecurringFlagTracker( processedChecklist, questionAnswers,
     const trackerKeyBase = {
       client_id: processedChecklist.client_id,
       sourceCheckList_id: processedChecklist.sourceCheckList_id,
-      store_id: processedChecklist.store_id,
+      ...( isUserBased ) ? { user_id: userId } : { store_id: storeId },
     };
 
     const existingRows = await recurringFlagTracker.find( trackerKeyBase, { section_id: 1, qno: 1, consecutiveCount: 1, lastFlaggedDate: 1 } );
@@ -2059,7 +2124,7 @@ async function updateRecurringFlagTracker( processedChecklist, questionAnswers,
         const flaggedNow = Array.isArray( question?.userAnswer ) && question.userAnswer.some( ( a ) => a?.sopFlag === true );
         const key = `${sectionId}::${qno}`;
         const existing = existingMap.get( key );
-
+        console.log( flaggedNow, 'test' );
         if ( flaggedNow ) {
           let newCount;
           if ( !existing ) {
@@ -2079,8 +2144,11 @@ async function updateRecurringFlagTracker( processedChecklist, questionAnswers,
               filter: { ...trackerKeyBase, section_id: sectionId, qno },
               update: {
                 $set: {
+                  coverage: isUserBased ? 'user' : 'store',
                   checkListName: processedChecklist.checkListName,
-                  storeName: processedChecklist.storeName,
+                  storeName: isUserBased ? '' : ( processedChecklist.storeName || '' ),
+                  userName: processedChecklist.userName || '',
+                  userEmail: processedChecklist.userEmail || '',
                   sectionName: section?.sectionName || '',
                   qname: question?.qname || '',
                   consecutiveCount: newCount,
@@ -2103,9 +2171,13 @@ async function updateRecurringFlagTracker( processedChecklist, questionAnswers,
         }
       } );
     } );
-
     if ( ops.length ) {
-      await recurringFlagTracker.bulkWrite( ops );
+      try {
+        let data = await recurringFlagTracker.bulkWrite( ops, { ordered: false } );
+        console.log( 'recurringFlagTracker bulkWrite result', data );
+      } catch ( bulkErr ) {
+        logger.error( { function: 'updateRecurringFlagTracker.bulkWrite', code: bulkErr?.code, message: bulkErr?.message, writeErrors: bulkErr?.writeErrors } );
+      }
     }
   } catch ( error ) {
     logger.error( { function: 'updateRecurringFlagTracker', error } );
@@ -2159,6 +2231,9 @@ export async function submitChecklist( req, res ) {
       let flagCount = QuestionFlag( req, res );
       updateData.questionFlag = flagCount;
       updateData.submitTime_string = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+      if ( getchecklist?.[0]?.redoEdit != undefined ) {
+        updateData.redoEdit = false;
+      }
       if ( requestData.deviceDetails && requestData.deviceDetails != '' ) {
         updateData.deviceDetails =JSON.parse( requestData.deviceDetails );
       }
@@ -2247,6 +2322,7 @@ export async function submitChecklist( req, res ) {
         // };
         // await detectionService.create( detectionData );
         if ( requestData.submittype == 'submit' ) {
+          console.log( checklistDetails?.recurringFlag?.notifyType?.length );
           if ( checklistDetails?.recurringFlag?.notifyType?.length ) {
             updateRecurringFlagTracker( getchecklist[0], requestData.questionAnswers, currentDateTime );
           }
@@ -2430,7 +2506,8 @@ export async function submitTask( req, res ) {
             'storeResponseTime': currentDateTime.format( 'HH:mm:ss - MMM DD, YYYY' ),
             'message_mode': 'retriggered',
           };
-          sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).storeHygiene}`, JSON.stringify( sqsData ) );
+          let sqsResponse = await sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).storeHygiene}`, JSON.stringify( sqsData ) );
+          console.log( sqsResponse );
         }
         if ( !excludedChecklists.includes( checklist.checkListName ) ) {
           const query1 = [
@@ -2935,6 +3012,9 @@ export async function dashboardv1( req, res ) {
     // const { store_id, date } = req.query;
     const { date } = req.query;
     const userId = req.user._id;
+    let fromDate = new Date( req.query.date );
+    let toDate = new Date( req.query.date );
+    toDate.setDate( toDate.getDate() + 1 );
 
     // //Get User Based Checklist //
     const clientId = { client_id: req.user.clientId };
@@ -2951,7 +3031,7 @@ export async function dashboardv1( req, res ) {
       ...storeMatch,
     };
     const buildPipeline = ( matchExtraConditions = {} ) => [
-      { $match: { ...baseMatch, ...matchExtraConditions } },
+      { $match: { $or: [ { ...baseMatch, ...matchExtraConditions }, { $and: [ { redoStatus: true }, { scheduleStartTime_iso: { $lt: toDate } }, { scheduleEndTime_iso: { $gte: fromDate } }, { userId }, { ...storeMatch } ] } ] } },
       {
         $facet: {
           total: [ { $count: 'total' } ],
@@ -2971,9 +3051,7 @@ export async function dashboardv1( req, res ) {
       },
     ];
 
-    let fromDate = new Date( req.query.date );
-    let toDate = new Date( req.query.date );
-    toDate.setDate( toDate.getDate() + 1 );
+
     const taskBaseMatch = {
       // eslint-disable-next-line camelcase
       // store_id,
@@ -3022,6 +3100,8 @@ export async function dashboardv1( req, res ) {
       processedTask.aggregate( taskQuery ),
     ] );
 
+    console.log( checklistResult );
+
     const checklistResultData =
       checklistResult.status === 'fulfilled' ?
         processResult( checklistResult.value ) :
@@ -3151,6 +3231,9 @@ export async function checklistv1( req, res ) {
     // const { store_id, date, checklistStatus, searchValue } = req.query;
     const { date, checklistStatus, searchValue } = req.query;
     const userId = req.user._id;
+    let fromDate = new Date( req.query.date );
+    let toDate = new Date( req.query.date );
+    toDate.setDate( toDate.getDate() + 1 );
 
     // Get User Based Checklist //
     const clientId = { client_id: req.user.clientId };
@@ -3162,16 +3245,18 @@ export async function checklistv1( req, res ) {
         // eslint-disable-next-line camelcase
         // { store_id },
         { userId },
-        { date_string: date },
+        { $or: [ { date_string: date }, { $and: [ { redoStatus: true }, { scheduleStartTime_iso: { $lt: toDate } }, { scheduleEndTime_iso: { $gte: fromDate } } ] } ] },
         { timeFlagStatus: true },
         ...matchExtraConditions,
         clientId,
         storeMatch,
       ];
+
       if ( checklistStatus ) {
         matchConditions.push( { checklistStatus } );
       }
 
+
       const pipeline = [
         { $match: { $and: matchConditions } },
         ...( searchValue ?
@@ -3224,9 +3309,7 @@ export async function checklistv1( req, res ) {
       return pipeline;
     };
 
-    let fromDate = new Date( req.query.date );
-    let toDate = new Date( req.query.date );
-    toDate.setDate( toDate.getDate() + 1 );
+
     const taskBuildPipeline = ( matchExtraConditions = [], projectExtraConditions = {} ) => {
       const matchConditions = [
         // eslint-disable-next-line camelcase
@@ -3606,7 +3689,7 @@ export async function questionList( req, res ) {
                   checkvalidation = answer.validationAnswer;
                 }
               }
-              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
+              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation, ...( answer.redo && { redo: answer.redo } ) } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
             }