tango-app-api-trax 3.5.1-alpha-3 → 3.5.2-alpha-2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.5.1-alpha-3",
+    "version": "3.5.2-alpha-2",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,8 +26,8 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.101",
-        "tango-app-api-middleware": "^3.1.72",
+        "tango-api-schema": "^2.2.120",
+        "tango-app-api-middleware": "^3.1.77",
         "url": "^0.11.4",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/gallery.controller.js

@@ -1068,6 +1068,13 @@ export async function userList( req, res ) {
         },
       }, clientId: req.body.clientId } );
       req.body.teams = findTeams.map( ( data ) => data.teamName );
+      if ( req.body.teams.length===0 ) {
+        query.push( {
+          $match: {
+            userEmail: { $in: [ req.user.email ] },
+          },
+        } );
+      }
     }
 
     if ( req.body.teams && req.body.teams.length > 0 ) {

package/src/controllers/internalTrax.controller.js

@@ -286,6 +286,7 @@ export async function PCLconfigCreation( req, res ) {
               insertdata.scheduleRepeatedType = getCLconfig.scheduleRepeatedType;
               insertdata.allowedMultiSubmit = getCLconfig.allowedMultiSubmit;
               insertdata.rawImageUpload = getCLconfig.rawImageUpload || false;
+              insertdata.rawVideoUpload = getCLconfig.rawVideoUpload || false;
               let collectSections = [];
               let sectionQuery = [];
               sectionQuery.push( {
@@ -295,7 +296,7 @@ export async function PCLconfigCreation( req, res ) {
                 },
               } );
               let getSections = await CLquestions.aggregate( sectionQuery );
-              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection' ].includes( getCLconfig.checkListType ) ) {
+              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo' ].includes( getCLconfig.checkListType ) ) {
                 if ( getSections.length ) {
                   for ( let element3 of getSections ) {
                     let collectQuestions = {};
@@ -562,6 +563,7 @@ export async function PCLconfigCreation( req, res ) {
                         //   element4.isPlano = getCLconfig?.isPlano;
                         // }
                         element4.rawImageUpload = getCLconfig?.rawImageUpload || false;
+                        element4.rawVideoUpload = getCLconfig?.rawVideoUpload || false;
                       }
                       if ( userIdList.length ) {
                         allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
@@ -589,11 +591,11 @@ export async function PCLconfigCreation( req, res ) {
                       // }
                       }
                     } else {
-                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection' ].includes( getCLconfig.checkListType ) ) {
+                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo' ].includes( getCLconfig.checkListType ) ) {
                         let storeNameList = allQuestion.map( ( item ) => item.store_id );
-                        let storeDetails = await storeService.find( { clientId: getCLconfig.client_id, status: 'active', ...( [ 'storeopenandclose', 'mobileusagedetection', 'cleaning', 'scrum' ].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' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
                         let storeList = storeDetails.map( ( store ) => store.storeId );
-                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'cleaning', 'scrum' ].includes( getCLconfig.checkListType ) ) {
+                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning' ].includes( getCLconfig.checkListType ) ) {
                           allQuestion = allQuestion.filter( ( ele ) => storeList.includes( ele?.store_id ) );
                         } else {
                           allQuestion = storeDetails.map( ( item ) => {
@@ -627,7 +629,7 @@ export async function PCLconfigCreation( req, res ) {
                           client_id: getCLconfig.client_id,
                           aiStoreList: allQuestion.length ? allQuestion.map( ( store ) => store.store_id ) : [],
                         };
-                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'cleaning', 'scrum' ].includes( getCLconfig.checkListType ) ) {
+                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning' ].includes( getCLconfig.checkListType ) ) {
                           let processData = {
                             aiStoreList: allQuestion.length ? allQuestion.map( ( store ) => {
                               return { storeName: store.storeName, storeId: store.store_id, events: store.events };
@@ -852,6 +854,7 @@ async function insertData( requestData ) {
               insertdata.scheduleRepeatedType = getCLconfig.scheduleRepeatedType;
               insertdata.allowedMultiSubmit = getCLconfig.allowedMultiSubmit;
               insertdata.rawImageUpload = getCLconfig.rawImageUpload || false;
+              insertdata.rawVideoUpload = getCLconfig.rawVideoUpload || false;
               let collectSections = [];
               let sectionQuery = [];
               sectionQuery.push( {
@@ -861,7 +864,7 @@ async function insertData( requestData ) {
                 },
               } );
               let getSections = await CLquestions.aggregate( sectionQuery );
-              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection' ].includes( getCLconfig.checkListType ) ) {
+              if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo' ].includes( getCLconfig.checkListType ) ) {
                 if ( getSections.length ) {
                   for ( let element3 of getSections ) {
                     let collectQuestions = {};
@@ -1128,6 +1131,7 @@ async function insertData( requestData ) {
                         //   element4.isPlano = getCLconfig?.isPlano;
                         // }
                         element4.rawImageUpload = getCLconfig?.rawImageUpload || false;
+                        element4.rawVideoUpload = getCLconfig?.rawVideoUpload || false;
                       }
                       if ( userIdList.length ) {
                         allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
@@ -1154,11 +1158,11 @@ async function insertData( requestData ) {
                         // }
                       }
                     } else {
-                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection' ].includes( getCLconfig.checkListType ) ) {
+                      if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo' ].includes( getCLconfig.checkListType ) ) {
                         let storeNameList = allQuestion.map( ( item ) => item.store_id );
-                        let storeDetails = await storeService.find( { clientId: getCLconfig.client_id, status: 'active', ...( [ 'storeopenandclose', 'mobileusagedetection', 'cleaning', 'scrum' ].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' ].includes( getCLconfig.checkListType ) ) ? { storeId: { $in: storeNameList } } : {} }, { storeId: 1 } );
                         let storeList = storeDetails.map( ( store ) => store.storeId );
-                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'cleaning', 'scrum' ].includes( getCLconfig.checkListType ) ) {
+                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning' ].includes( getCLconfig.checkListType ) ) {
                           allQuestion = allQuestion.filter( ( ele ) => storeList.includes( ele?.store_id ) );
                         } else {
                           allQuestion = storeDetails.map( ( item ) => {
@@ -1192,7 +1196,7 @@ async function insertData( requestData ) {
                           client_id: getCLconfig.client_id,
                           aiStoreList: allQuestion.length ? allQuestion.map( ( store ) => store.store_id ) : [],
                         };
-                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'cleaning', 'scrum' ].includes( getCLconfig.checkListType ) ) {
+                        if ( [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'scrum', 'cleaning' ].includes( getCLconfig.checkListType ) ) {
                           let processData = {
                             aiStoreList: allQuestion.length ? allQuestion.map( ( store ) => {
                               return { storeName: store.storeName, storeId: store.store_id, events: store.events };
@@ -2309,3 +2313,35 @@ export async function internalAISendPushNotification( req, res ) {
     else res.sendError( e, 500 );
   }
 };
+
+export async function getLiveChecklistClients( req, res ) {
+  try {
+    let inputData = req.body;
+    let query = [
+      {
+        $match: {
+          isdeleted: false,
+          publish: true,
+          client_id: {
+            $nin: inputData.ignoreClientId,
+            $exists: true,
+            $ne: null,
+          },
+        },
+      },
+      { $group: { _id: '$client_id' } },
+      { $sort: { _id: 1 } },
+      { $group: { _id: null, client_ids: { $push: '$_id' } } },
+    ];
+
+    let getchecklistsData = await CLconfig.aggregate( query );
+    if ( getchecklistsData && getchecklistsData.length >0 ) {
+      return res.sendSuccess( { liveChecklistClients: getchecklistsData[0].client_ids } );
+    } else {
+      return res.sendError( 'Checklist Not Available', 204 );
+    }
+  } catch ( error ) {
+    if ( error.name === 'ValidationError' ) res.sendBadRequest( error );
+    else res.sendError( error, 500 );
+  }
+}

package/src/controllers/mobileTrax.controller.js

@@ -591,47 +591,47 @@ export async function sopMobilechecklistQuestionValidatorv1( req, res, next ) {
       return res.sendError( 'Please Fill all Required Fields', 400 );
     }
 
-    // if ( requestData.submittype == 'submit' ) {
-    let reqAnswers = requestData.questionAnswers;
-    logger.error( { functionName: 'payload', message: reqAnswers } );
-    let CLQAnswers = getChecklistQA.questionAnswers;
-    logger.error( { functionName: 'CLQAnswers', message: CLQAnswers } );
-    let validationCount= 0;
-    let errorCount = 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 ) => {
-          // question.answers.forEach( ( answer ) => {
-          let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
-          if ( sectionQuestion.length ) {
-            if ( question.answerType == 'multiplechoicemultiple' && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
-              validationCount++;
-            } else {
-              if ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) && ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) ) {
+    if ( requestData.submittype == 'submit' ) {
+      let reqAnswers = requestData.questionAnswers;
+      logger.error( { functionName: 'payload', message: reqAnswers } );
+      let CLQAnswers = getChecklistQA.questionAnswers;
+      logger.error( { functionName: 'CLQAnswers', message: CLQAnswers } );
+      let validationCount= 0;
+      let errorCount = 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 ) => {
+            // question.answers.forEach( ( answer ) => {
+            let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
+            if ( sectionQuestion.length ) {
+              if ( question.answerType == 'multiplechoicemultiple' && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
                 validationCount++;
+              } else {
+                if ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) && ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) ) {
+                  validationCount++;
+                }
               }
+            } else {
+              errorCount++;
             }
-          } else {
-            errorCount++;
-          }
-          // } );
-        } );
+            // } );
+          } );
+        } else {
+          errorCount++;
+        }
+      } );
+      if ( validationCount ) {
+        return res.sendError( 'Please Fill all Required Fields', 400 );
+      } else if ( errorCount ) {
+        return res.sendError( 'Checklist got edited.please contact admin', 400 );
       } else {
-        errorCount++;
+        next();
       }
-    } );
-    if ( validationCount && requestData.submittype == 'submit' ) {
-      return res.sendError( 'Please Fill all Required Fields', 400 );
-    } else if ( errorCount && !requestData?.editSubmit ) {
-      return res.sendError( 'Checklist got edited.please contact admin', 400 );
     } else {
       next();
     }
-    // } else {
-    //   next();
-    // }
   } catch ( e ) {
     logger.error( { function: 'sopMobilechecklistQuestionValidator', error: e, body: req.body } );
     return res.sendError( e, 500 );
@@ -2132,7 +2132,7 @@ export async function submiteyeTestTask( req, res ) {
       return res.sendError( 'Qr code already Exists', 400 );
     }
 
-    await cameraService.updateOne( { streamName: streamId }, { qrCode: qrCode } );
+    await cameraService.updateOne( { streamName: streamId }, { qrCode: qrCode, isEyeTestStream: true } );
     return res.sendSuccess( 'Qr code added successfully' );
 
     const findQuery = [
@@ -2753,8 +2753,8 @@ export async function checklistv1( req, res ) {
     };
 
     const [ checklistResult, taskResult ] = await Promise.allSettled( [
-      processedchecklist.aggregate( buildPipeline( [ { checkListType: 'custom' } ], { isPlano: 1, planoId: 1, planoType: 1 } ) ),
-      processedTask.aggregate( buildPipeline( [], { isPlano: 1, planoId: 1, planoType: 1 } ) ),
+      processedchecklist.aggregate( buildPipeline( [ { checkListType: 'custom' } ], { isPlano: 1, planoId: 1, planoType: 1, floorId: 1 } ) ),
+      processedTask.aggregate( buildPipeline( [], { isPlano: 1, planoId: 1, planoType: 1, floorId: 1 } ) ),
     ] );
 
     const checklistData = checklistResult.status === 'fulfilled' ? checklistResult.value : [];
@@ -3682,8 +3682,7 @@ export async function clientConfig( req, res ) {
   try {
     let requestData = req.body;
     if ( requestData.clientId && requestData.clientId !='' ) {
-      let getClientData = await clientService.findOne( { clientId: requestData.clientId }, { traxRAWImageUpload: 1, clientId: 1, clientName: 1, traxBlockMobileTimeUpdate: 1, traxSectionSave: 1 } );
-      // console.log( ' getClientData=>', getClientData );
+      let getClientData = await clientService.findOne( { clientId: requestData.clientId }, { traxRAWImageUpload: 1, clientId: 1, clientName: 1, traxBlockMobileTimeUpdate: 1, traxSectionSave: 1, isCrestPlanogram: 1, isTangoPlanogram: 1 } );
       if ( getClientData ) {
         return res.sendSuccess( getClientData );
       } else {

package/src/controllers/teaxFlag.controller.js

@@ -1,9 +1,10 @@
-import { download, logger } from 'tango-app-api-middleware'; // getChecklistUsers
+import { download, logger, convertSecondstoTimeFormat } from 'tango-app-api-middleware'; // getChecklistUsers
 import { aggregate } from '../services/processedchecklist.services.js';
 import dayjs from 'dayjs';
 import * as processedchecklistService from '../services/processedchecklist.services.js';
 import * as processedchecklistconfigService from '../services/processedchecklistconfig.services.js';
 import * as checklistconfigService from '../services/checklist.service.js';
+import * as clientService from '../services/clients.services.js';
 
 
 import utc from 'dayjs/plugin/utc.js';
@@ -653,14 +654,14 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
       rangeTwoToDate.setUTCHours( 23, 59, 59, 59 );
     } else if ( requestData.dateType == 'monthly' ) {
       rangeOneFromDate = new Date( requestData.toDate );
-      rangeOneFromDate.setDate( rangeOneFromDate.getDate() - 30 );
+      rangeOneFromDate.setDate( rangeOneFromDate.getDate() - 29 );
       rangeOneToDate = new Date( requestData.toDate );
       rangeOneToDate = new Date( rangeOneToDate.getTime() - userTimezoneOffset );
       rangeOneToDate.setUTCHours( 23, 59, 59, 59 );
       rangeTwoToDate = new Date( requestData.toDate );
-      rangeTwoToDate.setDate( rangeTwoToDate.getDate() - 31 );
+      rangeTwoToDate.setDate( rangeTwoToDate.getDate() - 30 );
       rangeTwoFromDate = new Date( rangeTwoToDate );
-      rangeTwoFromDate.setDate( rangeTwoFromDate.getDate() - 30 );
+      rangeTwoFromDate.setDate( rangeTwoFromDate.getDate() - 29 );
       rangeTwoToDate = new Date( rangeTwoToDate.getTime() - userTimezoneOffset );
       rangeTwoToDate.setUTCHours( 23, 59, 59, 59 );
     } else {
@@ -2011,6 +2012,10 @@ export const flagChecklistCardsV1 = async ( req, res ) => {
       let resultData = await LamdaServiceCall( LamdaURL, reqestData );
       if ( resultData ) {
         if ( resultData.status_code == '200' ) {
+          if ( resultData.customerunattendedCards && resultData.customerunattendedCards.timeTakentoAssistsec && resultData.customerunattendedCards.timeTakentoAssistsec.secs ) {
+            resultData.customerunattendedCards.timeTakentoAssist_string = await convertSecondstoTimeFormat( resultData.customerunattendedCards.timeTakentoAssistsec.secs );
+            resultData.customerunattendedCards.timeSpentwithCustomer_string = await convertSecondstoTimeFormat( resultData.customerunattendedCards.timeSpentwithCustomersec.secs );
+          }
           return res.sendSuccess( resultData );
         } else {
           return res.sendError( 'No Content', 204 );
@@ -2053,14 +2058,14 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
       rangeTwoToDate.setUTCHours( 23, 59, 59, 59 );
     } else if ( requestData.dateType == 'monthly' ) {
       rangeOneFromDate = new Date( requestData.toDate );
-      rangeOneFromDate.setDate( rangeOneFromDate.getDate() - 30 );
+      rangeOneFromDate.setDate( rangeOneFromDate.getDate() - 29 );
       rangeOneToDate = new Date( requestData.toDate );
       rangeOneToDate = new Date( rangeOneToDate.getTime() - userTimezoneOffset );
       rangeOneToDate.setUTCHours( 23, 59, 59, 59 );
       rangeTwoToDate = new Date( requestData.toDate );
-      rangeTwoToDate.setDate( rangeTwoToDate.getDate() - 31 );
+      rangeTwoToDate.setDate( rangeTwoToDate.getDate() - 30 );
       rangeTwoFromDate = new Date( rangeTwoToDate );
-      rangeTwoFromDate.setDate( rangeTwoFromDate.getDate() - 30 );
+      rangeTwoFromDate.setDate( rangeTwoFromDate.getDate() - 29 );
       rangeTwoToDate = new Date( rangeTwoToDate.getTime() - userTimezoneOffset );
       rangeTwoToDate.setUTCHours( 23, 59, 59, 59 );
     } else {
@@ -2092,6 +2097,12 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
       },
     };
 
+    let traxMonthlyComparison = false;
+    let traxMonthlyComparisonData = await clientService.findOne( { clientId: requestData.clientId }, { traxMonthlyComparison: 1 } );
+    if ( traxMonthlyComparisonData && traxMonthlyComparisonData.traxMonthlyComparison ) {
+      traxMonthlyComparison = traxMonthlyComparisonData.traxMonthlyComparison;
+    }
+
     // Get User Based Checklist //
     // let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
     // let getUserEmails = await getChecklistUsers( loginUser );
@@ -2291,6 +2302,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
 
       let result = {
         'customCards': flagComparisonCards,
+        'traxMonthlyComparison': traxMonthlyComparison,
       };
 
       return res.sendSuccess( result );
@@ -2320,7 +2332,6 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
       ];
       const from = await aggregate( fromPipeline );
       requestData.range1StoreCount = from[0]?.storeCount | 0;
-
       const toPipeline = [
         {
           $match:
@@ -2353,6 +2364,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
       // console.log( 'resultData =>', resultData );
       if ( resultData ) {
         if ( resultData.status_code == '200' ) {
+          resultData.traxMonthlyComparison = traxMonthlyComparison;
           return res.sendSuccess( resultData );
         } else {
           return res.sendError( 'No Content', 204 );
@@ -2785,14 +2797,14 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
       rangeTwoToDate.setUTCHours( 23, 59, 59, 59 );
     } else if ( requestData.dateType == 'monthly' ) {
       rangeOneFromDate = new Date( requestData.toDate );
-      rangeOneFromDate.setDate( rangeOneFromDate.getDate() - 30 );
+      rangeOneFromDate.setDate( rangeOneFromDate.getDate() - 29 );
       rangeOneToDate = new Date( requestData.toDate );
       rangeOneToDate = new Date( rangeOneToDate.getTime() - userTimezoneOffset );
       rangeOneToDate.setUTCHours( 23, 59, 59, 59 );
       rangeTwoToDate = new Date( requestData.toDate );
-      rangeTwoToDate.setDate( rangeTwoToDate.getDate() - 31 );
+      rangeTwoToDate.setDate( rangeTwoToDate.getDate() - 30 );
       rangeTwoFromDate = new Date( rangeTwoToDate );
-      rangeTwoFromDate.setDate( rangeTwoFromDate.getDate() - 30 );
+      rangeTwoFromDate.setDate( rangeTwoFromDate.getDate() - 29 );
       rangeTwoToDate = new Date( rangeTwoToDate.getTime() - userTimezoneOffset );
       rangeTwoToDate.setUTCHours( 23, 59, 59, 59 );
     } else {
@@ -2885,6 +2897,14 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
       getDetectionCount( rangeTwoFromDate, rangeTwoToDate ),
     ] );
 
+    // console.log( 'rangeOneFromDate =>', rangeOneFromDate );
+    // console.log( 'rangeOneToDate =>', rangeOneToDate );
+    // console.log( 'rangeOneData =>', rangeOneData );
+
+    // console.log( 'rangeTwoFromDate =>', rangeTwoFromDate );
+    // console.log( 'rangeTwoToDate =>', rangeTwoToDate );
+    // console.log( 'rangeTwoData =>', rangeTwoData );
+
     const flagComparisonCards = {
       totalComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
       questionComparisonFlag: { comparisonData: 0, ComparisonFlag: false },
@@ -2900,7 +2920,11 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
       flagComparisonCards.delayInSubmissionComparisonFlag = calculateComparison( rangeOneData[0].delayInSubmission, rangeTwoData[0].delayInSubmission );
       flagComparisonCards.detectionComparisonFlag = calculateComparison( rangeOneDetectionCount, rangeTwoDetectionCount );
     }
-
+    flagComparisonCards.traxMonthlyComparison = false;
+    let traxMonthlyComparisonData = await clientService.findOne( { clientId: requestData.clientId }, { traxMonthlyComparison: 1 } );
+    if ( traxMonthlyComparisonData && traxMonthlyComparisonData.traxMonthlyComparison ) {
+      flagComparisonCards.traxMonthlyComparison = traxMonthlyComparisonData.traxMonthlyComparison;
+    }
     return res.sendSuccess( { flagComparisonCards } );
   } catch ( error ) {
     console.log( 'error =>', error );

package/src/controllers/trax.controller.js

@@ -3706,7 +3706,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         await processedchecklist.deleteMany( { date_string: insertdata.date_string,
           date_iso: insertdata.date_iso,
           client_id: insertdata.client_id,
-          checkListId: updatedchecklist._id, checklistStatus: 'open', redoStatus: false } );
+          checkListId: updatedchecklist._id, checklistStatus: 'open' } );
 
 
         let actionType = 'deleteOpenUsers';
@@ -3720,18 +3720,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
           date_iso: insertdata.date_iso,
           client_id: insertdata.client_id,
           checkListId: updatedchecklist._id,
-          // checklistStatus: 'inprogress',
-          $or: [
-            {
-              $and: [
-                { checklistStatus: 'open' },
-                { redoStatus: true },
-              ],
-            },
-            {
-              checklistStatus: 'inprogress',
-            },
-          ],
+          checklistStatus: 'inprogress',
         }, { userId: 1, store_id: 1 } );
 
         if ( inprogressData.length ) {
@@ -3750,7 +3739,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         }
 
         if ( deletedList.length ) {
-          await processedchecklist.deleteMany( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, _id: { $in: deletedList }, redoStatus: false } );
+          await processedchecklist.deleteMany( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, _id: { $in: deletedList } } );
         }
         await processedchecklist.insertMany( assignUserList );
         actionType = 'insertAssignUsers';
@@ -3832,7 +3821,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', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection' ];
+    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo' ];
     let checklistDetails = [];
     let publishList = [];
     let unpublishList = [];