tango-app-api-trax 3.8.15 → 3.8.16

package/package.json

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

package/src/controllers/internalTrax.controller.js

@@ -3412,7 +3412,16 @@ export async function getStoreTaskDetails( req, res ) {
 
 export async function runAIFlag( req, res ) {
   try {
-    let checklistDetails = await CLconfig.find( { publish: true, $expr: { $ne: [ { $size: '$notifyFlags.notifyType' }, 0 ] }, runAIQuestionCount: { $ne: 0 } }, { _id: 1, notifyFlags: 1, approver: 1 } );
+    let checklistDetails = await CLconfig.find( {
+      publish: true,
+      runAIQuestionCount: { $ne: 0 },
+      $expr: {
+        $gt: [
+          { $size: { $cond: [ { $isArray: '$notifyFlags.notifyType' }, '$notifyFlags.notifyType', [] ] } },
+          0,
+        ],
+      },
+    }, { _id: 1, notifyFlags: 1, approver: 1 } );
     let date = dayjs().subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
     if ( checklistDetails.length ) {
       await Promise.all( checklistDetails.map( async ( ele ) => {
@@ -3422,7 +3431,7 @@ export async function runAIFlag( req, res ) {
             let runAIFlag = 0;
             store.questionAnswers.forEach( ( section ) => {
               section.questions.forEach( ( question ) => {
-                if ( question.answerType == 'image' && ( question?.userAnswer?.[0]?.runAIData.value == 'False' || !question?.userAnswer?.[0]?.runAIData.value ) ) {
+                if ( question.answerType == 'image' && ( question?.userAnswer?.[0]?.runAIData?.value == 'False' || !question?.userAnswer?.[0]?.runAIData?.value ) ) {
                   runAIFlag++;
                 }
               } );

package/src/hbs/visit-checklist.hbs

@@ -196,8 +196,8 @@
 {{!-- <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">
   {{#eq this.answerType 'text'}}
     {{#if this.answer}}
     <div class="q-answer-text {{#if this.sopFlag}}flagged{{/if}}">{{this.answer}}</div>
@@ -211,62 +211,64 @@
     </div>
     {{/if}}
   {{/eq}}
+{{/each}}
 
-  <table style="width:100%;margin-top:8px"><tr>
-    {{#if this.multiReferenceImage.length}}
-    <td style="width:50%;vertical-align:top;padding-right:8px">
-      <div class="q-answer-caption">Reference Image</div>
-      {{#each this.multiReferenceImage}}
-      <img src="{{this}}" alt="Reference Image" />
-      {{/each}}
-    </td>
-    {{/if}}
-    {{#unless this.multiReferenceImage.length}}
-    {{#if this.referenceImage}}
-    <td style="width:50%;vertical-align:top;padding-right:8px">
-      <div class="q-answer-caption">Reference Image</div>
-      <img src="{{this.referenceImage}}" alt="Reference Image" />
-    </td>
-    {{/if}}
-    {{/unless}}
-    <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" />
+{{!-- 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}}
-      {{#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}}
+      {{#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}}
+    {{/each}}
+  </td>
+</tr></table>
 </div>
 {{/if}}
 {{#if this.remarks}}