tango-app-api-trax 3.8.25 → 3.8.26

package/package.json

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

package/src/controllers/internalTrax.controller.js

@@ -4360,7 +4360,6 @@ export async function recurringFlagAlert( req, res ) {
         ],
       },
     }, { _id: 1, checkListName: 1, recurringFlag: 1, notifyFlags: 1, approver: 1, client_id: 1 } );
-    console.log( JSON.stringify( checklistDetails ) );
     if ( !checklistDetails.length ) {
       return res.sendSuccess( 'No checklists configured for recurring flag' );
     }
@@ -4470,9 +4469,11 @@ export async function recurringFlagAlert( req, res ) {
     await Promise.all( [ ...byRecipient.entries() ].map( async ( [ recipient, items ] ) => {
       const subjects = new Set( items.map( ( i ) => i.subjectId ) );
       const checklists = new Set( items.map( ( i ) => i.checklistId ) );
-      console.log( checklists );
       const isMultiStore = subjects.size > 1; // "isMultiStore" name retained for template back-compat
       const isMultiChecklist = !isMultiStore && checklists.size > 1;
+      // Sub-mode of multi-store when the recipient's flagged subjects all share a single checklist.
+      // Drives a tighter email layout (no Checklist column, no "Total Checklists" line, checklist name in intro).
+      const isMultiStoreSingleChecklist = isMultiStore && checklists.size === 1;
       // Threshold for the message line — when grouping spans multiple checklists/subjects, take min threshold seen.
       const thresholdShown = items.reduce( ( acc, it ) => Math.min( acc, it.days ), items[0].days );
 
@@ -4521,9 +4522,10 @@ export async function recurringFlagAlert( req, res ) {
         checklistName: g.checklistName,
         lastSubmittedBy: g.lastSubmittedBy,
         lastSubmissionDate: g.lastSubmissionDate,
-        days: g.questionCount, // template column "Total Recurring Flags" reads `days`
+        days: g.questionCount, // legacy alias kept for back-compat with older template builds
         flagCount: g.questionCount,
         runAICount: g.runAICount,
+        totalFlags: g.questionCount + g.runAICount,
       } ) );
 
       // Excel attachment keeps per-question detail (one row per flagged question).
@@ -4546,6 +4548,7 @@ export async function recurringFlagAlert( req, res ) {
         threshold: thresholdShown,
         isMultiStore,
         isMultiChecklist,
+        isMultiStoreSingleChecklist,
         showTable: isMultiStore || isMultiChecklist,
         hasAttachment,
         domain: flagDomain,
@@ -4563,11 +4566,15 @@ export async function recurringFlagAlert( req, res ) {
           totalChecklists: checklists.size,
           totalFlags: items.length,
         };
+        if ( isMultiStoreSingleChecklist ) {
+          // Show the single checklist name in the intro line for this sub-mode.
+          data.checklistName = items[0].checklistName;
+        }
       } else if ( isMultiChecklist ) {
         data.subjectName = items[0].subjectName;
         data.storeName = items[0].subjectName;
       } else {
-        // Single mode: one (subject, checklist) — flagCount is the number of questions that hit threshold.
+        // Single mode: one (subject, checklist) — totalFlags = sop question flags + runAI flags.
         const single = rows[0];
         data.subjectName = single.subjectName;
         data.storeName = single.subjectName;
@@ -4575,9 +4582,8 @@ export async function recurringFlagAlert( req, res ) {
         data.lastSubmittedBy = single.lastSubmittedBy;
         data.lastSubmissionDate = single.lastSubmissionDate;
         data.flagCount = single.flagCount;
-        data.flagCountPlural = single.flagCount > 1;
         data.runAICount = single.runAICount;
-        data.runAICountPlural = single.runAICount > 1;
+        data.totalFlags = single.totalFlags;
       }
 
       const html = compiled( { data } );
@@ -4602,7 +4608,6 @@ export async function recurringFlagAlert( req, res ) {
           logger.error( { functionName: 'recurringFlagAlert.buildExcel', error: e } );
         }
       }
-      console.log( params.toEmail );
       sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       sentSummary.push( { recipient, count: items.length, mode: isMultiStore ? 'multi-store' : ( isMultiChecklist ? 'multi-checklist' : 'single' ) } );
     } ) );

package/src/hbs/recurringFlag.hbs

@@ -67,7 +67,9 @@
                             <div style="margin-top: 0px;margin-bottom: 0px;font-size: 16px;line-height: 28px;color: #82899a;">
                                 <span style="font-weight: 400;color: #121A26;line-height: 140%;">
                                     Hi,<br/>
-                                    {{#if data.isMultiStore}}
+                                    {{#if data.isMultiStoreSingleChecklist}}
+                                        Recurring flags has been detected across multiple {{data.subjectLabelPluralLower}} in recent <b>{{data.checklistName}}</b> on recent submissions, exceeding the configured threshold of {{data.threshold}} occurrences.
+                                    {{else if data.isMultiStore}}
                                         Recurring flags has been detected across multiple {{data.subjectLabelPluralLower}} and across multiple checklists on recent submissions, exceeding the configured threshold of {{data.threshold}} occurrences.
                                     {{else if data.isMultiChecklist}}
                                         A Recurring flags has been identified for {{data.subjectLabelLower}} <b>{{data.subjectName}}</b> across multiple checklists on recent submissions, exceeding the configured threshold of {{data.threshold}} occurrences.
@@ -87,7 +89,9 @@
                                 <b>Key Highlights:</b>
                                 <ul style="margin:8px 0 0 0;padding-left:18px;">
                                     <li>Total {{data.subjectLabelPlural}} with Recurring Flags: {{data.highlights.totalSubjects}}</li>
+                                    {{#unless data.isMultiStoreSingleChecklist}}
                                     <li>Total Checklists with Recurring Flags: {{data.highlights.totalChecklists}}</li>
+                                    {{/unless}}
                                     <li>Total Recurring Flags: {{data.highlights.totalFlags}}</li>
                                 </ul>
                             </div>
@@ -141,12 +145,7 @@
                     <tr bgcolor="#ffffff">
                         <td class="flagText" style="padding-left:30px;line-height: 24px;">No of Flags :</td>
                         <td></td><td></td>
-                        <td class="flagText">{{data.flagCount}} Question Flag{{#if data.flagCountPlural}}s{{/if}}</td>
-                    </tr>
-                    <tr bgcolor="#ffffff">
-                        <td class="flagText" style="padding-left:30px;line-height: 24px;">Run AI Flags :</td>
-                        <td></td><td></td>
-                        <td class="flagText">{{data.runAICount}} Run AI Flag{{#if data.runAICountPlural}}s{{/if}}</td>
+                        <td class="flagText">{{data.totalFlags}} (Question Flags: {{data.flagCount}}, Run AI Flags: {{data.runAICount}})</td>
                     </tr>
                 </table>
             </td>
@@ -164,22 +163,20 @@
                                 <thead>
                                     <tr>
                                         {{#if data.isMultiStore}}<th>{{data.subjectLabel}} Name</th>{{/if}}
-                                        <th>Checklist Name</th>
+                                        {{#unless data.isMultiStoreSingleChecklist}}<th>Checklist Name</th>{{/unless}}
                                         <th>Last Submitted By</th>
                                         <th>Last Submission Date</th>
                                         <th>Total Recurring Flags</th>
-                                        <th>Run AI Flags</th>
                                     </tr>
                                 </thead>
                                 <tbody>
                                     {{#each data.rows}}
                                     <tr>
                                         {{#if ../data.isMultiStore}}<td>{{this.subjectName}}</td>{{/if}}
-                                        <td>{{this.checklistName}}</td>
+                                        {{#unless ../data.isMultiStoreSingleChecklist}}<td>{{this.checklistName}}</td>{{/unless}}
                                         <td>{{this.lastSubmittedBy}}</td>
                                         <td>{{this.lastSubmissionDate}}</td>
-                                        <td>{{this.days}}</td>
-                                        <td>{{this.runAICount}}</td>
+                                        <td>{{this.totalFlags}} (Question Flags: {{this.flagCount}}, Run AI Flags: {{this.runAICount}})</td>
                                     </tr>
                                     {{/each}}
                                 </tbody>

package/src/hbs/visit-checklist.hbs

@@ -70,6 +70,8 @@
   .q-answer-text.flagged{color:#a32d2d}
   .q-answer-media{margin-top:8px}
   .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}
   .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}
@@ -188,9 +190,11 @@
 {{#if this.multiQuestionReferenceImage.length}}
 <div class="q-answer-media">
   <div class="q-answer-caption">Question Reference Images</div>
-  {{#each this.multiQuestionReferenceImage}}
-  <img src="{{this}}" alt="Reference Image" />
-  {{/each}}
+  <div class="img-grid">
+    {{#each this.multiQuestionReferenceImage}}
+    <img src="{{this}}" alt="Reference Image" />
+    {{/each}}
+  </div>
 </div>
 {{/if}}
 {{!-- <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> --}}
@@ -198,25 +202,6 @@
 <div class="q-answer-list">
 {{#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>
@@ -231,8 +216,29 @@
     {{/if}}
   {{/eq}}
 
-  <table style="width:100%;margin-top:8px"><tr>
-    <td style="vertical-align:top">
+  <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>
+            {{/if}}
+          {{/if}}
+        {{/neq}}
+      {{/neq}}
+    </td>
+    <td style="width:50%;vertical-align:top;padding-left:8px">
       {{#eq this.answerType 'image'}}
         {{#if this.answer}}
         <div class="q-answer-caption">Uploaded Image</div>

package/src/utils/visitChecklistPdf.utils.js

@@ -169,13 +169,15 @@ function buildQuestionAnswerEntries( question ) {
 
     const rawMultiRefSources = [
       userAnswer?.multiReferenceImage,
-      matchedAnswer?.multiReferenceImage,
-      question?.answers?.[0]?.multiReferenceImage,
+      // matchedAnswer?.multiReferenceImage,
+      // question?.answers?.[0]?.multiReferenceImage,
     ];
     let multiReferenceImage = [];
     for ( const src of rawMultiRefSources ) {
       const flat = flattenImageRefs( src );
-      if ( flat.length ) { multiReferenceImage = flat; break; }
+      if ( flat.length ) {
+        multiReferenceImage = flat; break;
+      }
     }
     const validationImage = flattenImageRefs( userAnswer?.validationImage );
 
@@ -920,7 +922,6 @@ export function resolveTemplateUrls( templateData, baseUrl = 'https://d1r0hc2ssk
         q.multiQuestionReferenceImage = q.multiQuestionReferenceImage.map( ( ele ) => resolveUrl( ele ) );
       }
       q.userAnswer?.forEach( ( ua ) => {
-
         if ( ua.multiReferenceImage?.length ) {
           ua.multiReferenceImage = ua.multiReferenceImage.map( ( ele ) => resolveUrl( ele ) );
         }