tango-app-api-trax 3.9.32 → 3.9.33

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,36 +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 ] },
-                {
-                  $round: [
-                    {
-                      $multiply: [
-                        { $divide: [ '$userComplianceCountTotal', '$$divisor' ] },
-                        100,
-                      ],
-                    },
-                    0,
-                  ],
-                },
-                0,
-              ],
-            },
-          },
-        },
       },
     } );
 
@@ -467,6 +450,14 @@ 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 ) => {
@@ -4344,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>