tango-app-api-trax 3.4.0-flag-1 → 3.4.0-flag-3

package/package.json

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

package/src/controllers/teaxFlag.controller.js

@@ -2665,7 +2665,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           $or: [
             { questionFlag: { $gte: 1 } },
             { timeFlag: { $gte: 1 } },
-            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum' ] } },
+            { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum' ] } },
           ],
         },
       ] } },
@@ -3123,20 +3123,26 @@ export const flagTablesV2 = async ( req, res ) => {
           'Checklist Name': element.checkListName,
           'Question Flags': element?.customQuestionFlagCount,
           'Not Submitted Flags': element?.customTimeFlagCount,
-          'Flagged Count': element?.flagCount,
+          'Detection Flags': element?.flagCount,
           'Coverage': element?.coverage,
-          'Assigned Stores': element?.assignedStores,
+          'Assigned Stores': element?.checkListType === 'custom' ? element?.assignedStores : element?.assignedStoresAi,
           'Flagged Stores': element?.flaggedStores,
           'Compliance': element?.complianceRate,
           // 'Flag Type': element?.checkListType === 'custom' ? 'Question' : 'Detection',
         };
         if ( requestData?.filter === 'question' ) {
+          data['Flags'] = data['Question Flags'];
+          delete data['Question Flags'];
           delete data['Flagged Count'];
           delete data['Not Submitted Flags'];
         } else if ( requestData?.filter === 'time' ) {
+          data['Flags'] = data['Not Submitted Flags'];
+          delete data['Not Submitted Flags'];
           delete data['Flagged Count'];
           delete data['Question Flags'];
         } else if ( requestData?.filter === 'detection' ) {
+          data['Flags'] = data['Detection Flags'];
+          delete data['Detection Flags'];
           delete data['Not Submitted Flags'];
           delete data['Question Flags'];
         }