tango-app-api-trax 3.9.31 → 3.9.32

package/index.js

@@ -9,5 +9,6 @@ import { mobileRouter } from './src/routes/mobileTrax.routes.js';
 import { internalTraxRouter } from './src/routes/internalTraxApi.router.js';
 import { locusOrderRouter } from './src/routes/locus.router.js';
 import { traxActivityLogRouter } from './src/routes/activityLog.router.js';
+import traxActivityLogMiddleware from './src/logging/activityLogMiddleware.js';
 
-export { traxDashboardRouter, traxFlagRouter, traxRouter, galleryRouter, downloadRouter, mobileRouter, internalTraxRouter, locusOrderRouter, traxActivityLogRouter };
+export { traxDashboardRouter, traxFlagRouter, traxRouter, galleryRouter, downloadRouter, mobileRouter, internalTraxRouter, locusOrderRouter, traxActivityLogRouter, traxActivityLogMiddleware };

package/package.json

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

package/src/controllers/internalTrax.controller.js

@@ -624,6 +624,7 @@ export async function PCLconfigCreation( req, res ) {
                         element4.rawImageUpload = getCLconfig?.rawImageUpload || false;
                         element4.rawVideoUpload = getCLconfig?.rawVideoUpload || false;
                         element4.videoUploadTimeLimit = getCLconfig?.videoUploadTimeLimit || 0;
+                        element4.userVerification = getCLconfig?.userVerification;
                       }
                       if ( userIdList.length ) {
                         allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
@@ -1383,40 +1384,40 @@ export async function insertTimeDelayFlags( req, res ) {
     let updatedDetails = await processedchecklist.updateMany( { _id: { $in: checklistId } }, { timeFlag: 1 } );
 
 
-    let notifyStores = await processedchecklist.find( { _id: { $in: checklistId }, notify: { $exists: false } } );
-
-    if ( notifyStores.length ) {
-      Promise.all( notifyStores.map( async ( store ) => {
-        let checklistDetails = await CLconfig.findOne( { _id: store.sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
-        if ( checklistDetails?.notifyFlags?.notifyType?.length ) {
-          let emailList = checklistDetails?.notifyFlags?.notifyType.includes( 'approver' ) ? checklistDetails.approver.map( ( ele ) => ele?.value ): [];
-          emailList = [ ...emailList, ...checklistDetails?.notifyFlags?.users?.map( ( ele ) => ele?.value ) ];
-          let data = {
-            storeName: store.storeName,
-            flagCount: 1,
-            checklistName: store.checkListName?.trim(),
-            submittedBy: '--',
-            time: '--',
-            domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
-            type: 'delay',
-          };
-          const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
-          const htmlContent = handlebars.compile( fileContent );
-          const html = htmlContent( { data: data } );
-          emailList.forEach( ( email ) => {
-            let params = {
-              toEmail: email,
-              mailSubject: 'TangoEye | Checklist Flag',
-              htmlBody: html,
-              attachment: '',
-              sourceEmail: JSON.parse( process.env.SES ).adminEmail,
-            };
-            sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
-          } );
-        }
-        await processedchecklist.updateOne( { _id: store._id }, { notify: true } );
-      } ) );
-    }
+    // let notifyStores = await processedchecklist.find( { _id: { $in: checklistId }, notify: { $exists: false } } );
+
+    // if ( notifyStores.length ) {
+    //   Promise.all( notifyStores.map( async ( store ) => {
+    //     let checklistDetails = await CLconfig.findOne( { _id: store.sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
+    //     if ( checklistDetails?.notifyFlags?.notifyType?.length ) {
+    //       let emailList = checklistDetails?.notifyFlags?.notifyType.includes( 'approver' ) ? checklistDetails.approver.map( ( ele ) => ele?.value ): [];
+    //       emailList = [ ...emailList, ...checklistDetails?.notifyFlags?.users?.map( ( ele ) => ele?.value ) ];
+    //       let data = {
+    //         storeName: store.storeName,
+    //         flagCount: 1,
+    //         checklistName: store.checkListName?.trim(),
+    //         submittedBy: '--',
+    //         time: '--',
+    //         domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
+    //         type: 'delay',
+    //       };
+    //       const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
+    //       const htmlContent = handlebars.compile( fileContent );
+    //       const html = htmlContent( { data: data } );
+    //       emailList.forEach( ( email ) => {
+    //         let params = {
+    //           toEmail: email,
+    //           mailSubject: 'TangoEye | Checklist Flag',
+    //           htmlBody: html,
+    //           attachment: '',
+    //           sourceEmail: JSON.parse( process.env.SES ).adminEmail,
+    //         };
+    //         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+    //       } );
+    //     }
+    //     await processedchecklist.updateOne( { _id: store._id }, { notify: true } );
+    //   } ) );
+    // }
 
     if ( updatedDetails ) {
       return res.sendSuccess( { message: 'Time Delay Updated Successfully' } );
@@ -2700,10 +2701,57 @@ export async function countUpdateRunAI( req, res ) {
       runAIFlag: req.body.runAICount,
     };
 
+    // complianceCount is already populated for the other answer types; add the image/video scores on top.
+    let complianceCount = getDetails.userComplianceCount || 0;
+
+    // Pull every "Matched/Not Matched" verdict out of a runAIData array, tolerating both shapes we store:
+    //   1) [ { answerImage, results: [ { featureName, value } ] } ]  (verdict nested under results)
+    //   2) [ { featureName, value } ]                                (flat verdict)
+    const extractMatchValues = ( runAIData ) => {
+      if ( !Array.isArray( runAIData ) ) return [];
+      const values = [];
+      runAIData.forEach( ( entry ) => {
+        const results = Array.isArray( entry?.results ) ? entry.results : [ entry ];
+        results.forEach( ( r ) => {
+          if ( r?.featureName === 'Matched/Not Matched' ) values.push( r?.value );
+        } );
+      } );
+      return values;
+    };
+
+    getDetails.questionAnswers.forEach( ( section ) => {
+      section.questions.forEach( ( question ) => {
+        if ( question.compliance && [ 'image', 'image/video' ].includes( question.answerType ) ) {
+          // For 'image/video' each userAnswer carries its own answerType and runAIData only lives on
+          // the image entries; a pure 'image' question keeps runAIData directly on every userAnswer.
+          const aiAnswers = question.answerType === 'image/video' ?
+            ( question.userAnswer || [] ).filter( ( ua ) => ua?.answerType === 'image' ) :
+            ( question.userAnswer || [] );
+
+          // Compliance comes from the first configured answer: every "Matched/Not Matched" verdict
+          // across the image answers must be True to count as matched, otherwise it's not matched.
+          const matchValues = aiAnswers.flatMap( ( ua ) => extractMatchValues( ua?.runAIData ) );
+          const allMatched = matchValues.length > 0 && matchValues.every( ( v ) => v === 'True' || v === true );
+          const score = allMatched ?
+            ( question.answers?.[0]?.matchedCount ?? 0 ) :
+            ( question.answers?.[0]?.notMatchedCount ?? 0 );
+
+          // Persist the derived score back onto each userAnswer so PDF/dashboard reads stay consistent.
+          ( question.userAnswer || [] ).forEach( ( ua ) => {
+            ua.complianceScore = score;
+          } );
+
+          complianceCount += score;
+        }
+      } );
+    } );
+
+    updateData.complianceCount = complianceCount;
+
     await processedchecklist.updateOne( { _id: req.body.id }, updateData );
     return res.sendSuccess( 'RunAI Count updated successfully' );
   } catch ( e ) {
-    logger.error( { functionName: 'updateRunAI', error: e } );
+    logger.error( { functionName: 'countUpdateRunAI', error: e } );
     return res.sendError( e, 500 );
   }
 }
@@ -3540,47 +3588,38 @@ export async function runAIFlag( req, res ) {
         ],
       },
     }, { _id: 1, notifyFlags: 1, approver: 1 } );
-    let date = dayjs().subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
+    let date = dayjs().format( 'YYYY-MM-DD' );
     if ( checklistDetails.length ) {
       await Promise.all( checklistDetails.map( async ( ele ) => {
-        let submitDetails = await processedchecklist.find( { sourceCheckList_id: ele._id, checklistStatus: 'submit', date_string: date }, { storeName: 1, checkListName: 1, questionAnswers: 1 } );
+        let submitDetails = await processedchecklist.find( { sourceCheckList_id: ele._id, date_string: date, $or: [ { timeFlag: { $gt: 0 } }, { questionFlag: { $gt: 0 } }, { runAIFlag: { $gt: 0 } } ] }, { storeName: 1, checkListName: 1, userName: 1, submitTime_string: 1, runAIFlag: 1, questionFlag: 1, checklistStatus: 1 } );
+        let emailList = ele?.notifyFlags?.notifyType.includes( 'approver' ) ? ele.approver.map( ( approver ) => approver?.value ): [];
+        emailList = [ ...emailList, ...ele?.notifyFlags?.users?.map( ( user ) => user?.value ) ];
         await Promise.all( submitDetails.map( ( store ) => {
-          if ( store.questionAnswers.length ) {
-            let runAIFlag = 0;
-            store.questionAnswers.forEach( ( section ) => {
-              section.questions.forEach( ( question ) => {
-                if ( question.answerType == 'image' && ( question?.userAnswer?.[0]?.runAIData?.value == 'False' || !question?.userAnswer?.[0]?.runAIData?.value ) ) {
-                  runAIFlag++;
-                }
-              } );
-            } );
-            if ( runAIFlag ) {
-              let emailList = ele?.notifyFlags?.notifyType.includes( 'approver' ) ? ele.approver.map( ( approver ) => approver?.value ): [];
-              emailList = [ ...emailList, ...ele?.notifyFlags?.users?.map( ( user ) => user?.value ) ];
-              let data = {
-                storeName: store.storeName,
-                flagCount: 1,
-                checklistName: store.checkListName?.trim(),
-                submittedBy: '--',
-                time: '--',
-                domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
-                type: 'delay',
-              };
-              const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
-              const htmlContent = handlebars.compile( fileContent );
-              const html = htmlContent( { data: data } );
-              emailList.forEach( ( email ) => {
-                let params = {
-                  toEmail: email,
-                  mailSubject: 'TangoEye | Checklist Flag',
-                  htmlBody: html,
-                  attachment: '',
-                  sourceEmail: JSON.parse( process.env.SES ).adminEmail,
-                };
-                sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
-              } );
-            }
-          }
+          let data = {
+            storeName: store.storeName,
+            flagCount: store.timeFlag ? 1 : store?.runAIFlag + store?.questionFlag,
+            runAIFlag: store?.runAIFlag,
+            questionFlag: store?.questionFlag,
+            checklistName: store.checkListName?.trim(),
+            submittedBy: store?.userName,
+            time: store?.submitTime_string ?? '--',
+            domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
+            status: store.checklistStatus,
+          };
+          const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
+          const htmlContent = handlebars.compile( fileContent );
+          const html = htmlContent( { data: data } );
+          emailList.forEach( ( email ) => {
+            console.log( email );
+            let params = {
+              toEmail: email,
+              mailSubject: 'TangoEye | Checklist Flag',
+              htmlBody: html,
+              attachment: '',
+              sourceEmail: JSON.parse( process.env.SES ).adminEmail,
+            };
+            sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+          } );
         } ) );
       } ) );
     }

package/src/controllers/mobileTrax.controller.js

@@ -1765,6 +1765,7 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                       } else {
                         if ( qaans[k].validationType == 'Capture Multiple Image with description' ) {
                           qaans[k]['validationImage']=[];
+                          qaans[k]['validationVideo']=[];
                           if ( requestSection[i].validationImage.length ) {
                             for ( let image of requestSection[i].validationImage ) {
                               let validationAnswer = decodeURIComponent( image.split( '?' )[0] );
@@ -1777,6 +1778,18 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                               };
                             }
                           }
+                          if ( requestSection[i]?.validationVideo?.length ) {
+                            for ( let video of requestSection[i].validationVideo ) {
+                              let validationAnswer = decodeURIComponent( video.split( '?' )[0] );
+                              if ( validationAnswer.length ) {
+                                let splitImgUrl = validationAnswer.split( '/' );
+                                if ( splitImgUrl.length > 1 ) {
+                                  splitImgUrl.splice( 0, 3 );
+                                  qaans[k].validationVideo.push( splitImgUrl.join( '/' ) || '' );
+                                }
+                              };
+                            }
+                          }
                         }
                         // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
                         qaans[k].validationAnswer = requestSection[i].validationAnswer || '';
@@ -2127,12 +2140,18 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
     logger.error( { message: requestData.questionAnswers, error: 'QuestionanswersPayload' } );
 
     if ( requestData.submittype == 'submit' ) {
+      requestData.userComplianceCount = 0;
       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 );
           }
+          if ( question.compliance ) {
+            const scores = ( question.userAnswer || [] ).map( ( ua ) => ua?.complianceScore ?? 0 );
+            let score = scores.length ? Math.max( ...scores ) : 0;
+            requestData.userComplianceCount += score;
+          }
         }
       }
     }
@@ -2776,6 +2795,15 @@ export async function submitChecklist( req, res ) {
         updateData.checklistStatus = 'submit';
         updateData.updatedAt = dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format();
         updateData.submitMobileTime = requestData?.currentTime;
+        updateData.userComplianceCount = requestData?.userComplianceCount;
+        updateData.userSignature = requestData?.userSignature;
+        if ( requestData?.userImage ) {
+          let splitImgUrl = requestData?.userImage.split( '/' );
+          if ( splitImgUrl.length > 1 ) {
+            splitImgUrl.splice( 0, 3 );
+            updateData.userImage = splitImgUrl.join( '/' ) || '';
+          }
+        }
       }
       // updateData.questionAnswers.forEach( ( section ) => {
       //   section.questions.forEach( ( question ) => {
@@ -2876,34 +2904,34 @@ export async function submitChecklist( req, res ) {
             userType: req.user.userType,
           };
           insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
-          if ( updateData.questionFlag ) {
-            let checklistDetails = await checklistService.findOne( { _id: getchecklist[0].sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
-            if ( checklistDetails?.notifyFlags?.notifyType?.length ) {
-              let emailList = checklistDetails?.notifyFlags?.notifyType.includes( 'approver' ) ? checklistDetails.approver.map( ( ele ) => ele?.value ): [];
-              emailList = [ ...emailList, ...checklistDetails?.notifyFlags?.users?.map( ( ele ) => ele?.value ) ];
-              let data = {
-                storeName: getchecklist[0].storeName,
-                flagCount: updateData.questionFlag,
-                checklistName: getchecklist[0].checkListName,
-                submittedBy: getchecklist[0].userName,
-                time: updateData.submitTime_string,
-                domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
-              };
-              const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
-              const htmlContent = handlebars.compile( fileContent );
-              const html = htmlContent( { data: data } );
-              emailList.forEach( ( email ) => {
-                let params = {
-                  toEmail: email,
-                  mailSubject: 'TangoEye | Checklist Flag',
-                  htmlBody: html,
-                  attachment: '',
-                  sourceEmail: JSON.parse( process.env.SES ).adminEmail,
-                };
-                sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
-              } );
-            }
-          }
+          // if ( updateData.questionFlag ) {
+          //   let checklistDetails = await checklistService.findOne( { _id: getchecklist[0].sourceCheckList_id }, { notifyFlags: 1, approver: 1 } );
+          //   if ( checklistDetails?.notifyFlags?.notifyType?.length ) {
+          //     let emailList = checklistDetails?.notifyFlags?.notifyType.includes( 'approver' ) ? checklistDetails.approver.map( ( ele ) => ele?.value ): [];
+          //     emailList = [ ...emailList, ...checklistDetails?.notifyFlags?.users?.map( ( ele ) => ele?.value ) ];
+          //     let data = {
+          //       storeName: getchecklist[0].storeName,
+          //       flagCount: updateData.questionFlag,
+          //       checklistName: getchecklist[0].checkListName,
+          //       submittedBy: getchecklist[0].userName,
+          //       time: updateData.submitTime_string,
+          //       domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
+          //     };
+          //     const fileContent = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/flag.hbs', 'utf8' );
+          //     const htmlContent = handlebars.compile( fileContent );
+          //     const html = htmlContent( { data: data } );
+          //     emailList.forEach( ( email ) => {
+          //       let params = {
+          //         toEmail: email,
+          //         mailSubject: 'TangoEye | Checklist Flag',
+          //         htmlBody: html,
+          //         attachment: '',
+          //         sourceEmail: JSON.parse( process.env.SES ).adminEmail,
+          //       };
+          //       sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+          //     } );
+          //   }
+          // }
         }
         if ( getchecklist?.[0]?.redoEdit?.toString() != requestData?.redoEdit ) {
           return res.sendSuccess( 'New Questions Added So,Checklist moved back to In Progress. Please complete the updated checklist.' );
@@ -4177,6 +4205,9 @@ export async function questionList( req, res ) {
         streamId: { $ifNull: [ '$streamId', '' ] },
         export: { $ifNull: [ '$export', false ] },
         redoEdit: 1,
+        userVerification: 1,
+        userSignature: 1,
+        userImage: 1,
       },
     } );
 
@@ -4187,6 +4218,7 @@ export async function questionList( req, res ) {
       logger.info( `v5 => Checklist Continue => store Name: ${getchecklist[0].storeName}, User Email: ${getchecklist[0].userEmail}, Checklist Name: ${getchecklist[0].checkListName}` );
       // let bucket = JSON.parse( process.env.BUCKET );
       let cdnurl = JSON.parse( process.env.CDNURL );
+      getchecklist[0].userImage = `${cdnurl}/${getchecklist[0].userImage}`;
       for ( let [ secIndex, section ] of getchecklist[0].questionAnswers.entries() ) {
         for ( let [ questionIndex, question ] of section.questions.entries() ) {
           let Multianswer = [];
@@ -4242,10 +4274,15 @@ export async function questionList( req, res ) {
               }
               if ( userAns.validationType == 'Capture Multiple Image with description' ) {
                 let imageAnswers = userAns.validationImage;
-                userAns.validationImage = [];
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationImage = [];
                 for ( let image of imageAnswers ) {
                   getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationImage.push( `${cdnurl.TraxAnswerCDN}${image}` );
                 }
+                let videoAnswer = userAns.validationVideo;
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationVideo = [];
+                for ( let image of videoAnswer ) {
+                  getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationVideo.push( `${cdnurl.TraxAnswerCDN}${image}` );
+                }
               }
               if ( [ 'image', 'descriptiveImage', 'video' ].includes( question.answerType ) && userAns.answer != '' ) {
                 getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer =`${cdnurl.TraxAnswerCDN}${userAns.answer}`;
@@ -5490,6 +5527,9 @@ export async function downloadChecklist( req, res ) {
           if ( [ 'Capture Multiple Image with description' ].includes( answer.validationType ) && answer?.validationImage?.length ) {
             answer.validationImage = answer?.validationImage?.map( ( ele ) => JSON.parse( process.env.CDNURL )?.TraxAnswerCDN+ele );
           }
+          if ( [ 'Capture Multiple Image with description' ].includes( answer.validationType ) && answer?.validationVideo?.length ) {
+            answer.validationVideo = answer?.validationVideo?.map( ( ele ) => JSON.parse( process.env.CDNURL )?.TraxAnswerCDN+ele );
+          }
           if ( answer?.answer?.trim() && [ 'image', 'descriptiveImage', 'multipleImage', 'image/video', 'video' ].includes( question.answerType ) ) {
             answer.answer = JSON.parse( process.env.CDNURL )?.TraxAnswerCDN+answer.answer;
           }

package/src/controllers/trax.controller.js

@@ -620,6 +620,7 @@ export const zoneList = async ( req, res ) => {
     const allowedChecklistsStreams = [
       'Camera Angle Change Compliance',
     ];
+    console.log( allowedChecklists.includes( inputBody.checkListName ) );
 
     if ( inputBody.checkListName && allowedChecklists.includes( inputBody.checkListName ) ) {
       console.log( '==================' );
@@ -1914,7 +1915,6 @@ export const updateConfigure = async ( req, res ) => {
 
 export const updateConfigurev1 = async ( req, res ) => {
   try {
-    console.log( '123' );
     let inputBody = req.body;
     let id;
     let checklistDetails;
@@ -3972,6 +3972,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         element4.rawVideoUpload = getCLconfig?.rawVideoUpload || false;
         element4.videoUploadTimeLimit = getCLconfig?.videoUploadTimeLimit || 0;
         element4.complianceCount = getCLconfig?.complianceCount || 0;
+        element4.userVerification = getCLconfig?.userVerification;
         assignUserList.push( { ...element4 } );
       }
     } ) );

package/src/controllers/traxDashboard.controllers.js

@@ -276,29 +276,10 @@ export const checklistPerformance = async ( req, res ) => {
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
     let result = {};
-    let checklistIdList = [];
 
     let limit = parseInt( requestData?.limit ) || 10;
     let skip = limit * ( requestData?.offset ) || 0;
 
-    const detectionPayload = {
-      'fromDate': requestData.fromDate,
-      'toDate': requestData.toDate,
-      'clientId': requestData.clientId,
-      'sortColumnName': requestData.sortColumnName,
-      'sortBy': requestData.sortBy,
-      'storeId': requestData.storeId,
-    };
-
-
-    let complianceURL = JSON.parse( process.env.LAMBDAURL ).complianceURL;
-    const complianceData = await LamdaServiceCall( complianceURL, detectionPayload );
-    if ( complianceData?.data?.length && requestData?.sortColumnName == 'questionCompliance' ) {
-      const end = skip + requestData?.limit;
-      checklistIdList = complianceData.data.slice( skip, end )?.map( ( ele ) => ele?.sourceCheckList_id );
-    }
-
-
     // 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 );
@@ -314,10 +295,6 @@ export const checklistPerformance = async ( req, res ) => {
         { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
     );
 
-    if ( requestData?.sortColumnName == 'questionCompliance' ) {
-      findAndQuery.push( { sourceCheckList_id: { $in: checklistIdList } } );
-    }
-
     findQuery.push( { $match: { $and: findAndQuery } } );
 
     if ( requestData.searchValue && requestData.searchValue != '' ) {
@@ -367,6 +344,16 @@ export const checklistPerformance = async ( req, res ) => {
         timeFlag: { $sum: '$timeFlag' },
         questionFlagCount: { $sum: '$questionFlag' },
         runAIFlagCount: { $sum: '$runAIFlag' },
+        userComplianceCountTotal: {
+          $sum: {
+            $cond: [
+              { $eq: [ '$checklistStatus', 'submit' ] },
+              { $ifNull: [ '$userComplianceCount', 0 ] },
+              0,
+            ],
+          },
+        },
+        complianceCount: { $first: '$complianceCount' },
         checkListType: { $last: '$checkListType' },
         redo: { $sum: { $cond: [ { $eq: [ '$redoStatus', true ] }, 1, 0 ] } },
         task: {
@@ -426,6 +413,36 @@ export const checklistPerformance = async ( req, res ) => {
         checkListType: 1,
         redo: 1,
         task: 1,
+        questionCompliance: {
+          $let: {
+            vars: {
+              divisor: {
+                $cond: [
+                  { $gt: [ '$submittedChecklist', 1 ] },
+                  { $multiply: [ { $ifNull: [ '$complianceCount', 0 ] }, '$submittedChecklist' ] },
+                  { $ifNull: [ '$complianceCount', 0 ] },
+                ],
+              },
+            },
+            in: {
+              $cond: [
+                { $gt: [ '$$divisor', 0 ] },
+                {
+                  $round: [
+                    {
+                      $multiply: [
+                        { $divide: [ '$userComplianceCountTotal', '$$divisor' ] },
+                        100,
+                      ],
+                    },
+                    0,
+                  ],
+                },
+                0,
+              ],
+            },
+          },
+        },
       },
     } );
 
@@ -450,14 +467,6 @@ export const checklistPerformance = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
 
-    getChecklistPerformanceData?.[0]?.data.forEach( ( ele ) => {
-      let findCompliance;
-      if ( complianceData?.data?.length ) {
-        findCompliance = complianceData?.data?.find( ( data ) => data.sourceCheckList_id == ele?.sourceCheckList_id );
-      }
-      ele['questionComplianceRate'] = findCompliance?.compliancePercentage ?? 0;
-    } );
-
     if ( requestData.export ) {
       const exportdata = [];
       getChecklistPerformanceData[0].data.forEach( ( element ) => {
@@ -4335,26 +4344,26 @@ function escapeRegex( text ) {
 //   }
 // }
 
-async function LamdaServiceCall( url, data ) {
-  try {
-    const requestOptions = {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify( data ),
-    };
-    console.log( data );
-    const response = await fetch( url, requestOptions );
-    if ( !response.ok ) {
-      throw new Error( `Response status: ${response.status}` );
-      return false;
-    }
-    const json = await response.json();
-    return json;
-  } catch ( error ) {
-    console.log( error );
-    logger.error( { error: error, message: data, function: 'LamdaServiceCall' } );
-    return false;
-  }
-}
+// async function LamdaServiceCall( url, data ) {
+//   try {
+//     const requestOptions = {
+//       method: 'POST',
+//       headers: {
+//         'Content-Type': 'application/json',
+//       },
+//       body: JSON.stringify( data ),
+//     };
+//     console.log( data );
+//     const response = await fetch( url, requestOptions );
+//     if ( !response.ok ) {
+//       throw new Error( `Response status: ${response.status}` );
+//       return false;
+//     }
+//     const json = await response.json();
+//     return json;
+//   } catch ( error ) {
+//     console.log( error );
+//     logger.error( { error: error, message: data, function: 'LamdaServiceCall' } );
+//     return false;
+//   }
+// }

package/src/hbs/flag.hbs

@@ -176,7 +176,7 @@
                         <td class="flagText" style="padding-left:30px; line-height: 24px;">No of Flags :</td>
                         <td></td>
                         <td></td>
-                        <td class="flagText">{{data.flagCount}}</td>
+                        <td class="flagText">{{data.flagCount}}{{#eq data.status 'submit'}}(RunAIFlag:{{data.runAIFlag}},QuestionFlag:{{data.questionFlag}}){{/eq}}</td>
                     </tr>
                     <tr bgcolor="#ffffff" style="border:none;margin-top:3px;">
                         <td class="flagText" style="padding-left:30px; line-height: 24px;">Submitted By :</td>