tango-app-api-task 1.0.0-beta.7 → 1.0.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "1.0.0-beta.7",
+    "version": "1.0.0-beta.9",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -1394,6 +1394,7 @@ export async function redoTask( req, res ) {
     let data = { ...question[sectionIndex].questions[req.body.payload.qno - 1], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
     let userAnswer = data.userAnswer;
     question[sectionIndex].questions[req.body.payload.qno - 1] = data;
+    question[sectionIndex].questions[req.body.payload.qno - 1].remarks = '';
     question[sectionIndex].questions[req.body.payload.qno - 1].userAnswer = [];
     taskDetails.questionAnswers = question;
     let updateData = {
@@ -1443,7 +1444,7 @@ export async function redoTask( req, res ) {
       return res.sendError( 'Something went wrong', 500 );
     }
   } catch ( e ) {
-    logger.error( { function: 'redoChecklist', error: e, message: req.body } );
+    logger.error( { function: 'redoTask', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 }
@@ -1608,15 +1609,23 @@ export const taskDropdown = async ( req, res ) => {
 };
 export async function approvalstatus( req, res ) {
   try {
-    if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) ) {
-      return res.sendError( 'No Content', 204 );
-    }
     let Approver = await ApproverModel.find( { checkListId: req.body.checklistId } );
     if ( Approver.length === 0 ) {
       return res.sendSuccess( 'suceess' );
     }
     let filterApprover = Approver.filter( ( data ) => data.userEmail=== req.user.email );
     if ( filterApprover.length === 0 ) {
+      if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) ) {
+        let url = JSON.parse( process.env.LAMBDAURL );
+        let resultData = await LamdaServiceCall( url.approvalstatus, req.body );
+        if ( resultData ) {
+          console.log( resultData.status_code );
+          if ( resultData.status_code == '200' ) {
+            return res.sendSuccess( resultData );
+          }
+        }
+        return res.sendError( 'No Content', 204 );
+      }
       return res.sendSuccess( 'suceess' );
     }
 

package/src/controllers/taskDashboard.controllers.js

@@ -263,7 +263,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
     findQuery.push(
         {
           $group: {
-            _id: { userEmail: '$userEmail', storeId: '$store_id' },
+            _id: { userEmail: '$userEmail', storeId: '$store_id', checklistStatus: '$checklistStatus' },
             checkListName: { $first: '$checkListName' },
             createdByName: { $first: '$createdByName' },
             userName: { $first: '$userName' },
@@ -281,6 +281,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
             reinitiateStatus: { $first: '$reinitiateStatus' },
             scheduleEndTime_iso: { $first: '$scheduleEndTime_iso' },
             processedchecklistId: { $first: '$_id' },
+            redoStatus: { $first: '$redoStatus' },
           },
         },
     );
@@ -305,6 +306,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
         reinitiateStatus: 1,
         scheduleEndTime_iso: 1,
         processedchecklistId: 1,
+        redoStatus: 1,
       },
     } );
 
@@ -345,6 +347,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
         sourceCheckList_id: 1,
         scheduleEndTime_iso: 1,
         processedchecklistId: 1,
+        redoStatus: 1,
       },
     } );