tango-app-api-trax 3.9.38 → 3.9.39

package/src/controllers/trax.controller.js

@@ -625,7 +625,6 @@ 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( '==================' );
@@ -1920,6 +1919,7 @@ export const updateConfigure = async ( req, res ) => {
 
 export const updateConfigurev1 = async ( req, res ) => {
   try {
+    console.log( '123' );
     let inputBody = req.body;
     let id;
     let checklistDetails;
@@ -3977,7 +3977,6 @@ 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 } );
       }
     } ) );
@@ -4044,7 +4043,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(), complianceCount: getCLconfig.complianceCount, allowedOverTime: getCLconfig.allowedOverTime, allowedStoreLocation: getCLconfig.allowedStoreLocation, userVerification: getCLconfig.userVerification } );
+          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 ) {

package/src/controllers/traxDashboard.controllers.js

@@ -276,10 +276,29 @@ 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 );
@@ -295,6 +314,10 @@ 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 != '' ) {
@@ -344,16 +367,6 @@ 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: {
@@ -413,41 +426,6 @@ 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 ] },
-                {
-                  $max: [
-                    0,
-                    {
-                      $round: [
-                        {
-                          $multiply: [
-                            { $divide: [ '$userComplianceCountTotal', '$$divisor' ] },
-                            100,
-                          ],
-                        },
-                        0,
-                      ],
-                    },
-                  ],
-                },
-                0,
-              ],
-            },
-          },
-        },
       },
     } );
 
@@ -468,10 +446,18 @@ export const checklistPerformance = async ( req, res ) => {
       },
     } );
     let getChecklistPerformanceData = await processedchecklistService.aggregate( findQuery );
-    if ( !getChecklistPerformanceData[0].count[0].total ) {
+    if ( !getChecklistPerformanceData[0].data.length ) {
       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 ) => {
@@ -4349,26 +4335,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}}{{#eq data.status 'submit'}}(RunAIFlag:{{data.runAIFlag}},QuestionFlag:{{data.questionFlag}}){{/eq}}</td>
+                        <td class="flagText">{{data.flagCount}}</td>
                     </tr>
                     <tr bgcolor="#ffffff" style="border:none;margin-top:3px;">
                         <td class="flagText" style="padding-left:30px; line-height: 24px;">Submitted By :</td>