tango-app-api-trax 3.7.2-multireff-3 → 3.7.2-multireff-5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.2-multireff-3",
+    "version": "3.7.2-multireff-5",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -17,6 +17,7 @@
         "body-parser": "^1.20.3",
         "dayjs": "^1.11.13",
         "dotenv": "^16.4.5",
+        "exceljs": "^4.4.0",
         "express": "^4.21.1",
         "express-fileupload": "^1.5.1",
         "firebase-admin": "^13.0.0",
@@ -26,7 +27,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.2.197",
+        "tango-api-schema": "^2.2.198",
         "tango-app-api-middleware": "^3.1.77",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/gallery.controller.js

@@ -8,11 +8,11 @@ import * as processedchecklistconfigService from '../services/processedchecklist
 import * as processedChecklist from '../services/processedchecklist.services.js';
 import * as checklistLogs from '../services/checklistlog.service.js';
 import * as ApproverModel from '../services/approver.service.js';
-
+import ExcelJS from 'exceljs';
 import mongoose from 'mongoose';
 import dayjs from 'dayjs';
 import { aggregateTeams, findteams } from '../services/teams.service.js';
-import { aggregate } from '../services/user.service.js';
+import { aggregate, findOne } from '../services/user.service.js';
 // import axios from 'axios';
 import timeZone from 'dayjs/plugin/timezone.js';
 import customParseFormat from 'dayjs/plugin/customParseFormat.js';
@@ -289,7 +289,7 @@ export async function approveChecklist( req, res ) {
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
     let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, $or: [ { checklistStatus: 'submit' }, { redoStatus: true } ], approvalEnable: true };
-    if ( !( req.body.assignedStores && req.body.assignedStores.length >0 ) ) {
+    if ( !( req.body.assignedStores && req.body.assignedStores.length > 0 ) ) {
       req.body.assignedStores = req.body.storeId;
     }
     if ( req.body?.storeId?.length ) {
@@ -318,13 +318,13 @@ export async function approveChecklist( req, res ) {
 
       let teamsMsg;
       let teamsAlertUrls = process.env.teamsAlertURL ? JSON.parse( process.env.teamsAlertURL ) : '';
-      teamsMsg = 'ClientId: '+ checklistDetails[0].client_id + ', Type: Checklist, Process: started, Action: Approval, ChecklistId: '+ checklistDetails[0].sourceCheckList_id + ', Checklist Name: '+ checklistDetails[0].checkListName +', UpDatedBy: '+ req.user.email;
+      teamsMsg = 'ClientId: ' + checklistDetails[0].client_id + ', Type: Checklist, Process: started, Action: Approval, ChecklistId: ' + checklistDetails[0].sourceCheckList_id + ', Checklist Name: ' + checklistDetails[0].checkListName + ', UpDatedBy: ' + req.user.email;
       if ( teamsAlertUrls && teamsAlertUrls.approvalAlert ) {
         sendTeamsNotification( teamsAlertUrls.approvalAlert, teamsMsg );
       }
 
       if ( updateResponse.modifiedCount || updateResponse.matchedCount ) {
-        teamsMsg = 'ClientId: '+ checklistDetails[0].client_id + ', Type: Checklist, Process: Completed, Updated Count: '+updateResponse.modifiedCount+' Action: Approval, ChecklistId: '+ checklistDetails[0].sourceCheckList_id + ', Checklist Name: '+ checklistDetails[0].checkListName +', UpDatedBy: '+ req.user.email;
+        teamsMsg = 'ClientId: ' + checklistDetails[0].client_id + ', Type: Checklist, Process: Completed, Updated Count: ' + updateResponse.modifiedCount + ' Action: Approval, ChecklistId: ' + checklistDetails[0].sourceCheckList_id + ', Checklist Name: ' + checklistDetails[0].checkListName + ', UpDatedBy: ' + req.user.email;
         if ( teamsAlertUrls && teamsAlertUrls.approvalAlert ) {
           sendTeamsNotification( teamsAlertUrls.approvalAlert, teamsMsg );
         }
@@ -360,7 +360,7 @@ export async function approveChecklist( req, res ) {
         let searchResponse = await fetch( url.approveChecklist, requestOptions );
         // console.log( searchResponse );
         const filteredStoreIds = req.body.storeId.filter( ( store ) => req.body.assignedStores.includes( store ) );
-        let logData= {
+        let logData = {
           'client_id': checklistDetails[0].client_id,
           'createAt': new Date(),
           'sourceCheckList_id': req.body.sourceCheckList_id,
@@ -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,
@@ -491,10 +491,10 @@ export async function redoChecklist( req, res ) {
         type: checklistDetails.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[findQuestion].answerType,
         submitedBy: checklistDetails.userName,
-        submitTime: checklistDetails.submitTime,
+        submitTime: dayjs.utc( checklistDetails.submitTime ).format(),
       };
       await checklistLogs.create( data );
 
@@ -547,7 +547,7 @@ export async function redomultiChecklist( req, res ) {
   try {
     let inputData = req.body.payload.coverage === 'user' ? req.body.payload.userEmail : req.body.payload.storeName;
 
-
+    let inputBody = req.body;
     for ( let originalData of inputData ) {
       if ( !originalData.checklistId ) {
         return res.sendError( 'Id is Required', 400 );
@@ -559,6 +559,15 @@ export async function redomultiChecklist( req, res ) {
         return res.sendError( 'Question number is Required', 400 );
       }
 
+      let findcomment = {};
+      if ( !inputBody.payload.showcomment ) {
+        if ( inputBody.payload?.coverage === 'store' ) {
+          findcomment = inputBody.payload.excelData.find( ( ele ) => ele['Store Name'] === originalData.storeName );
+        } else if ( inputBody.payload?.coverage === 'users' ) {
+          findcomment = inputBody.payload.excelData.find( ( ele ) => ele['User Email'] === originalData.userEmail );
+        }
+      }
+      console.log( '****************', findcomment );
 
       let checklistDetails = await processedChecklist.findOne( { _id: originalData.checklistId }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1, submitTime: 1, userName: 1, answerType: 1 } );
       if ( !checklistDetails ) {
@@ -574,7 +583,7 @@ export async function redomultiChecklist( req, res ) {
 
       let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.payload.qno );
 
-      let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
+      let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoComment: req.body.payload?.showcomment ? req.body.payload?.checklistDescription : findcomment?.Comments };
       // if ( checklistDetails.client_id == '458' ) {
       data.answers.forEach( ( item ) => {
         if ( item.showLinked ) {
@@ -611,17 +620,17 @@ 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,
-          checklistDescription: req.body.payload.checklistDescription,
+          checklistDescription: req.body.payload?.showcomment ? req.body.payload?.checklistDescription : findcomment?.comments,
           sectionId: originalData.section_id,
           sectionName: question[sectionIndex].sectionName,
           questionName: question[sectionIndex].questions[findQuestion].qname,
@@ -633,10 +642,10 @@ export async function redomultiChecklist( req, res ) {
           type: checklistDetails.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[findQuestion].answerType,
           submitedBy: checklistDetails.userName,
-          submitTime: checklistDetails.submitTime,
+          submitTime: dayjs.utc( checklistDetails.submitTime ).format(),
         };
         await checklistLogs.create( data );
 
@@ -644,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 = {
@@ -655,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 = {
@@ -749,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 );
 
@@ -1148,7 +1191,35 @@ export async function checkNotificationCount( req, res ) {
     return res.sendError( { error: error }, 500 );
   }
 }
+export async function taskvalidateUserData( req, res ) {
+  try {
+    let error = [];
+    if ( req.body.coverage === 'store' ) {
+      for ( let [ index, store ] of req.body.assignedData.entries() ) {
+        let findstore = await storeService.findOne( { clientId: req.body.clientId, storeName: store['Store Name'] } );
+        console.log( findstore );
+        if ( !findstore ) {
+          error.push( `Invalid StoreName - C${index + 2}` );
+        }
+      }
+    }
+    if ( req.body.coverage === 'users' ) {
+      for ( let [ index, user ] of req.body.assignedData.entries() ) {
+        let finduser = await findOne( { clientId: req.body.clientId, email: user['User Email'] } );
+        if ( !finduser ) {
+          error.push( `Invalid userEmail - C${index + 2}` );
+        }
+      }
+    }
+    if ( error.length ) {
+      return res.sendError( error, 400 );
+    }
 
+    res.sendSuccess( 'success' );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'taskvalidateUserData' } );
+  }
+}
 export async function vehicleCheckInUpdate( req, res ) {
   try {
     let requestData = req.body;
@@ -1170,3 +1241,71 @@ export async function vehicleCheckInUpdate( req, res ) {
     return res.sendError( { error: error }, 500 );
   }
 }
+export async function getallchecklist( req, res ) {
+  try {
+    let url = JSON.parse( process.env.LAMBDAURL );
+    console.log( url.getallchecklist );
+
+    let resultData = await LamdaServiceCall( url.getallchecklist, req.body );
+    console.log( resultData );
+    if ( resultData ) {
+      if ( resultData.status_code == '200' ) {
+        resultData.message = '';
+        return res.sendSuccess( resultData );
+      } else {
+        return res.sendError( 'No Content', 204 );
+      }
+    } else {
+      return res.sendError( 'No Content', 204 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'getallchecklist' } );
+    return res.sendError( { error: error }, 500 );
+  }
+}
+export async function exportTemplate( req, res ) {
+  try {
+    const workbook = new ExcelJS.Workbook();
+    const worksheet = workbook.addWorksheet( 'Sheet1' );
+    if ( req.body.coverage === 'store' ) {
+      worksheet.addRow( [ 'Checklist Name', 'Question Name', 'Store Name', 'Comments' ] );
+    } else {
+      worksheet.addRow( [ 'Checklist Name', 'Question Name', 'User Email', 'Comments' ] );
+    }
+    for ( let data of req.body.excelData ) {
+      worksheet.addRow( [ data.checklistName, data.questionName, req.body.coverage === 'store'?data.storeName:data.userEmail, '' ] );
+    }
+    worksheet.eachRow( ( row, rowNumber ) => {
+      row.eachCell( { includeEmpty: true }, ( cell, colNumber ) => {
+        if ( colNumber === 1 || colNumber === 2 || colNumber === 3 ) {
+          cell.protection = { locked: true }; // Lock Name & Email
+        } else {
+          cell.protection = { locked: false }; // Unlock Phone
+        }
+      } );
+    } );
+
+    // Protect the worksheet
+    await worksheet.protect( 'yourPassword123', {
+      selectLockedCells: true,
+      selectUnlockedCells: true,
+      formatCells: false,
+      formatColumns: false,
+      formatRows: false,
+      insertColumns: false,
+      insertRows: false,
+      insertHyperlinks: false,
+      deleteColumns: false,
+      deleteRows: false,
+    } );
+
+
+    const buffer = await workbook.xlsx.writeBuffer();
+    res.setHeader( 'Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' );
+    res.setHeader( 'Content-Disposition', 'attachment; filename="Fixture Library.xlsx"' );
+    return res.send( buffer );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'exportTemplate' } );
+    return res.sendError( { error: error }, 500 );
+  }
+}

package/src/controllers/mobileTrax.controller.js

@@ -377,7 +377,7 @@ export async function startTask( req, res ) {
 
 
     let updatedNewData;
-    if ( task.checkListFrom && task.checkListFrom == 'api' ) {
+    if ( task.checkListFrom && [ 'api', 'gallery' ].includes( task.checkListFrom ) ) {
       updatedNewData = {
         checklistStatus: 'inprogress',
         startMobileTime: requestData?.currentTime,
@@ -1521,6 +1521,9 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
                 structure.qname = qaAnswers[j].qname;
+                if ( qaAnswers[j].qcomment && qaAnswers[j].qcomment!='' ) {
+                  structure.qcomment = qaAnswers[j].qcomment;
+                }
                 structure.answerType = qaAnswers[j].answerType;
                 structure.runAI = qaAnswers[j].runAI;
                 structure.runAIDescription = qaAnswers[j].runAIDescription;
@@ -1569,6 +1572,9 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
                 structure.qname = qaAnswers[j].qname;
+                if ( qaAnswers[j].qcomment && qaAnswers[j].qcomment!='' ) {
+                  structure.qcomment = qaAnswers[j].qcomment;
+                }
                 structure.answerType = qaAnswers[j].answerType;
                 structure.runAI = qaAnswers[j].runAI;
                 structure.runAIDescription = qaAnswers[j].runAIDescription;
@@ -1620,6 +1626,9 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
                 structure.qname = qaAnswers[j].qname;
+                if ( qaAnswers[j].qcomment && qaAnswers[j].qcomment!='' ) {
+                  structure.qcomment = qaAnswers[j].qcomment;
+                }
                 structure.answerType = qaAnswers[j].answerType;
                 structure.runAI = qaAnswers[j].runAI;
                 structure.runAIDescription = qaAnswers[j].runAIDescription;
@@ -1676,6 +1685,9 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
                 structure.qname = qaAnswers[j].qname;
+                if ( qaAnswers[j].qcomment && qaAnswers[j].qcomment!='' ) {
+                  structure.qcomment = qaAnswers[j].qcomment;
+                }
                 structure.answerType = qaAnswers[j].answerType;
                 structure.runAI = qaAnswers[j].runAI;
                 structure.runAIDescription = qaAnswers[j].runAIDescription;
@@ -1730,6 +1742,9 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
                 structure.qname = qaAnswers[j].qname;
+                if ( qaAnswers[j].qcomment && qaAnswers[j].qcomment!='' ) {
+                  structure.qcomment = qaAnswers[j].qcomment;
+                }
                 structure.answerType = qaAnswers[j].answerType;
                 structure.runAI = qaAnswers[j].runAI;
                 structure.runAIDescription = qaAnswers[j].runAIDescription;
@@ -3978,13 +3993,12 @@ export async function questionListV1( req, res ) {
       for ( let [ secIndex, section ] of getchecklist[0].questionAnswers.entries() ) {
         for ( let [ questionIndex, question ] of section.questions.entries() ) {
           let Multianswer = [];
-          // if ( getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage && getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage !='' ) {
-          //   getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage = await signedUrl( { file_path: decodeURIComponent( getchecklist[0].questionAnswers[secIndex].questions[questionIndex].questionReferenceImage ), Bucket: bucket.sop } );
-          // }
           if ( getchecklist[0].questionAnswers[secIndex].questions[questionIndex].multiQuestionReferenceImage && getchecklist[0].questionAnswers[secIndex].questions[questionIndex].multiQuestionReferenceImage.length>0 ) {
             let questionReff = getchecklist[0].questionAnswers[secIndex].questions[questionIndex].multiQuestionReferenceImage;
             for ( let qri = 0; qri < questionReff.length; qri++ ) {
-              getchecklist[0].questionAnswers[secIndex].questions[questionIndex].multiQuestionReferenceImage[qri].imageURL = `${cdnurl.TraxAnswerCDN}${getchecklist[0].questionAnswers[secIndex].questions[questionIndex].multiQuestionReferenceImage[qri].imageURL}`;
+              if ( getchecklist[0].questionAnswers[secIndex].questions[questionIndex].multiQuestionReferenceImage[qri].imageURL ) {
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].multiQuestionReferenceImage[qri].imageURL = `${cdnurl.TraxAnswerCDN}${getchecklist[0].questionAnswers[secIndex].questions[questionIndex].multiQuestionReferenceImage[qri].imageURL}`;
+              }
             }
           } else {
             getchecklist[0].questionAnswers[secIndex].questions[questionIndex].multiQuestionReferenceImage = [];
@@ -3994,7 +4008,6 @@ export async function questionListV1( req, res ) {
               let checkvalidation = null;
               if ( answer.validationAnswer && answer.validationAnswer !='' ) {
                 if ( answer.validationType != 'Descriptive Answer' ) {
-                  // checkvalidation = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
                   checkvalidation = `${cdnurl.TraxAnswerCDN}${answer.validationAnswer}`;
                 } else {
                   checkvalidation = answer.validationAnswer;
@@ -4003,9 +4016,6 @@ export async function questionListV1( req, res ) {
               Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
             }
-            // if ( answer.referenceImage != '' ) {
-            //   getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].referenceImage = await signedUrl( { file_path: decodeURIComponent( answer.referenceImage ), Bucket: bucket.sop } );
-            // }
             if ( answer.multiReferenceImage && answer.multiReferenceImage.length >0 ) {
               let ReffImg = answer.multiReferenceImage;
               for ( let ri = 0; ri < ReffImg.length; ri++ ) {
@@ -4013,23 +4023,31 @@ export async function questionListV1( req, res ) {
               }
             }
             if ( ( answer.validationType == 'Capture Image' || answer.validationType == 'Capture Video' ) && answer.validationAnswer && answer.validationAnswer != '' ) {
-              // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].validationAnswer = await signedUrl( { file_path: decodeURIComponent( answer.validationAnswer ), Bucket: bucket.sop } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].validationAnswer = `${cdnurl.TraxAnswerCDN}${answer.validationAnswer}`;
             }
           }
           if ( question?.userAnswer ) {
             for ( let [ userAnsIndex, userAns ] of question.userAnswer.entries() ) {
               if ( ( userAns.validationType == 'Capture Image' || userAns.validationType == 'Capture Video' ) && userAns.validationAnswer && userAns.validationAnswer != '' ) {
-                // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationAnswer = await signedUrl( { file_path: decodeURIComponent( userAns.validationAnswer ), Bucket: bucket.sop } );
                 getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].validationAnswer = `${cdnurl.TraxAnswerCDN}${userAns.validationAnswer}`;
               }
               if ( [ 'image', 'descriptiveImage', 'video' ].includes( question.answerType ) && userAns.answer != '' ) {
-                // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
                 getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].answer = `${cdnurl.TraxAnswerCDN}${userAns.answer}`;
               }
-              if ( userAns.referenceImage != '' ) {
-                // getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].referenceImage = await signedUrl( { file_path: decodeURIComponent( userAns.referenceImage ), Bucket: bucket.sop } );
-                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].referenceImage = `${cdnurl.TraxAnswerCDN}${userAns.referenceImage}`;
+              // if ( userAns.multiReferenceImage != '' ) {
+              //   getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].multiReferenceImage = `${cdnurl.TraxAnswerCDN}${userAns.multiReferenceImage}`;
+              // }
+              if ( Array.isArray( userAns.multiReferenceImage ) && userAns.multiReferenceImage.length ) {
+                userAns.multiReferenceImage = userAns.multiReferenceImage.map( ( imgObj ) => {
+                  // Extract filename or path from the existing URL
+                  const path = imgObj.imageURL.split( '/checklist/' )[1]; // adjust if path structure differs
+                  return {
+                    ...imgObj,
+                    imageURL: `${cdnurl.TraxAnswerCDN}/checklist/${path}`,
+                  };
+                } );
+
+                getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].multiReferenceImage = userAns.multiReferenceImage;
               }
               if ( question.answerType == 'multiplechoicemultiple' ) {
                 let ansIndex = Multianswer.findIndex( ( item ) => item.answer == userAns.answer );
@@ -4039,7 +4057,6 @@ export async function questionListV1( req, res ) {
               }
               if ( question.answerType == 'multipleImage' ) {
                 if ( userAns && userAns.answer && userAns.answer !='' ) {
-                  // let manswer = await signedUrl( { file_path: decodeURIComponent( userAns.answer ), Bucket: bucket.sop } );
                   let manswer = `${cdnurl.TraxAnswerCDN}${userAns.answer}`;
                   Multianswer.push( { 'answer': manswer, 'no': userAnsIndex, 'validationAnswer': '' } );
                 } else {

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 } 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,9 +28,13 @@ 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 )
     .post( '/userList', isAllowedSessionHandler, isAllowedClient, userList )
+    .post( '/taskvalidateUserData', isAllowedSessionHandler, isAllowedClient, taskvalidateUserData )
     .post( '/checkNotificationCount', isAllowedSessionHandler, getAssinedStore, checkNotificationCount )
-    .post( '/vehicleCheckInUpdate', isAllowedSessionHandler, vehicleCheckInUpdate );
+    .post( '/vehicleCheckInUpdate', isAllowedSessionHandler, vehicleCheckInUpdate )
+    .post( '/exportTemplate', isAllowedSessionHandler, exportTemplate )
+    .post( '/getallchecklist', isAllowedSessionHandler, getallchecklist );