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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.8.30",
+    "version": "3.9.0-nike",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -29,7 +29,7 @@
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
         "puppeteer": "^24.39.1",
-        "tango-api-schema": "^2.5.92",
+        "tango-api-schema": "^2.5.98",
         "tango-app-api-middleware": "^3.5.2",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/download.controller.js

@@ -53,31 +53,31 @@ async function getBrandInfo( clientId ) {
   return brandInfo;
 }
 
-async function streamChecklistZip( res, checklistList, brandInfo, zipBaseName ) {
-  const zipName = `${sanitizeFilenamePart( zipBaseName, 'visit-checklists' )}_${dayjs().format( 'YYYY-MM-DD_HH-mm' )}.zip`;
+// async function streamChecklistZip( res, checklistList, brandInfo, zipBaseName ) {
+//   const zipName = `${sanitizeFilenamePart( zipBaseName, 'visit-checklists' )}_${dayjs().format( 'YYYY-MM-DD_HH-mm' )}.zip`;
 
-  res.status( 200 );
-  res.setHeader( 'Content-Type', 'application/zip' );
-  res.setHeader( 'Content-Disposition', `attachment; filename="${zipName.replace( /"/g, '\\"' )}"` );
-  res.setHeader( 'Cache-Control', 'private, no-cache' );
+//   res.status( 200 );
+//   res.setHeader( 'Content-Type', 'application/zip' );
+//   res.setHeader( 'Content-Disposition', `attachment; filename="${zipName.replace( /"/g, '\\"' )}"` );
+//   res.setHeader( 'Cache-Control', 'private, no-cache' );
 
-  const archive = archiver( 'zip', { zlib: { level: 9 } } );
+//   const archive = archiver( 'zip', { zlib: { level: 9 } } );
 
-  archive.on( 'error', ( err ) => {
-    throw err;
-  } );
+//   archive.on( 'error', ( err ) => {
+//     throw err;
+//   } );
 
-  archive.pipe( res );
+//   archive.pipe( res );
 
-  for ( const checklistDetails of checklistList ) {
-    const templateData = buildVisitChecklistTemplateData( checklistDetails, brandInfo );
-    const pdfBuffer = await generateVisitChecklistPDF( templateData );
-    const pdfName = `${sanitizeFilenamePart( checklistDetails.storeName || checklistDetails.store_id || checklistDetails._id, 'store' )}_${sanitizeFilenamePart( checklistDetails.checkListName || 'Visit Checklist' )}.pdf`;
-    archive.append( Buffer.isBuffer( pdfBuffer ) ? pdfBuffer : Buffer.from( pdfBuffer ), { name: pdfName } );
-  }
+//   for ( const checklistDetails of checklistList ) {
+//     const templateData = buildVisitChecklistTemplateData( checklistDetails, brandInfo );
+//     const pdfBuffer = await generateVisitChecklistPDF( templateData );
+//     const pdfName = `${sanitizeFilenamePart( checklistDetails.storeName || checklistDetails.store_id || checklistDetails._id, 'store' )}_${sanitizeFilenamePart( checklistDetails.checkListName || 'Visit Checklist' )}.pdf`;
+//     archive.append( Buffer.isBuffer( pdfBuffer ) ? pdfBuffer : Buffer.from( pdfBuffer ), { name: pdfName } );
+//   }
 
-  await archive.finalize();
-}
+//   await archive.finalize();
+// }
 
 async function createChecklistZipBuffer( checklistList, brandInfo ) {
   const output = new PassThrough();

package/src/controllers/gallery.controller.js

@@ -139,6 +139,7 @@ export async function getcustomerunattendedlist( req, res ) {
     }
     let url = JSON.parse( process.env.LAMBDAURL );
     let resultData = await LamdaServiceCall( url.customerUnattended, req.body );
+    console.log( '🚀 ~ getcustomerunattendedlist ~ url.customerUnattended:', url.customerUnattended );
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
         return res.sendSuccess( resultData );
@@ -451,83 +452,37 @@ export async function redoChecklist( req, res ) {
     let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.payload.qno );
 
     let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
-    let answerIndex = req.body.payload?.answerIndex;
-    let isSingleAnswerRedo = answerIndex != null;
-
-    if ( !isSingleAnswerRedo ) {
-      // if ( checklistDetails.client_id == '458' ) {
-      data.answers.forEach( ( item ) => {
-        if ( item.showLinked ) {
-          item.nestedQuestion.forEach( ( ele ) => {
-            let eleIndex = question[sectionIndex].questions.findIndex( ( qn ) => qn.qno == parseInt( ele ) );
-            let element = { ...question[sectionIndex].questions[eleIndex], redo: true, redoComment: '', linkquestionenabled: false };
-            question[sectionIndex].questions[eleIndex] = element;
-            question[sectionIndex].questions[eleIndex].userAnswer = [];
-            question[sectionIndex].questions[eleIndex].remarks = '';
-          } );
-        }
-      } );
-      // data.answers.forEach( ( item ) => {
-      //   if ( item.showLinked ) {
-      //     item.nestedQuestion = [];
-      //     item.showLinked = false;
-      //     item.linkedQuestion = 0;
-      //   }
-      // } );
-      // }
-    }
-    let userAnswer = Array.isArray( data.userAnswer ) ? [ ...data.userAnswer ] : [];
-
-    question[sectionIndex].questions[findQuestion] = data;
-    if ( isSingleAnswerRedo ) {
-      let targetQuestion = question[sectionIndex].questions[findQuestion];
-      let targetUserAnswerIndex = targetQuestion.userAnswer?.findIndex( ( ele ) => ele.answer == req.body.payload.answerName );
-      let targetUserAnswer = targetQuestion.userAnswer[targetUserAnswerIndex];
-      if ( targetUserAnswer && Array.isArray( targetQuestion.answers ) ) {
-        let matchedAnsIdx = targetQuestion.answers.findIndex( ( ans ) => {
-          // if ( targetUserAnswer.no !== undefined && ans.index === targetUserAnswer.no ) return true;
-          // if ( targetUserAnswer.index !== undefined && ans.index === targetUserAnswer.index ) return true;
-          // if ( targetUserAnswer.answeroptionNumber !== undefined && ans.answeroptionNumber === targetUserAnswer.answeroptionNumber ) return true;
-          return ans.answer === targetUserAnswer.answer;
+    // if ( checklistDetails.client_id == '458' ) {
+    data.answers.forEach( ( item ) => {
+      if ( item.showLinked ) {
+        item.nestedQuestion.forEach( ( ele ) => {
+          let eleIndex = question[sectionIndex].questions.findIndex( ( qn ) => qn.qno == parseInt( ele ) );
+          let element = { ...question[sectionIndex].questions[eleIndex], redo: true, redoComment: '', linkquestionenabled: false };
+          question[sectionIndex].questions[eleIndex] = element;
+          question[sectionIndex].questions[eleIndex].userAnswer = [];
+          question[sectionIndex].questions[eleIndex].remarks = '';
         } );
-        if ( matchedAnsIdx !== -1 ) {
-          targetQuestion.answers[matchedAnsIdx].redo = true;
-          targetQuestion.answers[matchedAnsIdx].validationAnswer = '';
-          targetQuestion.remarks = '';
-        }
-        targetQuestion.userAnswer.splice( targetUserAnswerIndex, 1 );
       }
+    } );
+    // data.answers.forEach( ( item ) => {
+    //   if ( item.showLinked ) {
+    //     item.nestedQuestion = [];
+    //     item.showLinked = false;
+    //     item.linkedQuestion = 0;
+    //   }
+    // } );
+    // }
+    let userAnswer = data.userAnswer;
 
-      let currentQno = req.body.payload.qno;
-      let parentQIndex = -1;
-      // let parentAnsIndex = -1;
-      for ( let i = 0; i < question[sectionIndex].questions.length; i++ ) {
-        let parentAnswers = question[sectionIndex].questions[i].answers || [];
-        let foundAnsIdx = parentAnswers.findIndex( ( ans ) => Array.isArray( ans?.nestedQuestion ) && ans.nestedQuestion.some( ( ele ) => parseInt( ele ) == currentQno ) );
-        if ( foundAnsIdx !== -1 ) {
-          parentQIndex = i;
-          // parentAnsIndex = foundAnsIdx;
-          break;
-        }
-      }
-      if ( parentQIndex !== -1 ) {
-        let parentQno = question[sectionIndex].questions[parentQIndex].qno;
-        question[sectionIndex].questions[findQuestion].parentQno = parentQno;
-        // question[sectionIndex].questions[findQuestion].remarks = '';
-        // question[sectionIndex].questions[parentQIndex].answers[parentAnsIndex].redo = true;
-        // question[sectionIndex].questions[parentQIndex].answers[parentAnsIndex].validationAnswer = '';
-      }
-    } else {
-      question[sectionIndex].questions[findQuestion].userAnswer = [];
-      question[sectionIndex].questions[findQuestion].remarks = '';
-    }
+    question[sectionIndex].questions[findQuestion] = data;
+    question[sectionIndex].questions[findQuestion].userAnswer = [];
+    question[sectionIndex].questions[findQuestion].remarks = '';
     checklistDetails.questionAnswers = question;
     let updateData = {
-      checklistStatus: checklistDetails.checklistStatus != 'submit' ? checklistDetails.checklistStatus : 'open',
+      checklistStatus: 'open',
       redoStatus: true,
       reinitiateStatus: true,
       questionAnswers: question,
-      ...( checklistDetails.checklistStatus != 'submit' && checklistDetails.redoStatus ) ? { redoEdit: true } : {},
     };
 
     let response = await processedChecklist.updateOne( { _id: req.body.payload._id }, updateData );
@@ -786,9 +741,8 @@ export async function getLogs( req, res ) {
       let initiatedstatus = {
         actionType: 'initation',
         userName: data.initiatedBy,
-        Timestamp: data.initiatedTime,
+        Timestamp: dayjs.utc( data.initiatedTime ),
         description: data.checklistDescription,
-
       };
       response.push( initiatedstatus );
       response.push( userAnswer );

package/src/controllers/handlebar-helper.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-invalid-this */
 import Handlebars from 'handlebars';
 import fs from 'fs';
 

package/src/controllers/internalTrax.controller.js

@@ -325,7 +325,7 @@ export async function PCLconfigCreation( req, res ) {
                 },
               } );
               let getSections = await CLquestions.aggregate( sectionQuery );
-              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'storehygienemonitoring' ].includes( getCLconfig.checkListType ) ) {
+              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'storehygienemonitoring', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( getCLconfig.checkListType ) ) {
                 if ( getSections.length ) {
                   for ( let element3 of getSections ) {
                     let collectQuestions = {};
@@ -650,11 +650,11 @@ export async function PCLconfigCreation( req, res ) {
                       // }
                       }
                     } else {
-                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( getCLconfig.checkListType ) ) {
+                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert' ].includes( getCLconfig.checkListType ) ) {
                         let storeNameList = allQuestion.map( ( item ) => item.store_id );
-                        let storeDetails = await storeService.find( { clientId: getCLconfig.client_id, status: 'active', ...( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
+                        let storeDetails = await storeService.find( { clientId: getCLconfig.client_id, status: 'active', ...( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
                         let storeList = storeDetails.map( ( store ) => store.storeId );
-                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( getCLconfig.checkListType ) ) {
+                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( getCLconfig.checkListType ) ) {
                           allQuestion = allQuestion.filter( ( ele ) => storeList.includes( ele?.store_id ) );
                         } else {
                           allQuestion = storeDetails.map( ( item ) => {
@@ -688,7 +688,7 @@ export async function PCLconfigCreation( req, res ) {
                           client_id: getCLconfig.client_id,
                           aiStoreList: allQuestion.length ? allQuestion.map( ( store ) => store.store_id ) : [],
                         };
-                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( getCLconfig.checkListType ) ) {
+                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( getCLconfig.checkListType ) ) {
                           let processData = {
                             aiStoreList: allQuestion.length ? allQuestion.map( ( store ) => {
                               return { storeName: store.storeName, storeId: store.store_id, events: store.events };
@@ -929,7 +929,7 @@ async function insertData( requestData ) {
                 },
               } );
               let getSections = await CLquestions.aggregate( sectionQuery );
-              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( getCLconfig.checkListType ) ) {
+              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( getCLconfig.checkListType ) ) {
                 if ( getSections.length ) {
                   for ( let element3 of getSections ) {
                     let collectQuestions = {};
@@ -1224,11 +1224,11 @@ async function insertData( requestData ) {
                         // }
                       }
                     } else {
-                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( getCLconfig.checkListType ) ) {
+                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( getCLconfig.checkListType ) ) {
                         let storeNameList = allQuestion.map( ( item ) => item.store_id );
-                        let storeDetails = await storeService.find( { clientId: getCLconfig.client_id, status: 'active', ...( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
+                        let storeDetails = await storeService.find( { clientId: getCLconfig.client_id, status: 'active', ...( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
                         let storeList = storeDetails.map( ( store ) => store.storeId );
-                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( getCLconfig.checkListType ) ) {
+                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( getCLconfig.checkListType ) ) {
                           allQuestion = allQuestion.filter( ( ele ) => storeList.includes( ele?.store_id ) );
                         } else {
                           allQuestion = storeDetails.map( ( item ) => {
@@ -1262,7 +1262,7 @@ async function insertData( requestData ) {
                           client_id: getCLconfig.client_id,
                           aiStoreList: allQuestion.length ? allQuestion.map( ( store ) => store.store_id ) : [],
                         };
-                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( getCLconfig.checkListType ) ) {
+                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( getCLconfig.checkListType ) ) {
                           let processData = {
                             aiStoreList: allQuestion.length ? allQuestion.map( ( store ) => {
                               return { storeName: store.storeName, storeId: store.store_id, events: store.events };
@@ -2643,6 +2643,9 @@ export async function updateRunAI( req, res ) {
     if ( !req.body.qName ) {
       return res.sendError( 'Question name is required', 400 );
     }
+    if ( !req.body.userAnswer ) {
+      return res.sendError( 'answer is required', 400 );
+    }
     let getDetails = await processedchecklist.findOne( { _id: req.body.id } );
     if ( !getDetails ) {
       return res.sendError( 'No data found', 204 );
@@ -2651,7 +2654,7 @@ export async function updateRunAI( req, res ) {
     let updateData = {};
 
     for ( let k of Object.keys( req.body.data ) ) {
-      let keyPath = `questionAnswers.$[section].questions.$[question].userAnswer.0.${k}`;
+      let keyPath = `questionAnswers.$[section].questions.$[question].userAnswer.$[userAnswer].${k}`;
       updateData[keyPath] = req.body.data[k];
     }
 
@@ -2662,7 +2665,9 @@ export async function updateRunAI( req, res ) {
           arrayFilters: [
             { 'section.section_id': new ObjectId( req.body.sectionId ) },
             { 'question.qname': req.body.qName },
+            { 'userAnswer.answer': req.body.userAnswer },
           ],
+          strict: false,
         },
     );
     return res.sendSuccess( 'RunAI details updated successfully' );

package/src/controllers/mobileTrax.controller.js

@@ -1082,15 +1082,12 @@ 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, redoEdit: 1 } );
+    let getChecklistQA = await processedchecklist.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 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 == '' ) ) ) {
@@ -1310,35 +1307,27 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 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( '/' ) || '';
-                              }
+                    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( '/' ) || '';
                             }
                           }
-                        } else {
-                        // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
-                          qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
                         }
+                      } else {
+                        // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
+                        qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
                       }
 
                       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;
@@ -2183,7 +2172,6 @@ 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' );
-      updateData.redoEdit = false;
       if ( requestData.deviceDetails && requestData.deviceDetails != '' ) {
         updateData.deviceDetails =JSON.parse( requestData.deviceDetails );
       }
@@ -2456,8 +2444,7 @@ export async function submitTask( req, res ) {
             'storeResponseTime': currentDateTime.format( 'HH:mm:ss - MMM DD, YYYY' ),
             'message_mode': 'retriggered',
           };
-          let sqsResponse = await sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).storeHygiene}`, JSON.stringify( sqsData ) );
-          console.log( sqsResponse );
+          sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).storeHygiene}`, JSON.stringify( sqsData ) );
         }
         if ( !excludedChecklists.includes( checklist.checkListName ) ) {
           const query1 = [
@@ -3633,7 +3620,7 @@ export async function questionList( req, res ) {
                   checkvalidation = answer.validationAnswer;
                 }
               }
-              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation, ...( answer.redo && { redo: answer.redo } ) } );
+              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
             }
 

package/src/controllers/teaxFlag.controller.js

@@ -608,7 +608,7 @@ export const flagCardsV1 = async ( req, res ) => {
         {
           client_id: clientId,
           publish: true,
-          checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] },
+          checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] },
         },
         { checkListType: 1 },
     );
@@ -2743,7 +2743,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           $or: [
             { questionFlag: { $gte: 1 } },
             { timeFlag: { $gte: 1 } },
-            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] } },
+            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] } },
             {
               runAIQuestionCount: { $gte: 1 },
             },
@@ -2945,7 +2945,7 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
           {
             client_id: requestData.clientId,
             publish: true,
-            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] },
+            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] },
           },
           { checkListType: 1 },
       );
@@ -3047,7 +3047,7 @@ export const flagTablesV2 = async ( req, res ) => {
     }
 
     if ( requestData?.filter === 'all' ) {
-      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] } } ] } );
+      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] } } ] } );
     } else if ( requestData?.filter === 'question' ) {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { questionFlag: { $gte: 1 } } );
@@ -3055,7 +3055,7 @@ export const flagTablesV2 = async ( req, res ) => {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { timeFlag: { $gte: 1 } } );
     } else if ( requestData?.filter === 'detection' ) {
-      findAndQuery.push( { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] } } );
+      findAndQuery.push( { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] } } );
     } else if ( requestData?.filter === 'runAI' ) {
       if ( req.body.runAIChecklistName ) {
         findAndQuery.push( { checkListName: { $in: req.body.runAIChecklistName } } );

package/src/controllers/trax.controller.js

@@ -1729,6 +1729,7 @@ export const updateConfigure = async ( req, res ) => {
       owner: inputBody?.checkListDetails?.owner || [],
       restrictAttendance: inputBody?.checkListDetails?.restrictAttendance || false,
       enableNewDeployedStore: inputBody?.checkListDetails?.enableNewDeployedStore || false,
+      redoValidity: inputBody?.checkListDetails?.redoValidity || 7,
     };
 
     if ( inputBody?.checkListDetails?.approver.length ) {
@@ -3907,6 +3908,8 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
               }
             }
             getsubmitDetails[0].questionAnswers = sectionList;
+            getsubmitDetails[0].scheduleEndTime = getCLconfig.scheduleEndTime;
+            getsubmitDetails[0].scheduleEndTime_iso = endTimeIso.format();
             if ( modifiedCount ) {
               getsubmitDetails[0].checklistStatus = 'inprogress';
               getsubmitDetails[0].date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
@@ -4030,6 +4033,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         }, { userId: 1, store_id: 1 } );
 
         if ( inprogressData.length ) {
+          await processedchecklist.updateMany( { _id: { $in: inprogressData.map( ( ele ) => new ObjectId( ele._id ) ) } }, { scheduleEndTime: getCLconfig.scheduleEndTime, scheduleEndTime_iso: endTimeIso.format() } );
           inprogressData.forEach( ( item ) => {
             let checkData = assignUserList.find( ( ele ) => ele.userId.toString() == item.userId.toString() && ele.store_id == item.store_id );
             if ( !checkData ) {
@@ -4127,7 +4131,7 @@ async function updateOpenSearch( user, data ) {
 export const aiChecklist = async ( req, res ) => {
   try {
     let storeDetails = await storeService.count( { clientId: req.query.clientId, status: 'active' } );
-    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ];
+    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ];
     let checklistDetails = [];
     let publishList = [];
     let unpublishList = [];
@@ -4140,7 +4144,7 @@ export const aiChecklist = async ( req, res ) => {
     checklistDetails = [ ...publishList, ...unpublishList ];
 
     checklistDetails.forEach( ( item ) => {
-      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( item.checkListType ) ) {
+      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( item.checkListType ) ) {
         item.storeCount = storeDetails;
       }
     } );