tango-app-api-trax 3.6.2-bulktask-11 → 3.6.2-bulktask-12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.6.2-bulktask-11",
+    "version": "3.6.2-bulktask-12",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -469,13 +469,13 @@ export async function redoChecklist( req, res ) {
     let response = await processedChecklist.updateOne( { _id: req.body.payload._id }, updateData );
     // console.log( response );
     if ( response.modifiedCount || response.matchedCount ) {
-      let storeTimeZone = await storeService.findOne( { storeName: checklistDetails.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: checklistDetails.storeName }, { 'storeProfile.timeZone': 1 } );
+      // let currentDateTime;
+      // if ( storeTimeZone?.storeProfile?.timeZone ) {
+      //   currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+      // } else {
+      //   currentDateTime = dayjs();
+      // }
       data = {
         checklistId: checklistDetails.sourceCheckList_id,
         checkListName: checklistDetails.checkListName,
@@ -620,13 +620,13 @@ export async function redomultiChecklist( req, res ) {
       let response = await processedChecklist.updateOne( { _id: originalData.checklistId }, updateData );
       // console.log( response );
       if ( response.modifiedCount || response.matchedCount ) {
-        let storeTimeZone = await storeService.findOne( { storeName: checklistDetails.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: checklistDetails.storeName }, { 'storeProfile.timeZone': 1 } );
+        // let currentDateTime;
+        // if ( storeTimeZone?.storeProfile?.timeZone ) {
+        //   currentDateTime = dayjs().tz( storeTimeZone?.storeProfile?.timeZone );
+        // } else {
+        //   currentDateTime = dayjs();
+        // }
         data = {
           checklistId: checklistDetails.sourceCheckList_id,
           checkListName: checklistDetails.checkListName,
@@ -642,7 +642,7 @@ export async function redomultiChecklist( req, res ) {
           type: checklistDetails.checkListType,
           userAnswer: userAnswer,
           initiatedBy: req.user.userName,
-          initiatedTime: dayjs.utc(  ).format(),
+          initiatedTime: dayjs.utc( ).format(),
           answerType: question[sectionIndex].questions[findQuestion].answerType,
           submitedBy: checklistDetails.userName,
           submitTime: dayjs.utc( checklistDetails.submitTime ).format(),
@@ -653,7 +653,9 @@ export async function redomultiChecklist( req, res ) {
         req.body.payload._id = originalData.checklistId;
         req.body.payload.section_id = originalData.section_id;
         req.body.payload.uniqueNo = originalData.uniqueNo;
-        // console.log( req.body );
+        console.log( req.body );
+
+        // return;
 
 
         const requestOptions = {
@@ -664,6 +666,7 @@ export async function redomultiChecklist( req, res ) {
           body: JSON.stringify( req.body ),
         };
         let url = JSON.parse( process.env.LAMBDAURL );
+        console.log( url.redoChecklist );
         let searchResponse = await fetch( url.redoChecklist, requestOptions );
         console.log( searchResponse.ok );
         let logData = {
@@ -758,6 +761,37 @@ export async function approvalstatus( req, res ) {
     }
 
 
+    let url = JSON.parse( process.env.LAMBDAURL );
+    let resultData = await LamdaServiceCall( url.approvalstatus, req.body );
+
+    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, 'approvalstatus' );
+    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.approvalstatus, req.body );
+      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.approvalstatus, req.body );
 

package/src/routes/gallery.routes.js

@@ -2,7 +2,7 @@
 
 import { getchecklist, viewchecklist, getMobileUseagelist, storeOpencloselist, getcustomerunattendedlist,
   storesList, checklistDropdown, redoChecklist, redomultiChecklist, approveChecklist,
-  approvalstatus, getLogs, headerStoresV2, teamsList, userList, checkNotificationCount, vehicleCheckInUpdate, taskvalidateUserData, getallchecklist, exportTemplate } from '../controllers/gallery.controller.js';
+  approvalstatus, allapprovalstatus, getLogs, headerStoresV2, teamsList, userList, checkNotificationCount, vehicleCheckInUpdate, taskvalidateUserData, getallchecklist, exportTemplate } from '../controllers/gallery.controller.js';
 import express from 'express';
 export const galleryRouter = express.Router();
 import { validate, isAllowedSessionHandler, isAllowedClient, getAssinedStore } from 'tango-app-api-middleware';
@@ -28,6 +28,7 @@ galleryRouter
     .post( '/redo', isAllowedSessionHandler, redoChecklist )
     .post( '/multiredo', isAllowedSessionHandler, redomultiChecklist )
     .post( '/approvalstatus', isAllowedSessionHandler, approvalstatus )
+    .post( '/allapprovalstatus', isAllowedSessionHandler, allapprovalstatus )
     .post( '/getLogs', isAllowedSessionHandler, getLogs )
     .post( '/headerStores_v2', isAllowedSessionHandler, isAllowedClient, validate( validationDtos.validateHeaderParamsv2 ), getAssinedStore, headerStoresV2 )
     .get( '/teamsList', isAllowedSessionHandler, isAllowedClient, teamsList )