tango-app-api-trax 3.2.0-beta.7 → 3.2.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.2.0-beta.7",
+    "version": "3.2.0-beta.8",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -371,6 +371,13 @@ export async function redoChecklist( req, res ) {
 
     let response = await processedChecklist.updateOne( { _id: req.body.payload._id }, updateData );
     if ( response.modifiedCount || response.matchedCount ) {
+      let storeTimeZone = await storeService.findOne( { storeName: checklistDetails.storeName }, { 'storeProfile.timeZone': 1 } );
+      let currentDateTime;
+      if ( storeTimeZone?.storeProfile?.timeZone ) {
+        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+      } else {
+        currentDateTime = dayjs();
+      }
       data = {
         checklistId: checklistDetails.sourceCheckList_id,
         checkListName: checklistDetails.checkListName,
@@ -386,7 +393,7 @@ export async function redoChecklist( req, res ) {
         type: checklistDetails.checkListType,
         userAnswer: userAnswer,
         initiatedBy: req.user.userName,
-        initiatedTime: dayjs().format(),
+        initiatedTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
         answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
         submitedBy: checklistDetails.userName,
         submitTime: checklistDetails.submitTime,

package/src/controllers/teaxFlag.controller.js

@@ -609,7 +609,14 @@ export const flagCardsV1 = async ( req, res ) => {
     if ( data.questionFlag ) flagCards.questionFlag.count = data.questionFlag;
     if ( data.delayInSubmission ) flagCards.delayInSubmission.count = data.delayInSubmission;
 
-    const publishedAiChecklists = await checklistconfigService.find( { client_id: clientId, publish: true, checkListType: { $ne: 'custom' } }, { checkListType: 1 } );
+    const publishedAiChecklists = await checklistconfigService.find(
+        {
+          client_id: clientId,
+          publish: true,
+          checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] },
+        },
+        { checkListType: 1 },
+    );
 
     if ( !publishedAiChecklists?.length ) {
       return res.sendError( { error: 'No Data Found' }, 204 );
@@ -623,7 +630,9 @@ export const flagCardsV1 = async ( req, res ) => {
 
     if ( resultData && resultData.status_code === '200' ) {
       published.forEach( ( item ) => {
-        flagCards.detectionFlag.count += resultData[item];
+        if ( resultData[item] ) {
+          flagCards.detectionFlag.count += resultData[item];
+        }
       } );
       flagCards.totalFlag = flagCards.detectionFlag.count;
     }
@@ -737,8 +746,14 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
 
       console.log( dayjs( toDate ).startOf( 'day' ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' ), 'new start of' );
 
-      const publishedAiChecklists = await checklistconfigService.find( { client_id: requestData.clientId, publish: true, checkListType: { $ne: 'custom' } }, { checkListType: 1 } );
-
+      const publishedAiChecklists = await checklistconfigService.find(
+          {
+            client_id: requestData.clientId,
+            publish: true,
+            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] },
+          },
+          { checkListType: 1 },
+      );
       if ( !publishedAiChecklists?.length ) {
         return 0;
       }
@@ -750,7 +765,11 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
 
       if ( resultData?.status_code === '200' ) {
         let result = 0;
-        published.forEach( ( item ) => result += resultData[item] );
+        published.forEach( ( item ) => {
+          if ( resultData[item] ) {
+            result += resultData[item];
+          }
+        } );
         return result;
       }
       return 0;
@@ -804,7 +823,7 @@ export const flagTablesV1 = async ( req, res ) => {
     );
 
     if ( requestData?.filter === 'all' ) {
-      findAndQuery.push( { $or: [ { questionFlag: { $gte: 1 } }, { timeFlag: { $gte: 1 } }, { checkListType: { $ne: 'custom' } } ] } );
+      findAndQuery.push( { $or: [ { questionFlag: { $gte: 1 } }, { timeFlag: { $gte: 1 } }, { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } } ] } );
     } else if ( requestData?.filter === 'question' ) {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { questionFlag: { $gte: 1 } } );
@@ -812,7 +831,7 @@ export const flagTablesV1 = async ( req, res ) => {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { timeFlag: { $gte: 1 } } );
     } else if ( requestData?.filter === 'detection' ) {
-      findAndQuery.push( { checkListType: { $ne: 'custom' } } );
+      findAndQuery.push( { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } } );
     }
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -2629,7 +2648,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           $or: [
             { questionFlag: { $gte: 1 } },
             { timeFlag: { $gte: 1 } },
-            { checkListType: { $ne: 'custom' } },
+            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } },
           ],
         },
       ] } },