tango-app-api-trax 3.3.1-beta-61 → 3.3.1-beta-63

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-61",
+    "version": "3.3.1-beta-63",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
     "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
+        "start": "nodemon --exec \"eslint --fix . && node app.js\""
     },
     "engines": {
         "node": ">=18.10.0"

package/src/controllers/gallery.controller.js

@@ -152,7 +152,7 @@ export async function storesList( req, res ) {
 export const checklistDropdown = async ( req, res ) => {
   try {
     let requestData = req.body;
-    // let fromDate = new Date( requestData.fromDate );
+    let fromDate = new Date( requestData.fromDate );
     let toDate = new Date( requestData.toDate );
     let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
@@ -163,8 +163,8 @@ export const checklistDropdown = async ( req, res ) => {
     let findAndQuery = [];
     findAndQuery.push(
         { client_id: requestData.clientId },
-        // { date_iso: { $gte: fromDate } },
-        // { date_iso: { $lte: toDate } },
+        { date_iso: { $gte: fromDate } },
+        { date_iso: { $lte: toDate } },
         // { checkListType: { $eq: 'custom' } },
     );
 

package/src/controllers/trax.controller.js

@@ -2086,9 +2086,9 @@ export const validateUserv1 = async ( req, res ) => {
           let storeUserDetails = userDetails.find( ( ele ) => ele.newEmail.toLowerCase() == item.userEmail.toLowerCase() );
           item._id = getStoreDetails._id;
           item.storeId = getStoreDetails.storeId;
-          item.userName = storeUserDetails ? storeUserDetails?.userName : getStoreDetails?.spocDetails?.[0]?.name;
+          item.userName = storeUserDetails ? storeUserDetails?.userName : item.userName;
           item.storeName = getStoreDetails.storeName;
-          item.userEmail = storeUserDetails ? storeUserDetails?.email : getStoreDetails?.spocDetails?.[0]?.email;
+          item.userEmail = storeUserDetails ? storeUserDetails?.email : item.userEmail;
         }
       } );
     } else {
@@ -3730,9 +3730,9 @@ export async function checklistAssign( req, res ) {
 
 export async function updateAssign( req, res ) {
   try {
-    if ( !req.body.assignedList.length && !req.body.assignedGroup.length ) {
-      return res.sendError( 'No data found', 204 );
-    }
+    // if ( !req.body.assignedList.length && !req.body.assignedGroup.length ) {
+    //   return res.sendError( 'No data found', 204 );
+    // }
     let checklistDetails = await checklistService.findOne( { _id: req.body.checkListId, client_id: req.body.clientId } );
     if ( !checklistDetails ) {
       return res.sendError( 'No data found', 204 );

package/src/controllers/traxDashboard.controllers.js

@@ -738,119 +738,91 @@ export const userPerformance = async ( req, res ) => {
         userEmail: { $last: '$userEmail' },
         checkListCount: { $sum: '$_id' },
         timeFlag: { $sum: '$timeFlag' },
-        submittedChecklist: {
-          $sum: {
-            $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ],
-          },
-        },
+        submittedChecklist: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, 1, 0 ] } },
         checkListType: { $last: '$checkListType' },
-        // questionFlag: { $sum: '$questionFlag' },
         questionFlag: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, '$questionFlag', 0 ] } },
         questionCount: { $sum: '$questionCount' },
-        submittedChecklistQuestionCount: { $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, '$questionCount', 0 ] } },
+        submittedChecklistQuestionCount: {
+          $sum: { $cond: [ { $eq: [ '$checklistStatus', 'submit' ] }, '$questionCount', 0 ] },
+        },
       },
     } );
 
+
     findQuery.push( {
-      $project: {
+      $addFields: {
         userName: '$_id',
-        userEmail: 1,
-        checkListCount: { $sum: '$totalChecklist' },
         flaggedCount: { $add: [ '$timeFlag', '$questionFlag' ] },
-        submittedChecklist: 1,
-        timeFlag: 1,
-        checkListType: 1,
-        questionCount: 1,
-        questionFlag: 1,
+        correctAnswers: { $subtract: [ '$submittedChecklistQuestionCount', '$questionFlag' ] },
         completion: {
-          $round: [ { $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ] }, 0 ],
-          // $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ],
+          $round: [
+            { $multiply: [ { $divide: [ '$submittedChecklist', '$totalChecklist' ] }, 100 ] },
+            0,
+          ],
         },
-        correctAnswers: { $subtract: [ '$submittedChecklistQuestionCount', '$questionFlag' ] },
       },
     } );
 
+
     findQuery.push( {
-      $project: {
-        userName: 1,
-        userEmail: 1,
-        checkListCount: 1,
-        flaggedCount: 1,
-        submittedChecklist: 1,
-        checkListType: 1,
-        questionCount: 1,
-        questionFlag: 1,
-        timeFlag: 1,
-        completion: 1,
-        compliance: 1,
+      $addFields: {
         compliance: {
           $cond: {
             if: { $eq: [ '$questionCount', 0 ] },
             then: 0,
             else: {
               $round: [ { $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ] }, 0 ],
-              // $multiply: [ { $divide: [ '$correctAnswers', '$questionCount' ] }, 100 ],
             },
           },
         },
+        lowercaseUserName: { $toLower: '$userName' },
       },
     } );
 
     findQuery.push( {
-      $project: {
-        userName: 1,
-        lowercaseUserName: { $toLower: '$userName' },
-        userEmail: 1,
-        checkListCount: 1,
-        flaggedCount: 1,
-        submittedChecklist: 1,
-        checkListType: 1,
-        questionCount: 1,
-        questionFlag: 1,
-        timeFlag: 1,
-        correctAnswers: 1,
-        completion: 1,
-        compliance: 1,
+      $addFields: {
         performance: { $round: [ { $divide: [ { $add: [ '$completion', '$compliance' ] }, 2 ] }, 0 ] },
-        // performance: { $divide: [ { $add: [ '$completion', '$compliance' ] }, 2 ] },
       },
     } );
 
-    // let getTotalCount = await processedchecklistService.aggregate( findQuery );
-    // if ( !getTotalCount.length ) {
-    //   return res.sendError( { error: 'No Data Found' }, 204 );
-    // }
-
-    if ( requestData.sortColumnName && requestData.sortColumnName != '' && requestData.sortBy && requestData.sortBy !='' ) {
-      if ( requestData.sortColumnName == 'userName' ) {
-        findQuery.push( { $sort: { ['lowercaseUserName']: requestData.sortBy } } );
-      } else {
-        findQuery.push( { $sort: { [requestData.sortColumnName]: requestData.sortBy } } );
-      }
+    if ( requestData.sortColumnName && requestData.sortBy ) {
+      const sortField =
+    requestData.sortColumnName === 'userName' ? 'lowercaseUserName' : requestData.sortColumnName;
+      findQuery.push( { $sort: { [sortField]: requestData.sortBy } } );
     } else {
-      findQuery.push( { $sort: { ['userName']: -1 } } );
+      findQuery.push( { $sort: { userName: -1 } } );
     }
 
     let limit = parseInt( requestData?.limit ) || 10;
-    let skip = limit * ( requestData?.offset ) || 0;
+    let skip = limit * ( requestData?.offset || 0 );
     findQuery.push( {
       $facet: {
-        data: [
-          { $skip: skip }, { $limit: limit },
-        ],
-        count: [
-          { $count: 'total' },
-        ],
+        data: [ { $skip: skip }, { $limit: limit } ],
+        count: [ { $count: 'total' } ],
       },
-    },
-    );
+    } );
+
 
     let getUserPerformanceData = await processedchecklistService.aggregate( findQuery );
 
     if ( !getUserPerformanceData[0].data.length ) {
       return res.sendError( { error: 'No Data Found' }, 204 );
     }
-
+    if ( requestData.export ) {
+      const exportdata = [];
+      getUserPerformanceData[0].data.forEach( ( element ) => {
+        exportdata.push( {
+          'User Name': element.userName || '--',
+          'Email': element.userEmail || '--',
+          'Checklist Assigned': element.checkListCount || '--',
+          'Flags': element.flaggedCount || '--',
+          'Completion %': element.completion || '--',
+          'Compliance %': element.compliance || '--',
+          'Performance %': element.performance || '--',
+        } );
+      } );
+      return await download( exportdata, res );
+    }
     result.totalCount = getUserPerformanceData[0].count[0].total;
     result.userPerformance = getUserPerformanceData[0].data;
     return res.sendSuccess( result );
@@ -1358,6 +1330,42 @@ export const checklistInfo = async ( req, res ) => {
       getChecklistPerformanceData[i].date_string = dayjs( getChecklistPerformanceData[i].date_string ).format( 'DD MMM YYYY' );
     }
     result.checklistInfo = getChecklistPerformanceData;
+    if ( requestData.export ) {
+      const exportdata = [];
+      result.checklistInfo.forEach( ( element ) => {
+        if ( requestData.groupByType==='Checklist' ) {
+          exportdata.push( {
+            'Date': element.date_string || '--',
+            'Store Name': element.storeName || '--',
+            'Checklist Owner': element.userName || '--',
+            'Submitted By': element.userName || '--',
+            'Status': element.checklistStatus || '--',
+            'Submitted On': element.submitTime_string || '--',
+            'Flags': element.flaggedChecklist || '--',
+          } );
+        } else if ( requestData.groupByType==='Store' ) {
+          exportdata.push( {
+            'CheckList Name': element.checkListName || '--',
+            'Checklist Owner': element.userName || '--',
+            'Submitted By': element.userName || '--',
+            'Status': element.checklistStatus || '--',
+            'Submitted On': element.submitTime_string || '--',
+            'Flags': element.flaggedChecklist || '--',
+          } );
+        } else {
+          exportdata.push( {
+            'Date': element.date_string || '--',
+            'CheckList Name': element.checkListName || '--',
+            'Store Name': element.storeName || '--',
+            'Checklist Owner': element.userName || '--',
+            'Status': element.checklistStatus || '--',
+            'Submitted On': element.submitTime_string || '--',
+            'Flags': element.flaggedChecklist || '--',
+          } );
+        }
+      } );
+      return await download( exportdata, res );
+    }
     return res.sendSuccess( result );
   } catch ( error ) {
     console.log( 'error =>', error );

package/src/dtos/dashboardValidation.dtos.js

@@ -13,6 +13,7 @@ const tableSchema = {
   limit: joi.number().required(),
   offset: joi.number().required(),
   sortColumnName: joi.string().optional().allow( '' ),
+  export: joi.boolean().optional().allow( '' ),
 };