tango-app-api-audit 3.6.47 → 3.6.49

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -1447,7 +1447,8 @@ export async function summaryList( req, res ) {
       // If toDate is set to midnight (i.e., no time) OR is an ISO string at 00:00:00, set to end of day
       const fromDateIST = getISTDate( fromDate );
       const toDateIST = getISTDate( toDate );
-
+      logger.info( { fromDateIST, msg: '..............fromDateIST' } );
+      logger.info( { toDateIST, msg: '..............toDateIST' } );
 
       filter= [
         {
@@ -2165,7 +2166,7 @@ export async function summaryList( req, res ) {
           if ( element?._source?.type == 'physical' ) {
             exportData.push( {
               'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
-              'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs.utc( element?._source?.updatedAt ).add( 5, 'hour' ).add( 30, 'minute' ).format( 'D MMM, YYYY' ): 'NA',
+              'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )? dayjs.utc( element?._source?.updatedAt ).tz( 'Asia/Kolkata' ).format( 'D MMM, YYYY' ): 'NA',
               ...( req?.user?.role === 'superadmin' && { 'RM Name': RMName } ),
               ...( req?.user?.role !== 'user' && { 'Cluster Name': clusterName } ),
               'Store Name': element?._source?.storeName,
@@ -2191,7 +2192,7 @@ export async function summaryList( req, res ) {
           } else {
             exportData.push( {
               'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
-              'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs.utc( element?._source?.updatedAt ).add( 5, 'hour' ).add( 30, 'minute' ).format( 'D MMM, YYYY' ): 'NA',
+              'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs.utc( element?._source?.updatedAt ).tz( 'Asia/Kolkata' ).format( 'D MMM, YYYY' ): 'NA',
               ...( req?.user?.role === 'superadmin' && { 'RM Name': RMName } ),
               ...( req?.user?.role !== 'user' && { 'Cluster Name': clusterName } ),
               'Store Name': element?._source?.storeName,
@@ -2326,18 +2327,19 @@ export async function summaryList( req, res ) {
         const minutes = Math.floor( testDuration / 60 );
         const seconds = testDuration % 60;
         temp[i].complianceScore = `${item?._source?.totalSteps > 0 ? Math.round( ( item?._source?.coveredStepsAI / item?._source?.totalSteps ) * 100 ) : 0} %`;
-        temp[i].humanComplianceScore = [ 'Re-Audited', 'Audited' ].includes( item?._source?.auditStatus ) ? `${item?._source?.totalSteps > 0 ? Math.round( ( item?._source?.auditedSteps / item?._source?.totalSteps ) * 100 ) : 0} %` : 'NA';
+        temp[i].humanComplianceScore = [ 'Re-Audited', 'Audited' ].includes( item?._source?.auditStatus ) ?
+            `${item?._source?.totalSteps > 0 ? Math.round( ( item?._source?.auditedSteps / item?._source?.totalSteps ) * 100 ) : 0} %` :
+            'NA';
         temp[i].min = minutes;
         temp[i].sec = seconds;
         temp[i].auditedBy = userName?.userName || '';
         temp[i].date = dayjs( item?._source?.date ).format( 'D MMM, YYYY' );
 
-        // auditedDate date conversion from UTC to IST (Indian Standard Time)
+        // auditedDate: convert from UTC to Asia/Kolkata time zone
         if ( [ 'Re-Audited', 'Audited' ].includes( item?._source?.auditStatus ) ) {
           const auditedDate = item?._source?.updatedAt;
-          // Convert auditedDate from UTC to IST
-          const auditedDateIST = dayjs.utc( auditedDate ).add( 5, 'hour' ).add( 30, 'minute' ).format( 'D MMM, YYYY' );
-          temp[i].auditedDate = auditedDateIST;
+          const auditedDateKolkata = dayjs.utc( auditedDate ).tz( 'Asia/Kolkata' ).format( 'D MMM, YYYY' );
+          temp[i].auditedDate = auditedDateKolkata;
         } else {
           temp[i].auditedDate = 'NA';
         }
@@ -2627,7 +2629,7 @@ export async function summaryCard( req, res ) {
                 // 5. Past week comparison
                 'trend': {
                   date_range: {
-                    field: 'date',
+                    field: inputData?.dateType === 'auditedDate' ?'updatedAt':'date',
                     format: 'yyyy-MM-dd',
                     ranges: [
                       { key: 'previous', from: 'now-14d/d', to: 'now-7d/d' },