tango-app-api-audit 3.4.3-alpha.16 → 3.4.3-alpha.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.3-alpha.16",
+    "version": "3.4.3-alpha.17",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/audit.controllers.js

@@ -1660,21 +1660,22 @@ export async function userAuditHistory( req, res ) {
         chunk.forEach( ( element ) => {
           exportData.push( {
             'File Date': element.fileDate,
-            'Brand ID': element.clientId,
             'Brand Name': element.clientName,
-            'Store ID': element.storeId,
+            'Brand ID': element.clientId,
             'Store Name': element.storeName,
+            'Store ID': element.storeId,
             'Zone Name': element.moduleType == 'zone' ? element.zoneName : '',
             'Audit Type': element.auditType,
             'Product Type': element.moduleType,
             'Before Count': element.beforeCount,
             'After Count': element.afterCount || '',
             'Accuracy': element.accuracy || '',
+            'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
             'Start Time': element.startTime,
             'End Time': element.endTime || '',
             'Time Spent': element.timeSpent,
-            'Audit Status': element.auditStatus,
-            'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
+            'Status': element.auditStatus,
+
 
           } );
         } );
@@ -3811,7 +3812,7 @@ export async function auditImages( req, res ) {
 export async function getUserAuditCount( req, res ) {
   try {
     const userWallet = JSON.parse( process.env.USER_WALLET );
-    const previousDate = dayjs( new Date() ).subtract( 1, 'days' );
+    const previousDate = dayjs( new Date() ).subtract( 16, 'days' );
     const fileDate = dayjs( previousDate ).format( 'DD-MM-YYYY' );
     const configTimeSpentSec = userWallet.minTimeSpentSec; // 18000;
     const beforeCountX = userWallet.beforeCountCreditPerc; // 0.0335;
@@ -4040,16 +4041,16 @@ export async function getUserAuditCount( req, res ) {
           totalTimeSpent: {
             $cond: [ { $eq: [ '$hours', 0 ] },
               { $concat: [
-                { $toString: '$minutes' }, ' minutes',
+                '00:', { $toString: '$minutes' }, ':00',
               ] },
               { $cond: [ { $eq: [ '$minutes', 0 ] },
                 { $concat: [
-                  { $toString: '$hours' }, ' hours',
+                  { $toString: '$hours' }, ':00:00',
                 ] },
                 {
                   $concat: [
-                    { $toString: '$hours' }, ' hours and ',
-                    { $toString: '$minutes' }, ' minutes',
+                    { $toString: '$hours' }, ':',
+                    { $toString: '$minutes' }, ':00',
                   ],
                 },
               ] },

package/src/controllers/traxAudit.controllers.js

@@ -1714,18 +1714,17 @@ export async function userAuditHistory( req, res ) {
           const temp ={
 
             'File Date': element.fileDate,
-            'Brand ID': element.clientId,
             'Brand Name': element.clientName,
-            'Store ID': element.storeId,
+            'Brand ID': element.clientId,
             'Store Name': element.storeName,
+            'Store ID': element.storeId,
             'Audit Type': element.auditType,
             'Product Type': element.value,
+            'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
             'Start Time': element.startTime,
             'End Time': element.endTime || '',
             'Time Spent': element.timeSpent,
             'Status': toCamelCase( element.auditStatus ),
-            'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
-            'Result': element.answer,
 
 
           };