tango-app-api-trax 3.9.34 → 3.9.35

package/package.json

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

package/src/controllers/internalTrax.controller.js

@@ -18,7 +18,7 @@ import timeZone from 'dayjs/plugin/timezone.js';
 import utc from 'dayjs/plugin/utc.js';
 import { logger } from 'tango-app-api-middleware';
 import mongoose from 'mongoose';
-import { sendPushNotification, sendAiPushNotification, sendEmailWithSES, signedUrl, fileUpload, getOpenSearchData } from 'tango-app-api-middleware';
+import { sendPushNotification, sendAiPushNotification, sendEmailWithSES, signedUrl, fileUpload } from 'tango-app-api-middleware';
 // import * as planoService from '../services/planogram.service.js';
 import * as clusterServices from '../services/cluster.service.js';
 import * as teamsServices from '../services/teams.service.js';
@@ -3667,31 +3667,36 @@ export const downloadInsertPdf = async ( req, res ) => {
     const safeName = ( str ) =>
       ( str || '' ).toString().replace( /[<>:"/\\|?*]+/g, '_' );
 
-    const query = {
-      query: {
-        bool: {
-          must: [
-            {
-              term: {
-                _id: req.body.checklistId,
-              },
-            },
-          ],
-        },
-      },
-    };
+    // const query = {
+    //   query: {
+    //     bool: {
+    //       must: [
+    //         {
+    //           term: {
+    //             _id: req.body.checklistId,
+    //           },
+    //         },
+    //       ],
+    //     },
+    //   },
+    // };
+
 
     // 1) Launch browser page + fetch OpenSearch data in parallel
     const [ browser, aiDetails ] = await Promise.all( [
       getBrowserInstance(),
-      getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxIndex, query ),
+      // getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxIndex, query ),
+      processedchecklist.findOne( { _id: req.body.checklistId } ),
     ] );
+    console.log( aiDetails );
 
-    if ( aiDetails?.statusCode != 200 || !aiDetails?.body?.hits?.hits.length ) {
+    if ( !aiDetails ) {
       return res.sendError( 'Checklist not found', 404 );
     }
 
-    const doc = { ...aiDetails.body.hits.hits[0]._source };
+    const doc = { ...aiDetails?.toObject() };
+
+    console.log( doc );
 
     // 2) Fetch brandInfo + compliance data in parallel
     const complianceURL = JSON.parse( process.env.LAMBDAURL ).complianceHistory;

package/src/hbs/visit-checklist.hbs

@@ -72,6 +72,10 @@
   .q-answer-media img,.q-answer-media video,.q-answer-item td img{display:block;width:200px;height:180px;object-fit:cover;border-radius:6px;margin-bottom:6px}
   .img-grid{display:flex;flex-wrap:wrap;gap:8px}
   .img-grid img{margin-bottom:0}
+  .answer-media-grid{display:flex;flex-wrap:wrap;gap:12px;margin-top:8px}
+  .answer-media-cell{width:calc(50% - 6px)}
+  .answer-media-cell .q-answer-caption{margin-bottom:4px}
+  .answer-media-cell img{display:block;width:100%;height:200px;object-fit:cover;border-radius:6px;margin-bottom:0}
   .q-answer-link{font-size:12px;color:#0085D2;text-decoration:underline;word-break:break-all}
   .q-answer-caption{font-size:11px;color:#666;margin-bottom:4px}
   .q-answer-remarks{font-size:11px;color:#666;margin-top:6px;white-space:pre-line}
@@ -82,6 +86,7 @@
   .user-verify-name{font-size:14px;color:#1a1a1a;font-weight:600}
   .user-verify-sign-label{font-size:12px;color:#666;margin-top:16px;margin-bottom:6px;font-weight:600}
   .user-verify-signature{display:block;width:220px;height:auto;max-height:110px;object-fit:contain;border:1px solid #eee;border-radius:6px;padding:6px;background:#fff}
+  .user-verify-signature-text{display:inline-block;min-width:180px;font-size:15px;font-weight:600;color:#1a1a1a;padding-bottom:6px;border-bottom:1px solid #d9d9d9;word-break:break-word}
   /* Footer */
   .page-footer{position:absolute;bottom:20px;left:40px;right:40px;display:flex;justify-content:space-between;align-items:center;font-size:11px;color:#999;border-top:1px solid #d9d9d9;padding-top:10px}
   .footer-brand{display:flex;align-items:center;gap:8px;font-weight:600;color:#0066CC;font-size:11px}
@@ -119,8 +124,12 @@
  
 <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> --}}
+{{#if showFlags}}
+<div class="cover-sum-row"><span class="cover-sum-label">Question flags</span><span class="cover-sum-colon">:</span><span class="cover-sum-val">{{numFlags}}</span></div>
+{{/if}}
+{{#if showRunAIFlag}}
+<div class="cover-sum-row"><span class="cover-sum-label">Run AI flags</span><span class="cover-sum-colon">:</span><span class="cover-sum-val">{{runAIFlag}}</span></div>
+{{/if}}
 <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>
@@ -234,125 +243,28 @@
     {{/if}}
   {{/eq}}
 
-  <table style="width:100%;margin-top:8px;table-layout:fixed"><tr>
-    <td style="width:50%;vertical-align:top;padding-right:8px">
-      {{#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>
-            {{else}}
-              {{#eq this.answerType 'image'}}
-                {{#if this.answer}}
-                <div class="q-answer-media">
-                  <div class="q-answer-caption">Uploaded Image</div>
-                  <img src="{{this.answer}}" alt="Uploaded Image" />
-                </div>
-                {{/if}}
-              {{/eq}}
-            {{/if}}
-          {{/if}}
-        {{else}}
-          {{#eq this.answerType 'image'}}
-            {{#if this.answer}}
-            <div class="q-answer-media">
-              <div class="q-answer-caption">Uploaded Image</div>
-              <img src="{{this.answer}}" alt="Uploaded Image" />
-            </div>
-            {{/if}}
-          {{/eq}}
-        {{/neq}}
-      {{else}}
-        {{#eq this.answerType 'image'}}
-          {{#if this.answer}}
-          <div class="q-answer-media">
-            <div class="q-answer-caption">Uploaded Image</div>
-            <img src="{{this.answer}}" alt="Uploaded Image" />
-          </div>
-          {{/if}}
-        {{/eq}}
-      {{/neq}}
-      {{#unless this.hasReferenceImage}}
-        {{#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 'multiImage'}}
-            {{#if this.validationImage.length}}
-            <div class="q-answer-caption">Validation Image</div>
-            {{#each this.validationImage}}
-            <img src="{{this}}" alt="Validation Image" />
-            {{/each}}
-            {{/if}}
-            {{#if this.validationVideo.length}}
-            <div class="q-answer-caption">Validation Video</div>
-            {{#each this.validationVideo}}
-            <a class="q-answer-link" href="{{this}}" target="_blank">{{this}}</a>
-            {{/each}}
-            {{/if}}
-          {{/eq}}
-        {{/if}}
-      {{/unless}}
-    </td>
-    <td style="width:50%;vertical-align:top;padding-left:8px">
-      {{#eq this.answerType 'image'}}
-        {{#if this.answer}}
-          {{#neq ../answerType 'image/video'}}
-            {{#neq ../answerType 'multipleImage'}}
-              {{#if this.multiReferenceImage.length}}
-              <div class="q-answer-caption">Uploaded Image</div>
-              <img src="{{this.answer}}" alt="Uploaded Image" />
-              {{else}}
-                {{#if this.referenceImage}}
-                <div class="q-answer-caption">Uploaded Image</div>
-                <img src="{{this.answer}}" alt="Uploaded Image" />
-                {{/if}}
-              {{/if}}
-            {{/neq}}
-          {{/neq}}
-        {{/if}}
-      {{/eq}}
-      {{#if this.hasReferenceImage}}
-      {{#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 'multiImage'}}
-          {{#if this.validationImage.length}}
-          <div class="q-answer-caption">Validation Image</div>
-          {{#each this.validationImage}}
-          <img src="{{this}}" alt="Validation Image" />
-          {{/each}}
-          {{/if}}
-          {{#if this.validationVideo.length}}
-          <div class="q-answer-caption">Validation Video</div>
-          {{#each this.validationVideo}}
-          <a class="q-answer-link" href="{{this}}" target="_blank">{{this}}</a>
-          {{/each}}
-          {{/if}}
-        {{/eq}}
-      {{/if}}
-      {{/if}}
-    </td>
-  </tr></table>
+  {{#eq this.validationDisplayType 'multiImage'}}
+    {{#if this.validationVideo.length}}
+    <div class="q-answer-media">
+      <div class="q-answer-caption">Validation Video</div>
+      {{#each this.validationVideo}}
+      <a class="q-answer-link" href="{{this}}" target="_blank">{{this}}</a>
+      {{/each}}
+    </div>
+    {{/if}}
+  {{/eq}}
 </div>
 {{/each}}
+{{#if this.mediaItems.length}}
+<div class="answer-media-grid">
+  {{#each this.mediaItems}}
+  <div class="answer-media-cell">
+    <div class="q-answer-caption">{{this.label}}</div>
+    <img src="{{this.url}}" alt="{{this.label}}" />
+  </div>
+  {{/each}}
+</div>
+{{/if}}
 </div>
 {{/if}}
 {{#if this.remarks}}
@@ -369,8 +281,8 @@
   {{#if userImage}}
   <img class="user-verify-photo" src="{{userImage}}" alt="Submitted by photo" />
   {{/if}}
-  {{#if submittedBy}}
-  <div class="user-verify-name">{{submittedBy}}</div>
+  {{#if userSignature}}
+  <div class="user-verify-signature-text">{{userSignature}}</div>
   {{/if}}
 </div>
 {{/if}}

package/src/utils/visitChecklistPdf.utils.js

@@ -209,6 +209,59 @@ function buildQuestionAnswerEntries( question ) {
 }
 
 
+/**
+ * Flattens a question's user answers into one ordered, deduped image list for the
+ * 2-per-row answer media grid. Order: reference images first, then uploaded images,
+ * then validation images. Videos are shown as links elsewhere, so only images are
+ * collected here. When a question has no reference image, the uploaded images simply
+ * fill the grid from the start (taking the reference slot).
+ * @param {Array} userAnswers entries produced by buildQuestionAnswerEntries
+ * @return {Array} list of { type, label, url } media items in render order
+ */
+function buildQuestionMediaItems( userAnswers = [] ) {
+  const items = [];
+  const seen = new Set();
+
+  const push = ( type, label, url ) => {
+    if ( !url || typeof url !== 'string' ) return;
+    if ( seen.has( url ) ) return;
+    seen.add( url );
+    items.push( { type, label, url } );
+  };
+
+  // 1. Reference images first (deduped, so a single shared reference shows once).
+  userAnswers.forEach( ( ua ) => {
+    if ( Array.isArray( ua.multiReferenceImage ) && ua.multiReferenceImage.length ) {
+      ua.multiReferenceImage.forEach( ( url ) => push( 'reference', 'Reference Image', url ) );
+    } else if ( ua.referenceImage ) {
+      push( 'reference', 'Reference Image', ua.referenceImage );
+    }
+  } );
+
+  // 2. Uploaded images.
+  userAnswers.forEach( ( ua ) => {
+    if ( ua.answerType === 'image' && ua.answer ) {
+      push( 'uploaded', 'Uploaded Image', ua.answer );
+    }
+  } );
+
+  // 3. Validation images (single 'Capture Image' and multi 'Capture Multiple Image').
+  userAnswers.forEach( ( ua ) => {
+    if ( !ua.validation ) return;
+
+    if ( ua.validationDisplayType === 'image' && ua.validationAnswer ) {
+      push( 'validation', 'Validation Image', ua.validationAnswer );
+    }
+
+    if ( ua.validationDisplayType === 'multiImage' && Array.isArray( ua.validationImage ) ) {
+      ua.validationImage.forEach( ( url ) => push( 'validation', 'Validation Image', url ) );
+    }
+  } );
+
+  return items;
+}
+
+
 /**
  * Extracts every 'Matched/Not Matched' value from a userAnswer's runAIData.
  * Handles both shapes:
@@ -257,6 +310,8 @@ function mapSectionsFromQuestionAnswer( questionAnswer ) {
 
   const flags = [];
 
+  let hasSopFlag = false;
+
 
   ( questionAnswer || [] ).forEach( ( section, sectionIdx ) => {
     let sectionScore = 0;
@@ -278,6 +333,10 @@ function mapSectionsFromQuestionAnswer( questionAnswer ) {
 
       const ua = userAnswersWithRef[0];
 
+      if ( !hasSopFlag && userAnswersWithRef.some( ( entry ) => entry.sopFlag === true ) ) {
+        hasSopFlag = true;
+      }
+
 
       const max = q.compliance ? Math.max( ...q?.answers.map( ( o ) => o?.complianceScore ?? Math.max( o?.matchedCount ?? 0, o?.notMatchedCount ?? 0 ) ) ) : 0;
 
@@ -358,6 +417,8 @@ function mapSectionsFromQuestionAnswer( questionAnswer ) {
 
         answerDisplay: isYes ? 'Yes' : ( isNo ? 'No' : ( answerText && answerText.startsWith( 'http' ) ? 'Image' : ( answerText || '—' ) ) ),
 
+        mediaItems: buildQuestionMediaItems( userAnswersWithRef ),
+
         userAnswer: userAnswersWithRef.length ? userAnswersWithRef : [ {
           answer: '',
           answerType: 'text',
@@ -415,7 +476,7 @@ function mapSectionsFromQuestionAnswer( questionAnswer ) {
   const numQuestions = questionAnswer.reduce( ( sum, s ) => sum + ( s.questions?.length || 0 ), 0 );
 
 
-  return { totalScore, maxScore, sectionInsights, questionAnswers, flags, numQuestions };
+  return { totalScore, maxScore, sectionInsights, questionAnswers, flags, numQuestions, hasSopFlag };
 }
 
 
@@ -437,7 +498,7 @@ export function buildVisitChecklistTemplateDataFromProcessed( processedDoc, bran
 
   const {
 
-    totalScore, maxScore, sectionInsights, questionAnswers, flags, numQuestions,
+    totalScore, maxScore, sectionInsights, questionAnswers, flags, numQuestions, hasSopFlag,
 
   } = mapSectionsFromQuestionAnswer( questionAnswer );
 
@@ -551,7 +612,11 @@ export function buildVisitChecklistTemplateDataFromProcessed( processedDoc, bran
 
     numFlags: typeof doc.questionFlag === 'number' ? doc.questionFlag : flags.length,
 
-    aiBreached: typeof doc.runAIFlag === 'number' ? doc.runAIFlag : 0,
+    showFlags: hasSopFlag,
+
+    runAIFlag: typeof doc.runAIFlag === 'number' ? doc.runAIFlag : 0,
+
+    showRunAIFlag: ( typeof doc.runAIQuestionCount === 'number' ? doc.runAIQuestionCount : 0 ) > 0,
 
     submittedBy: doc.userName || '--',
 
@@ -618,7 +683,7 @@ function buildFromViewChecklistApi( getchecklistData, viewchecklistData, brandIn
 
   const {
 
-    totalScore, maxScore, sectionInsights, questionAnswers, flags, numQuestions,
+    totalScore, maxScore, sectionInsights, questionAnswers, flags, numQuestions, hasSopFlag,
 
   } = mapSectionsFromQuestionAnswer( questionAnswer );
 
@@ -704,7 +769,11 @@ function buildFromViewChecklistApi( getchecklistData, viewchecklistData, brandIn
 
     numFlags: checklistAnswer?.flagCount ?? flags.length,
 
-    aiBreached: checklistAnswer?.aiBreachedCount ?? 0,
+    showFlags: hasSopFlag,
+
+    runAIFlag: checklistAnswer?.runAIFlag ?? checklistInfo?.runAIFlag ?? checklistAnswer?.aiBreachedCount ?? 0,
+
+    showRunAIFlag: ( checklistInfo?.runAIQuestionCount ?? checklistAnswer?.runAIQuestionCount ?? 0 ) > 0,
 
     submittedBy: checklistInfo?.submittedBy || storeProfile?.userName || '--',
 
@@ -847,11 +916,6 @@ export function createImageCache() {
     }
 
 
-    if ( resolvedData.userSignature && resolvedData.userSignature.startsWith( 'http' ) ) {
-      urls.add( resolvedData.userSignature );
-    }
-
-
     const collectFromSection = ( section ) => {
       section.questions?.forEach( ( q ) => {
         if ( q.questionReferenceImage && q.questionReferenceImage.startsWith( 'http' ) ) urls.add( q.questionReferenceImage );
@@ -876,6 +940,10 @@ export function createImageCache() {
             } );
           }
         } );
+
+        q.mediaItems?.forEach( ( m ) => {
+          if ( typeof m.url === 'string' && m.url.startsWith( 'http' ) ) urls.add( m.url );
+        } );
       } );
     };
 
@@ -917,11 +985,6 @@ export function createImageCache() {
     }
 
 
-    if ( resolvedData.userSignature ) {
-      resolvedData.userSignature = cache.get( resolvedData.userSignature ) || resolvedData.userSignature;
-    }
-
-
     const replaceInSection = ( section ) => {
       section.questions?.forEach( ( q ) => {
         if ( q.questionReferenceImage && cache.has( q.questionReferenceImage ) ) q.questionReferenceImage = cache.get( q.questionReferenceImage );
@@ -944,6 +1007,12 @@ export function createImageCache() {
             ua.validationImage = ua.validationImage.map( ( u ) => ( cache.has( u ) ? cache.get( u ) : u ) );
           }
         } );
+
+        if ( q.mediaItems?.length ) {
+          q.mediaItems.forEach( ( m ) => {
+            if ( cache.has( m.url ) ) m.url = cache.get( m.url );
+          } );
+        }
       } );
     };
 
@@ -1025,6 +1094,12 @@ export function resolveTemplateUrls( templateData, baseUrl = 'https://d1r0hc2ssk
           ua.answer = resolveUrl( ua.answer );
         }
       } );
+
+      if ( q.mediaItems?.length ) {
+        q.mediaItems.forEach( ( m ) => {
+          m.url = resolveUrl( m.url );
+        } );
+      }
     } );
   };
 
@@ -1046,10 +1121,6 @@ export function resolveTemplateUrls( templateData, baseUrl = 'https://d1r0hc2ssk
     resolvedData.userImage = resolveUrl( resolvedData.userImage );
   }
 
-  if ( resolvedData?.userSignature && !resolvedData.userSignature.startsWith( 'http' ) && !resolvedData.userSignature.startsWith( 'data:' ) ) {
-    resolvedData.userSignature = resolveUrl( resolvedData.userSignature );
-  }
-
 
   return resolvedData;
 }
@@ -1169,6 +1240,12 @@ export async function generateVisitChecklistPDF( templateData, baseUrl = 'https:
           ua.answer = resolveUrl( ua.answer );
         }
       } );
+
+      if ( q.mediaItems?.length ) {
+        q.mediaItems.forEach( ( m ) => {
+          m.url = resolveUrl( m.url );
+        } );
+      }
     } );
   };
 
@@ -1186,10 +1263,6 @@ export async function generateVisitChecklistPDF( templateData, baseUrl = 'https:
     resolvedData.userImage = resolveUrl( resolvedData.userImage );
   }
 
-  if ( resolvedData.userSignature && !resolvedData.userSignature.startsWith( 'http' ) && !resolvedData.userSignature.startsWith( 'data:' ) ) {
-    resolvedData.userSignature = resolveUrl( resolvedData.userSignature );
-  }
-
 
   const html = template( resolvedData );