tango-app-api-task 3.6.2-bulktask-7 → 3.6.2-bulktask-9

package/package.json

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

package/src/controllers/task.controller.js

@@ -1632,7 +1632,7 @@ export async function uploadImage( req, res ) {
       return res.sendError( { message: 'Something went wrong' }, 500 );
     }
 
-    return res.sendSuccess( { message: 'Uploaded Successfully', imgUrl: imgUrl, path: imgUrl.Key } );
+    return res.sendSuccess( { message: 'Uploaded Successfully', imgUrl: imgUrl, path: inputData.file_path } );
   } catch ( e ) {
     logger.error( 'uploadImage =>', e );
     return res.sendError( e, 500 );
@@ -2508,13 +2508,13 @@ export async function redoTask( req, res ) {
     let response = await taskProcessedService.updateOne( { _id: req.body.payload._id }, updateData );
     // console.log( response );
     if ( response.modifiedCount || response.matchedCount ) {
-      let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
-      let currentDateTime;
-      if ( storeTimeZone?.storeProfile?.timeZone ) {
-        currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
-      } else {
-        currentDateTime = dayjs();
-      }
+      // let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
+      // let currentDateTime;
+      // if ( storeTimeZone?.storeProfile?.timeZone ) {
+      //   currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+      // } else {
+      //   currentDateTime = dayjs();
+      // }
       data = {
         checklistId: taskDetails.sourceCheckList_id,
         checkListName: taskDetails.checkListName,
@@ -2530,7 +2530,7 @@ export async function redoTask( req, res ) {
         type: taskDetails.checkListType,
         userAnswer: userAnswer,
         initiatedBy: req.user.userName,
-        initiatedTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
+        initiatedTime: dayjs.utc( ).format(),
         answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
         submitedBy: taskDetails.userName,
         submitTime: dayjs.utc( taskDetails.submitTime ).format(),
@@ -2623,13 +2623,13 @@ export async function redomultiTask( req, res ) {
       let response = await taskProcessedService.updateOne( { _id: originalData.checklistId }, updateData );
       // console.log( response );
       if ( response.modifiedCount || response.matchedCount ) {
-        let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
-        let currentDateTime;
-        if ( storeTimeZone?.storeProfile?.timeZone ) {
-          currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
-        } else {
-          currentDateTime = dayjs();
-        }
+        // let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
+        // let currentDateTime;
+        // if ( storeTimeZone?.storeProfile?.timeZone ) {
+        //   currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+        // } else {
+        //   currentDateTime = dayjs();
+        // }
         data = {
           checklistId: taskDetails.sourceCheckList_id,
           checkListName: taskDetails.checkListName,
@@ -2645,7 +2645,7 @@ export async function redomultiTask( req, res ) {
           type: taskDetails.checkListType,
           userAnswer: userAnswer,
           initiatedBy: req.user.userName,
-          initiatedTime: dayjs.utc( currentDateTime.format( 'hh:mm:ss A, DD MMM YYYY' ), 'hh:mm:ss A, DD MMM YYYY' ).format(),
+          initiatedTime: dayjs.utc().format(),
           answerType: question[sectionIndex].questions[req.body.payload.qno - 1].answerType,
           submitedBy: taskDetails.userName,
           submitTime: dayjs.utc( taskDetails.submitTime ).format(),
@@ -2654,6 +2654,7 @@ export async function redomultiTask( req, res ) {
         req.body.payload.section_id = originalData.section_id;
         req.body.payload.uniqueNo = originalData.uniqueNo;
         await checklistLogs.create( data );
+
         const requestOptions = {
           method: 'POST',
           headers: {
@@ -2873,6 +2874,7 @@ export async function approvalstatus( req, res ) {
       if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) ) {
         let url = JSON.parse( process.env.LAMBDAURL );
         let resultData = await LamdaServiceCall( url.approvalstatustask, req.body );
+        console.log( resultData );
         if ( resultData ) {
           if ( resultData.status_code == '200' ) {
             return res.sendSuccess( resultData );
@@ -2886,6 +2888,7 @@ export async function approvalstatus( req, res ) {
 
     let url = JSON.parse( process.env.LAMBDAURL );
     let resultData = await LamdaServiceCall( url.approvalstatustask, req.body );
+    console.log( resultData );
 
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
@@ -2901,6 +2904,39 @@ export async function approvalstatus( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+export async function allapprovalstatus( req, res ) {
+  try {
+    if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) ) {
+      let url = JSON.parse( process.env.LAMBDAURL );
+      let resultData = await LamdaServiceCall( url.approvalstatustask, req.body );
+      console.log( resultData );
+      if ( resultData ) {
+        if ( resultData.status_code == '200' ) {
+          return res.sendSuccess( resultData );
+        }
+      }
+      return res.sendError( 'No Content', 204 );
+    }
+
+
+    let url = JSON.parse( process.env.LAMBDAURL );
+    let resultData = await LamdaServiceCall( url.approvalstatustask, req.body );
+    console.log( resultData );
+
+    if ( resultData ) {
+      if ( resultData.status_code == '200' ) {
+        return res.sendSuccess( resultData );
+      } else {
+        return res.sendError( 'No Content', 204 );
+      }
+    } else {
+      return res.sendError( 'No Content', 204 );
+    }
+  } catch ( error ) {
+    logger.error( error, 'allapprovalstatus' );
+    return res.sendError( error, 500 );
+  }
+}
 
 export const taskList = async ( req, res ) => {
   try {

package/src/routes/task.routes.js

@@ -24,6 +24,7 @@ taskRouter
     .post( '/getAnswers', isAllowedSessionHandler, taskController.getAnswers )
     .post( '/getAnswerCount', isAllowedSessionHandler, taskController.getAnswerCount )
     .post( '/approvalstatus', isAllowedSessionHandler, taskController.approvalstatus )
+    .post( '/allapprovalstatus', isAllowedSessionHandler, taskController.allapprovalstatus )
     .get( '/task-list', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ ] } ] } ), taskController.taskList )
     .put( '/publish', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.updatePublish )
     .get( '/duplicateTask/:checklistId', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'Task', permissions: [ 'isEdit' ] } ] } ), taskController.duplicateChecklist )