tango-app-api-task 3.4.1-approvecheck-0 → 3.5.0-alpha-0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.4.1-approvecheck-0",
+    "version": "3.5.0-alpha-0",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -2305,7 +2305,14 @@ export async function approveTask( req, res ) {
     }
     let idList = taskDetails.filter( ( ele ) => ele.checklistStatus == 'submit' ).map( ( item ) => item._id );
     if ( idList.length ) {
-      let updateResponse = await taskProcessedService.updateMany( { _id: { $in: idList } }, { approvalStatus: true,approvalTime:new Date(),        approvalTime_string:dayjs.format("hh:mm A, DD MMM YYYY"),        approvalByName:req.user.name,        approvalByEmail:req.user.email } );
+      let approvalUpdateData = {
+        approvalStatus: true,
+        approvalTime: new Date(),
+        approvalTime_string: dayjs().format( 'hh:mm A, DD MMM YYYY' ),
+        approvalByName: req.user.userName,
+        approvalByEmail: req.user.email,
+      };
+      let updateResponse = await taskProcessedService.updateMany( { _id: { $in: idList } }, approvalUpdateData );
       if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
         let inputstores = taskDetails.filter( ( data ) => data.checklistStatus == 'submit' );
         let storeNames = inputstores.map( ( data ) => data.storeName );
@@ -2319,10 +2326,10 @@ export async function approveTask( req, res ) {
           },
           'upsert': {
             approvalStatus: true,
-            approvalTime:new Date(),
-            approvalTime_string:dayjs.format("hh:mm A, DD MMM YYYY"),
-            approvalByName:req.user.name,
-            approvalByEmail:req.user.email
+            approvalTime: new Date(),
+            approvalTime_string: dayjs().format( 'hh:mm A, DD MMM YYYY' ),
+            approvalByName: req.user.userName,
+            approvalByEmail: req.user.email,
           },
         };
         const requestOptions = {
@@ -3834,7 +3841,7 @@ export async function eyeTesttask( req, res ) {
         checkListName: data.checkListName,
         client_id: inputBody.clientId,
         userId: userId,
-        assignId:storeDetails?._id
+        assignId: storeDetails?._id,
       };
       await taskAssignService.create( userDetails );
       await insertSingleProcessData( response?._id, true, inputBody );

package/src/controllers/taskDashboard.controllers.js

@@ -296,6 +296,8 @@ export const taskInfoTableV1 = async ( req, res ) => {
             priorityType: { $first: '$priorityType' },
             allowedStoreLocation: { $first: '$allowedStoreLocation' },
             restrictAttendance: { $first: '$restrictAttendance' },
+            approvalByEmail: { $first: '$approvalByEmail' },
+            approvalTime_string: { $first: '$approvalTime_string' },
           },
         },
     );
@@ -324,6 +326,8 @@ export const taskInfoTableV1 = async ( req, res ) => {
         priorityType: 1,
         allowedStoreLocation: 1,
         restrictAttendance: 1,
+        approvalByEmail: 1,
+        approvalTime_string: 1,
       },
     } );
 
@@ -368,6 +372,8 @@ export const taskInfoTableV1 = async ( req, res ) => {
         priorityType: 1,
         allowedStoreLocation: 1,
         restrictAttendance: 1,
+        approvalByEmail: 1,
+        approvalTime_string: 1,
       },
     } );
 
@@ -411,9 +417,11 @@ export const taskInfoTableV1 = async ( req, res ) => {
           'Store': task?.storeName ||'--',
           'Store SPOC': task?.userEmail ||'--',
           'Due On': dayjs.utc( task?.scheduleEndTime_iso ).format( 'DD MMM, YYYY' ) || '--',
+          'status': task?.checklistStatus ||'--',
           'Submitted On': task?.submitTime_string || '--',
           'Assigned To': task?.storeCount ||'--',
-          'status': task?.checklistStatus ||'--',
+          'Approval By': task.approvalByEmail || '--',
+          'Approval On': task.approvalTime_string || '--',
         } );
       }
       await download( exportResult, res );