tango-app-api-trax 3.8.16 → 3.8.18

package/package.json

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

package/src/controllers/mobileTrax.controller.js

@@ -2340,8 +2340,16 @@ export async function submitTask( req, res ) {
       insertOpenSearchData( openSearch.traxActivityLog, inserttraxlogs );
       if ( submittype === 'submit' ) {
         const excludedChecklists = [ 'Store Hygiene Check' ];
-        if ( checklist.checkListName.includes( 'Store Hygiene' ) ) {
-
+        if ( checklist.checkListName.includes( 'Store Hygiene' ) && checklist?.streamId ) {
+          let sqsData = {
+            'storeId': checklist.store_id,
+            'streamID': checklist.streamId,
+            'detectionTime': checklist?.questionAnswers?.[0]?.questions?.[0]?.answers?.[0]?.detectionTime,
+            'date': checklist.date_string,
+            'storeResponseTime': currentDateTime.format( 'HH:mm:ss - MMM DD, YYYY' ),
+            'message_mode': 'retriggered',
+          };
+          sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).storeHygiene}`, JSON.stringify( sqsData ) );
         }
         if ( !excludedChecklists.includes( checklist.checkListName ) ) {
           const query1 = [

package/src/hbs/template.hbs

@@ -229,15 +229,19 @@
                                 {{#eq validation true}}
                                     <table style="width:100%">
                                         <tr>
-                                            {{#if multiReferenceImage.length}}
-                                                <td style="width:50%;vertical-align:top">
-                                                    <div class="Reference"><span>Reference Image</span><br>
-                                                        {{#each multiReferenceImage}}
-                                                            <img src="{{this}}" width="200" height="180" />
-                                                        {{/each}}
-                                                    </div>
-                                                </td>
-                                            {{/if}}
+                                            {{#neq ../answerType 'image/video'}}
+                                                {{#neq ../answerType 'multipleImage'}}
+                                                    {{#if multiReferenceImage.length}}
+                                                        <td style="width:50%;vertical-align:top">
+                                                            <div class="Reference"><span>Reference Image</span><br>
+                                                                {{#each multiReferenceImage}}
+                                                                    <img src="{{this}}" width="200" height="180" />
+                                                                {{/each}}
+                                                            </div>
+                                                        </td>
+                                                    {{/if}}
+                                                {{/neq}}
+                                            {{/neq}}
                                             <td style="width:50%;vertical-align:top">
                                                 {{#eq validationType 'Capture Image'}}
                                                     <div class="Reference"><span>Uploaded Image</span><br>

package/src/hbs/visit-checklist.hbs

@@ -111,7 +111,7 @@
 <div class="cover-summary">
 <div class="cover-sum-row"><span class="cover-sum-label">No. of questions</span><span class="cover-sum-colon">:</span><span class="cover-sum-val">{{numQuestions}}</span></div>
 <div class="cover-sum-row"><span class="cover-sum-label">No. of flags</span><span class="cover-sum-colon">:</span><span class="cover-sum-val">{{numFlags}}</span></div>
-<div class="cover-sum-row"><span class="cover-sum-label">AI Breached</span><span class="cover-sum-colon">:</span><span class="cover-sum-val">{{aiBreached}}</span></div>
+{{!-- <div class="cover-sum-row"><span class="cover-sum-label">AI Breached</span><span class="cover-sum-colon">:</span><span class="cover-sum-val">{{aiBreached}}</span></div> --}}
 <div class="cover-sum-row"><span class="cover-sum-label">Submitted By</span><span class="cover-sum-colon">:</span><span class="cover-sum-val">{{submittedBy}}</span></div>
 <div class="cover-sum-row"><span class="cover-sum-label">Country</span><span class="cover-sum-colon">:</span><span class="cover-sum-val">{{country}}</span></div>
 </div>
@@ -196,8 +196,27 @@
 {{!-- <span class="q-ans {{#if this.isYes}}ans-yes{{else}}{{#if this.isNo}}ans-no{{/if}}{{/if}}">{{#if this.isYes}}✓ Yes{{else}}{{#if this.isNo}}✗ No{{else}}{{this.answerDisplay}}{{/if}}{{/if}}</span> --}}
 {{#if this.userAnswer.length}}
 <div class="q-answer-list">
-{{!-- text/video answers render per userAnswer above the table --}}
 {{#each this.userAnswer}}
+<div class="q-answer-item">
+  {{#neq ../answerType 'image/video'}}
+    {{#neq ../answerType 'multipleImage'}}
+      {{#if this.multiReferenceImage.length}}
+      <div class="q-answer-media">
+        <div class="q-answer-caption">Reference Images</div>
+        {{#each this.multiReferenceImage}}
+        <img src="{{this}}" alt="Reference Image" />
+        {{/each}}
+      </div>
+      {{else}}
+        {{#if this.referenceImage}}
+        <div class="q-answer-media">
+          <div class="q-answer-caption">Reference Image</div>
+          <img src="{{this.referenceImage}}" alt="Reference Image" />
+        </div>
+        {{/if}}
+      {{/if}}
+    {{/neq}}
+  {{/neq}}
   {{#eq this.answerType 'text'}}
     {{#if this.answer}}
     <div class="q-answer-text {{#if this.sopFlag}}flagged{{/if}}">{{this.answer}}</div>
@@ -211,64 +230,46 @@
     </div>
     {{/if}}
   {{/eq}}
-{{/each}}
 
-{{!-- Single 50/50 table per question: references rendered once on the left,
-     all uploaded/validation images stacked on the right --}}
-<table style="width:100%;margin-top:8px"><tr>
-  {{#if this.userAnswer.[0].multiReferenceImage.length}}
-  <td style="width:50%;vertical-align:top;padding-right:8px">
-    <div class="q-answer-caption">Reference Image</div>
-    {{#each this.userAnswer.[0].multiReferenceImage}}
-    <img src="{{this}}" alt="Reference Image" />
-    {{/each}}
-  </td>
-  {{else}}
-  {{#if this.userAnswer.[0].referenceImage}}
-  <td style="width:50%;vertical-align:top;padding-right:8px">
-    <div class="q-answer-caption">Reference Image</div>
-    <img src="{{this.userAnswer.[0].referenceImage}}" alt="Reference Image" />
-  </td>
-  {{/if}}
-  {{/if}}
-  <td style="vertical-align:top">
-    {{#each this.userAnswer}}
-    {{#eq this.answerType 'image'}}
-      {{#if this.answer}}
-      <div class="q-answer-caption">Uploaded Image</div>
-      <img src="{{this.answer}}" alt="Uploaded Image" />
-      {{/if}}
-    {{/eq}}
-    {{#if this.validation}}
-      {{#eq this.validationDisplayType 'image'}}
-        {{#if this.validationAnswer}}
-        <div class="q-answer-caption">Validation Image</div>
-        <img src="{{this.validationAnswer}}" alt="Validation Image" />
-        {{/if}}
-      {{/eq}}
-      {{#eq this.validationDisplayType 'video'}}
-        {{#if this.validationAnswer}}
-        <div class="q-answer-caption">Validation Video</div>
-        <a class="q-answer-link" href="{{this.validationAnswer}}" target="_blank">{{this.validationAnswer}}</a>
+  <table style="width:100%;margin-top:8px"><tr>
+    <td style="vertical-align:top">
+      {{#eq this.answerType 'image'}}
+        {{#if this.answer}}
+        <div class="q-answer-caption">Uploaded Image</div>
+        <img src="{{this.answer}}" alt="Uploaded Image" />
         {{/if}}
       {{/eq}}
-      {{#eq this.validationDisplayType 'text'}}
-        {{#if this.validationAnswer}}
-        <div class="q-answer-text">{{this.validationAnswer}}</div>
-        {{/if}}
-      {{/eq}}
-      {{#eq this.validationDisplayType 'multiImage'}}
-        {{#if this.validationImage.length}}
-        <div class="q-answer-caption">Validation Image</div>
-        {{#each this.validationImage}}
-        <img src="{{this}}" alt="Validation Image" />
-        {{/each}}
-        {{/if}}
-      {{/eq}}
-    {{/if}}
-    {{/each}}
-  </td>
-</tr></table>
+      {{#if this.validation}}
+        {{#eq this.validationDisplayType 'image'}}
+          {{#if this.validationAnswer}}
+          <div class="q-answer-caption">Validation Image</div>
+          <img src="{{this.validationAnswer}}" alt="Validation Image" />
+          {{/if}}
+        {{/eq}}
+        {{#eq this.validationDisplayType 'video'}}
+          {{#if this.validationAnswer}}
+          <div class="q-answer-caption">Validation Video</div>
+          <a class="q-answer-link" href="{{this.validationAnswer}}" target="_blank">{{this.validationAnswer}}</a>
+          {{/if}}
+        {{/eq}}
+        {{#eq this.validationDisplayType 'text'}}
+          {{#if this.validationAnswer}}
+          <div class="q-answer-text">{{this.validationAnswer}}</div>
+          {{/if}}
+        {{/eq}}
+        {{#eq this.validationDisplayType 'multiImage'}}
+          {{#if this.validationImage.length}}
+          <div class="q-answer-caption">Validation Image</div>
+          {{#each this.validationImage}}
+          <img src="{{this}}" alt="Validation Image" />
+          {{/each}}
+          {{/if}}
+        {{/eq}}
+      {{/if}}
+    </td>
+  </tr></table>
+</div>
+{{/each}}
 </div>
 {{/if}}
 {{#if this.remarks}}