tango-app-api-trax 3.7.53 → 3.7.54

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.53",
+    "version": "3.7.54",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/mobileTrax.controller.js

@@ -3237,6 +3237,7 @@ export async function questionList( req, res ) {
         startTime: { $ifNull: [ '$startTime', '' ] },
         submitTime: { $ifNull: [ '$submitTime', '' ] },
         allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
+        sourceCheckList_id: 1,
         // allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
         allowedStoreLocation: {
           $cond: {
@@ -3292,7 +3293,7 @@ export async function questionList( req, res ) {
           }
 
           for ( let [ ansIndex, answer ] of question.answers.entries() ) {
-            if ( question.answerType == 'multiplechoicemultiple' ) {
+            if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType == 'dropdown' && question.allowMultiple ) ) {
               let checkvalidation = null;
               if ( answer.validationAnswer && answer.validationAnswer !='' ) {
                 if ( answer.validationType != 'Descriptive Answer' ) {
@@ -3346,7 +3347,7 @@ export async function questionList( req, res ) {
                 getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].multiReferenceImage = userAns.multiReferenceImage;
               }
 
-              if ( question.answerType == 'multiplechoicemultiple' ) {
+              if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType == 'dropdown' && question.allowMultiple ) ) {
                 let ansIndex = Multianswer.findIndex( ( item ) => item.answer == userAns.answer );
                 if ( ansIndex ) {
                   Multianswer[ansIndex].validationAnswer = userAns.validationAnswer;
@@ -3363,7 +3364,7 @@ export async function questionList( req, res ) {
               }
             }
           }
-          if ( question.answerType == 'multiplechoicemultiple' ) {
+          if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType == 'dropdown' && question.allowMultiple ) ) {
             Multianswer.forEach( ( item ) => {
               if ( item.validationAnswer == null ) {
                 item.answer = null;
@@ -3424,6 +3425,11 @@ export async function questionList( req, res ) {
         }
       }
 
+      let checklisDetails = await checklistService.findOne( { _id: getchecklist?.[0]?.sourceCheckList_id }, { export: 1 } );
+      if ( checklisDetails ) {
+        getchecklist[0]['export'] = checklisDetails.export;
+      }
+
       return res.sendSuccess( getchecklist );
     }
   } catch ( e ) {
@@ -4245,6 +4251,7 @@ export async function questionListV1( req, res ) {
         startTime: { $ifNull: [ '$startTime', '' ] },
         submitTime: { $ifNull: [ '$submitTime', '' ] },
         allowedOverTime: { $ifNull: [ '$allowedOverTime', '' ] },
+        sourceCheckList_id: { $ifNull: [ '$sourceCheckList_id', '' ] },
         // allowedStoreLocation: { $ifNull: [ '$allowedStoreLocation', '' ] },
         allowedStoreLocation: {
           $cond: {
@@ -4300,7 +4307,7 @@ export async function questionListV1( req, res ) {
           }
 
           for ( let [ ansIndex, answer ] of question.answers.entries() ) {
-            if ( question.answerType == 'multiplechoicemultiple' ) {
+            if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType == 'dropdown' && question.allowMultiple ) ) {
               let checkvalidation = null;
               if ( answer.validationAnswer && answer.validationAnswer !='' ) {
                 if ( answer.validationType != 'Descriptive Answer' ) {
@@ -4352,7 +4359,7 @@ export async function questionListV1( req, res ) {
 
                 getchecklist[0].questionAnswers[secIndex].questions[questionIndex].userAnswer[userAnsIndex].multiReferenceImage = userAns.multiReferenceImage;
               }
-              if ( question.answerType == 'multiplechoicemultiple' ) {
+              if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType == 'dropdown' && question.allowMultiple ) ) {
                 let ansIndex = Multianswer.findIndex( ( item ) => item.answer == userAns.answer );
                 if ( ansIndex ) {
                   Multianswer[ansIndex].validationAnswer = userAns.validationAnswer;
@@ -4368,7 +4375,7 @@ export async function questionListV1( req, res ) {
               }
             }
           }
-          if ( question.answerType == 'multiplechoicemultiple' ) {
+          if ( question.answerType == 'multiplechoicemultiple' || ( question.answerType == 'dropdown' && question.allowMultiple ) ) {
             Multianswer.forEach( ( item ) => {
               if ( item.validationAnswer == null ) {
                 item.answer = null;
@@ -4429,6 +4436,11 @@ export async function questionListV1( req, res ) {
         }
       }
 
+      let checklisDetails = await checklistService.findOne( { _id: getchecklist?.[0]?.sourceCheckList_id }, { export: 1 } );
+      if ( checklisDetails ) {
+        getchecklist[0]['export'] = checklisDetails.export;
+      }
+
       return res.sendSuccess( getchecklist );
     }
   } catch ( e ) {
@@ -4508,6 +4520,10 @@ export async function downloadChecklist( req, res ) {
       checklistDetails = await processedTask.findOne( { _id: requestData.checklistId, checklistStatus: 'submit' } );
     }
 
+    if ( !checklistDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+
     let storeDetails = await storeService.findOne( { storeId: checklistDetails.store_id }, { storeProfile: 1 } );
     if ( !storeDetails ) {
       return res.sendError( 'No data found', 204 );
@@ -4521,31 +4537,29 @@ export async function downloadChecklist( req, res ) {
 
     checklistDetails = { ...checklistDetails.toObject(), ...storeDetails?.toObject()?.storeProfile };
 
-    console.log( checklistDetails );
 
     let scheduleDateTime = dayjs( checklistDetails.submitTime );
     checklistDetails.submitDate = scheduleDateTime.format( 'DD MMM, YYYY' );
     checklistDetails.submitTime = scheduleDateTime.format( 'hh:mm A' );
-    // if ( checklistDetails?.brandDetails?.brandLogo ) {
-    //   let bucketpath = req.user.client_id + '/logo';
-
-    //   let params = {
-    //     bucketName: JSON.parse( process.env.BUCKET )?.sop,
-    //     filePath: `${bucketpath}/${checklistDetails?.brandDetails?.brandLogo}`,
-    //   };
-    //   let url = await signedUrl( params.filePath, params.bucketName );
-
-    //   let brandImage = await convertUrltoBase64( url );
-    //   if ( brandImage ) {
-    //     checklistDetails.brandLogo = brandImage;
-    //   }
-    // }
-    // checklistDetails.brandName = checklistDetails.brandDetails.brandName;
+    if ( clientDetails?.profileDetails?.logo ) {
+      let bucketpath = checklistDetails.client_id + '/logo';
+
+      let params = {
+        Bucket: JSON.parse( process.env.BUCKET )?.assets,
+        file_path: `${bucketpath}/${clientDetails?.profileDetails?.logo}`,
+      };
+      let url = await signedUrl( params );
+      let brandImage = await convertUrltoBase64( url );
+      if ( brandImage ) {
+        checklistDetails['brandLogo'] = brandImage;
+      }
+    }
+    checklistDetails['brandName'] = clientDetails?.clientName;
     for ( let section of checklistDetails.questionAnswers ) {
       for ( let question of section.questions ) {
         question.remarks = question.remarks == null || question.remarks == 'null' ? '' : question.remarks;
         for ( let answer of question.userAnswer ) {
-          if ( answer.referenceImage != '' ) {
+          if ( answer?.referenceImage?.trim() ) {
             let inputData = {
               Bucket: JSON.parse( process.env.BUCKET )?.sop,
               file_path: answer.referenceImage,
@@ -4556,7 +4570,7 @@ export async function downloadChecklist( req, res ) {
               answer.referenceImage = base64Image;
             }
           }
-          if ( answer.validationType == 'Capture Image' && answer.validationAnswer != '' ) {
+          if ( answer.validationType == 'Capture Image' && answer?.validationAnswer?.trim() ) {
             let inputData = {
               Bucket: JSON.parse( process.env.BUCKET )?.sop,
               file_path: answer.validationAnswer,
@@ -4567,7 +4581,7 @@ export async function downloadChecklist( req, res ) {
               answer.validationAnswer = base64Image;
             }
           }
-          if ( answer.answer != '' && [ 'image', 'descriptiveImage' ].includes( question.answerType ) ) {
+          if ( answer?.answer?.trim() && [ 'image', 'descriptiveImage', 'multipleImage', 'image/video' ].includes( question.answerType ) ) {
             let inputData = {
               Bucket: JSON.parse( process.env.BUCKET )?.sop,
               file_path: answer.answer,

package/src/controllers/trax.controller.js

@@ -4093,7 +4093,7 @@ async function updateOpenSearch( user, data ) {
 export const aiChecklist = async ( req, res ) => {
   try {
     let storeDetails = await storeService.count( { clientId: req.query.clientId, status: 'active' } );
-    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering','queuealert' ];
+    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ];
     let checklistDetails = [];
     let publishList = [];
     let unpublishList = [];
@@ -4106,7 +4106,7 @@ export const aiChecklist = async ( req, res ) => {
     checklistDetails = [ ...publishList, ...unpublishList ];
 
     checklistDetails.forEach( ( item ) => {
-      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering','queuealert' ].includes( item.checkListType ) ) {
+      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( item.checkListType ) ) {
         item.storeCount = storeDetails;
       }
     } );

package/src/hbs/template.hbs

@@ -204,18 +204,20 @@
                         {{#neq ../answerType 'video'}}
                             {{#neq ../answerType 'image'}}
                                 {{#neq ../answerType 'descriptiveImage'}}
-                                    {{#eq sopFlag true }}
-                                        <span id="agreed" style="color:red">{{answer}}</span><br>
-                                    {{/eq}}
-                                    {{#eq sopFlag false }}
-                                        <span id="agreed">{{answer}}</span><br>
-                                    {{/eq}}
-                                    {{#neq validationAnswer ''}}
-                                        {{#eq validationType 'Capture Image'}}
-                                            <img src = "{{validationAnswer}}" alt="test" width="200" height="180">
+                                    {{#neq ../answerType 'multipleImage'}}
+                                        {{#eq sopFlag true }}
+                                            <span id="agreed" style="color:red">{{answer}}</span><br>
                                         {{/eq}}
-                                        {{#neq validationType 'Capture Image'}}
-                                            {{validationAnswer}}
+                                        {{#eq sopFlag false }}
+                                            <span id="agreed">{{answer}}</span><br>
+                                        {{/eq}}
+                                        {{#neq validationAnswer ''}}
+                                            {{#eq validationType 'Capture Image'}}
+                                                <img src = "{{validationAnswer}}" alt="test" width="200" height="180">
+                                            {{/eq}}
+                                            {{#neq validationType 'Capture Image'}}
+                                                {{validationAnswer}}
+                                            {{/neq}}
                                         {{/neq}}
                                     {{/neq}}
                                 {{/neq}}
@@ -245,6 +247,46 @@
                                 </table>
                             {{!-- {{/each}} --}}
                         {{/eq}}
+                        {{#eq ../answerType 'multipleImage'}}
+                        {{!-- {{#each ../answers}} --}}
+                        <table style="width:100%">
+                            <tr>
+                                {{#neq referenceImage ''}}
+                                <td style="width:50%">
+                                    <div class="Reference"><span>Reference Image</span><br>
+                                        <img src="{{referenceImage}}" width="200" height="180" />
+                                    </div>
+                                </td>
+                                {{/neq}}
+                                <td style="width:50%">
+                                    <div class="Reference"><span>Uploaded Image</span><br>
+                                        <img src="{{answer}}" width="200" height="180" />
+                                    </div>
+                                </td>
+                            </tr>
+                        </table>
+                        {{!-- {{/each}} --}}
+                        {{/eq}}
+                        {{#eq ../answerType 'image/video'}}
+                        {{!-- {{#each ../answers}} --}}
+                        <table style="width:100%">
+                            <tr>
+                                {{#neq referenceImage ''}}
+                                <td style="width:50%">
+                                    <div class="Reference"><span>Reference Image</span><br>
+                                        <img src="{{referenceImage}}" width="200" height="180" />
+                                    </div>
+                                </td>
+                                {{/neq}}
+                                <td style="width:50%">
+                                    <div class="Reference"><span>Uploaded Image</span><br>
+                                        <img src="{{answer}}" width="200" height="180" />
+                                    </div>
+                                </td>
+                            </tr>
+                        </table>
+                        {{!-- {{/each}} --}}
+                        {{/eq}}
                         {{#eq ../answerType 'descriptiveImage'}}
                         {{!-- {{#each ../answers}} --}}
                         <table style="width:100%">