tango-app-api-trax 3.9.35 → 3.9.37

package/package.json

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

package/src/controllers/internalTrax.controller.js

@@ -1703,6 +1703,85 @@ export async function saleUpdateCollection( req, res ) {
   }
 };
 
+/**
+ * One-off migration: in checklistquestionsconfigs, when a question's answerType
+ * is 'multiplechoicesingle' and one of its answers has validationType
+ * 'Capture Image', replace it with 'Capture Multiple Image with description'.
+ *
+ * Document shape: { question: [ { answerType, answers: [ { validationType } ] } ] }
+ * Defaults to a dry run; pass apply:true (body) or ?apply=true to write changes.
+ * @param {Object} req Express request — body.apply / query.apply toggles writing
+ * @param {Object} res Express response
+ * @return {Promise<void>}
+ */
+export async function updateMultipleChoiceSingleValidationType( req, res ) {
+  try {
+    const TARGET_ANSWER_TYPE = 'multiplechoicesingle';
+    const FROM_VALIDATION_TYPE = 'Capture Image';
+    const TO_VALIDATION_TYPE = 'Capture Multiple Image with description';
+
+    const apply = req.body?.apply === true || req.query?.apply === 'true';
+
+    // Only load docs that actually contain a matching question + answer.
+    const query = {
+      question: {
+        $elemMatch: {
+          answerType: TARGET_ANSWER_TYPE,
+          answers: { $elemMatch: { validationType: FROM_VALIDATION_TYPE } },
+        },
+      },
+    };
+
+    const docs = await CLquestions.find( query );
+
+    let documentsUpdated = 0;
+    let answersUpdated = 0;
+    const updatedIds = [];
+
+    for ( const doc of docs ) {
+      const questions = Array.isArray( doc.question ) ? doc.question : [];
+      let changedInDoc = 0;
+
+      for ( const q of questions ) {
+        if ( !q || q.answerType !== TARGET_ANSWER_TYPE ) continue;
+
+        const answers = Array.isArray( q.answers ) ? q.answers : [];
+        for ( const a of answers ) {
+          if ( a && a.validationType === FROM_VALIDATION_TYPE ) {
+            a.validationType = TO_VALIDATION_TYPE;
+            changedInDoc++;
+          }
+        }
+      }
+
+      if ( changedInDoc > 0 ) {
+        documentsUpdated++;
+        answersUpdated += changedInDoc;
+        updatedIds.push( doc._id );
+
+        // `question` is a Mixed array, so write the whole rebuilt array.
+        if ( apply ) {
+          await CLquestions.updateMany( { _id: doc._id }, { question: questions } );
+        }
+      }
+    }
+
+    return res.sendSuccess( {
+      message: apply ?
+        'Validation type updated successfully' :
+        'Dry run — pass apply:true to write these changes',
+      apply,
+      matchedDocuments: docs.length,
+      documentsUpdated,
+      answersUpdated,
+      updatedIds,
+    } );
+  } catch ( error ) {
+    logger.error( { function: 'updateMultipleChoiceSingleValidationType', error: error } );
+    return res.sendError( error, 500 );
+  }
+};
+
 export async function getUserStoreList( req, res ) {
   try {
     let details = [];
@@ -2689,16 +2768,16 @@ export async function countUpdateRunAI( req, res ) {
     if ( !req.body.id ) {
       return res.sendError( 'Checklist id is required', 400 );
     }
-    if ( !req.body.runAICount ) {
-      return res.sendError( 'runAICount is required', 400 );
-    }
+    // if ( !req.body.runAICount ) {
+    //   return res.sendError( 'runAICount is required', 400 );
+    // }
     let getDetails = await processedchecklist.findOne( { _id: req.body.id } );
     if ( !getDetails ) {
       return res.sendError( 'No data found', 204 );
     }
 
     let updateData = {
-      runAIFlag: req.body.runAICount,
+      runAIFlag: req.body?.runAICount ?? 0,
     };
 
     // complianceCount is already populated for the other answer types; add the image/video scores on top.
@@ -3601,7 +3680,7 @@ export async function runAIFlag( req, res ) {
             runAIFlag: store?.runAIFlag,
             questionFlag: store?.questionFlag,
             checklistName: store.checkListName?.trim(),
-            submittedBy: store?.userName,
+            submittedBy: store.timeFlag ? '--' : store?.userName,
             time: store?.submitTime_string ?? '--',
             domain: `${JSON.parse( process.env.URL ).domain}/manage/trax/flags?date=${dayjs().format( 'YYYY-MM-DD' )}`,
             status: store.checklistStatus,

package/src/controllers/trax.controller.js

@@ -4044,7 +4044,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         }, { userId: 1, store_id: 1 } );
 
         if ( inprogressData.length ) {
-          await processedchecklist.updateMany( { _id: { $in: inprogressData.map( ( ele ) => new ObjectId( ele._id ) ) } }, { scheduleEndTime: getCLconfig.scheduleEndTime, scheduleEndTime_iso: endTimeIso.format() } );
+          await processedchecklist.updateMany( { _id: { $in: inprogressData.map( ( ele ) => new ObjectId( ele._id ) ) } }, { scheduleEndTime: getCLconfig.scheduleEndTime, scheduleEndTime_iso: endTimeIso.format(), complianceCount: getCLconfig.complianceCount, allowedOverTime: getCLconfig.allowedOverTime, allowedStoreLocation: getCLconfig.allowedStoreLocation, userVerification: getCLconfig.userVerification } );
           inprogressData.forEach( ( item ) => {
             let checkData = assignUserList.find( ( ele ) => ele.userId.toString() == item.userId.toString() && ele.store_id == item.store_id );
             if ( !checkData ) {

package/src/controllers/traxDashboard.controllers.js

@@ -428,14 +428,19 @@ export const checklistPerformance = async ( req, res ) => {
               $cond: [
                 { $gt: [ '$$divisor', 0 ] },
                 {
-                  $round: [
+                  $max: [
+                    0,
                     {
-                      $multiply: [
-                        { $divide: [ '$userComplianceCountTotal', '$$divisor' ] },
-                        100,
+                      $round: [
+                        {
+                          $multiply: [
+                            { $divide: [ '$userComplianceCountTotal', '$$divisor' ] },
+                            100,
+                          ],
+                        },
+                        0,
                       ],
                     },
-                    0,
                   ],
                 },
                 0,
@@ -463,7 +468,7 @@ export const checklistPerformance = async ( req, res ) => {
       },
     } );
     let getChecklistPerformanceData = await processedchecklistService.aggregate( findQuery );
-    if ( !getChecklistPerformanceData[0].data.length ) {
+    if ( !getChecklistPerformanceData[0].count[0].total ) {
       return res.sendError( 'no data found', 204 );
     }
 

package/src/hbs/visit-checklist.hbs

@@ -56,14 +56,16 @@
   .dp-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:20px;padding-bottom:12px;border-bottom:2px solid #00AEEF}
   .dp-header h2{font-size:18px;font-weight:700;color:#1a1a2e}
   .dp-score{font-size:15px;font-weight:700;color:#000000}
-  .q-row{display:flex;gap:12px;margin-bottom:14px;padding:12px;border-radius:8px;background:transparent}
-  .q-num{font-size:12px;font-weight:700;color:#000;min-width:22px}
-  .q-body{flex:1}
+  .q-row{position:relative;margin-bottom:14px;padding:12px 12px 12px 40px;border-radius:8px;background:transparent}
+  .q-num{position:absolute;left:12px;top:12px;font-size:12px;font-weight:700;color:#000}
   .q-text{font-size:13px;color:#444;margin-bottom:4px}
   .q-ans{display:inline-flex;align-items:center;gap:4px;font-size:12px;font-weight:600;padding:2px 8px;border-radius:12px}
   .ans-yes{background:#e1f5ee;color:#0f6e56}
   .ans-no{background:#fcebeb;color:#a32d2d}
   .flag-badge{background:#faeeda;color:#854f0b;font-size:10px;font-weight:600;padding:1px 6px;border-radius:8px;margin-left:6px}
+  .det-badge{display:inline-block;font-size:10px;font-weight:600;padding:2px 8px;border-radius:10px;white-space:nowrap}
+  .det-matched{background:#e1f5ee;color:#0f6e56}
+  .det-notmatched{background:#fcebeb;color:#a32d2d}
   .q-answer-list{margin-top:6px}
   .q-answer-item{margin-top:6px;padding:0;background:transparent;border:none;border-radius:0}
   .q-answer-text{font-size:12px;color:#1a1a1a;line-height:1.5}
@@ -72,10 +74,11 @@
   .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-grid{margin-top:8px;font-size:0}
+  .answer-media-cell{display:inline-block;width:calc(50% - 6px);vertical-align:top;margin-bottom:12px;break-inside:avoid}
+  .answer-media-cell:nth-child(2n+1){margin-right:12px}
   .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}
+  .answer-media-cell img{display:block;width:100%;height:200px;object-fit:fill;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}
@@ -86,7 +89,6 @@
   .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}
@@ -124,12 +126,8 @@
  
 <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>
-{{#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">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">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>
@@ -191,10 +189,10 @@
 <div class="q-row">
 <span class="q-num">{{this.qno}}</span>
 <div class="q-body">
-<div class="q-text" style="display:flex;justify-content:space-between">
+<div class="q-text" style="display:flex;justify-content:space-between;align-items:center;gap:8px">
   <div>{{this.qname}}</div>
   {{#if this.compliance}}
-  <div>Score:{{this.score}}</div>
+  <div style="flex-shrink:0">Score:{{this.score}}</div>
   {{/if}}
 </div>
 {{#if this.questionReferenceImage}}
@@ -220,7 +218,7 @@
 <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>
+    <div class="q-answer-text {{#if this.sopFlag}}flagged{{/if}}">{{this.answer}}{{#if this.showDetectionStatus}} <span class="det-badge {{#eq this.detectionStatus 'Matched'}}det-matched{{else}}det-notmatched{{/eq}}">{{this.detectionStatus}}</span>{{/if}}</div>
     {{/if}}
   {{/eq}}
   {{#eq this.answerType 'video'}}
@@ -231,6 +229,20 @@
     </div>
     {{/if}}
   {{/eq}}
+  {{!-- This answer's own images (reference / uploaded / validation), grouped with its label, two per row --}}
+  {{#if this.answerMedia.length}}
+  <div class="answer-media-grid">
+    {{#each this.answerMedia}}
+    <div class="answer-media-cell">
+      <div class="q-answer-caption" style="display:flex;justify-content:space-between;align-items:center;gap:6px">
+        <span>{{this.label}}</span>
+        {{#if this.detectionStatus}}<span class="det-badge {{#eq this.detectionStatus 'Matched'}}det-matched{{else}}det-notmatched{{/eq}}">{{this.detectionStatus}}</span>{{/if}}
+      </div>
+      <img src="{{this.url}}" alt="{{this.label}}" />
+    </div>
+    {{/each}}
+  </div>
+  {{/if}}
   {{#eq this.validationDisplayType 'text'}}
     {{#if this.validationAnswer}}
     <div class="q-answer-text {{#if this.sopFlag}}flagged{{/if}}">validation Answer: {{this.validationAnswer}}</div>
@@ -243,6 +255,7 @@
     {{/if}}
   {{/eq}}
 
+  {{!-- Validation videos captured with multi-image validation (shown as links) --}}
   {{#eq this.validationDisplayType 'multiImage'}}
     {{#if this.validationVideo.length}}
     <div class="q-answer-media">
@@ -253,20 +266,25 @@
     </div>
     {{/if}}
   {{/eq}}
+
 </div>
 {{/each}}
+</div>
+{{/if}}
+{{!-- All images for this question (reference / uploaded / validation), two per row --}}
 {{#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>
+    <div class="q-answer-caption" style="display:flex;justify-content:space-between;align-items:center;gap:6px">
+      <span>{{this.label}}</span>
+      {{#if this.detectionStatus}}<span class="det-badge {{#eq this.detectionStatus 'Matched'}}det-matched{{else}}det-notmatched{{/eq}}">{{this.detectionStatus}}</span>{{/if}}
+    </div>
     <img src="{{this.url}}" alt="{{this.label}}" />
   </div>
   {{/each}}
 </div>
 {{/if}}
-</div>
-{{/if}}
 {{#if this.remarks}}
 <div class="q-answer-remarks">Remarks: {{this.remarks}}</div>
 {{/if}}
@@ -281,8 +299,8 @@
   {{#if userImage}}
   <img class="user-verify-photo" src="{{userImage}}" alt="Submitted by photo" />
   {{/if}}
-  {{#if userSignature}}
-  <div class="user-verify-signature-text">{{userSignature}}</div>
+  {{#if submittedBy}}
+  <div class="user-verify-name">{{userSignature}}</div>
   {{/if}}
 </div>
 {{/if}}

package/src/routes/internalTraxApi.router.js

@@ -13,6 +13,7 @@ internalTraxRouter
     .get( '/list', isAllowedInternalAPIHandler, internalController.list )
     .post( '/updateAomDetails', isAllowedInternalAPIHandler, internalController.aomupdateCollection )
     .post( '/updateSaleManagerDetails', isAllowedInternalAPIHandler, internalController.saleUpdateCollection )
+    .post( '/updateValidationType', isAllowedInternalAPIHandler, internalController.updateMultipleChoiceSingleValidationType )
     .get( '/profile', isAllowedMobileSessionHandler, internalController.getUserStoreList )
     .post( '/pushNotification', isAllowedInternalAPIHandler, internalController.pushNotification )
     .post( '/taskPushNotification', isAllowedInternalAPIHandler, internalController.taskPushNotification )

package/src/utils/visitChecklistPdf.utils.js

@@ -146,6 +146,54 @@ function flattenImageRefs( arr ) {
       .filter( Boolean );
 }
 
+/**
+ * Builds the ordered media list (reference → uploaded → validation) for a SINGLE
+ * answer entry, deduped within that entry. Used to render each answer's images
+ * inline next to its own text/label, instead of pooling every answer's images
+ * into one question-level grid (which decoupled labels from their images).
+ * @param {Object} ua a single entry produced by buildQuestionAnswerEntries
+ * @return {Array} list of { type, label, url, detectionStatus } for this entry, in render order
+ */
+function buildEntryMediaItems( ua = {} ) {
+  const items = [];
+  const seen = new Set();
+
+  const push = ( type, label, url, detectionStatus = '' ) => {
+    if ( !url || typeof url !== 'string' ) return;
+    if ( seen.has( url ) ) return;
+    seen.add( url );
+    items.push( { type, label, url, detectionStatus } );
+  };
+
+  // Each uploaded/validation image shows its OWN runAI verdict (per-image, never
+  // aggregated). References are not AI-checked, so they carry no badge.
+  const statusByUrl = buildAnswerImageStatus( ua );
+  const statusFor = ( url ) => statusByUrl.get( url ) || '';
+
+  if ( ua.hasReferenceImage ) {
+    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 );
+    }
+  }
+
+  if ( ua.answerType === 'image' && ua.answer ) {
+    push( 'uploaded', 'Uploaded Image', ua.answer, statusFor( ua.answer ) );
+  }
+
+  if ( ua.validation ) {
+    if ( ua.validationDisplayType === 'image' && ua.validationAnswer ) {
+      push( 'validation', 'Validation Image', ua.validationAnswer, statusFor( ua.validationAnswer ) );
+    }
+    if ( ua.validationDisplayType === 'multiImage' && Array.isArray( ua.validationImage ) ) {
+      ua.validationImage.forEach( ( url ) => push( 'validation', 'Validation Image', url, statusFor( url ) ) );
+    }
+  }
+
+  return items;
+}
+
 function buildQuestionAnswerEntries( question ) {
   const rawUserAnswers = getSourceUserAnswers( question );
   const uniqueUserAnswers = [];
@@ -190,7 +238,21 @@ function buildQuestionAnswerEntries( question ) {
       question?.answerType !== 'multipleImage' &&
       Boolean( referenceImage || multiReferenceImage.length );
 
-    return {
+    // runAI verdicts for this answer, in source order. Used to tag each uploaded /
+    // validation image with its OWN verdict (by answerImage filename, else by
+    // position) so multi-image answers don't all collapse to one aggregated status.
+    const isPerAnswerType = PER_ANSWER_DETECTION_TYPES.includes( question?.answerType );
+    const runAIValues = getRunAIMatchValues( userAnswer?.runAIData );
+    const imageStatus = buildImageStatusMap( userAnswer?.runAIData );
+
+    // Choice answers (yes/no, multiple choice, dropdown) take this answer's own
+    // verdict directly — never aggregated. Other types keep the aggregate only as
+    // a last-resort fallback.
+    const detectionStatus = isPerAnswerType ?
+      verdictFromValue( runAIValues[0] ) :
+      getDetectionStatus( userAnswer?.runAIData );
+
+    const entry = {
       answer: userAnswer?.answer || '',
       answerType: getMediaDisplayType( question?.answerType, userAnswer ),
       referenceImage,
@@ -198,6 +260,9 @@ function buildQuestionAnswerEntries( question ) {
       multiReferenceImage,
       remarks: userAnswer?.remarks || '',
       sopFlag: userAnswer?.sopFlag ?? matchedAnswer?.sopFlag ?? false,
+      detectionStatus,
+      imageStatus,
+      runAIValues,
       validation,
       validationType,
       validationAnswer,
@@ -205,6 +270,19 @@ function buildQuestionAnswerEntries( question ) {
       validationVideo,
       validationDisplayType: getValidationDisplayType( validationType ),
     };
+
+    // Text-label answers (e.g. "Attach the image of Cat") carry their own
+    // reference/validation images. Group those images with this entry so the
+    // label and its images render together, instead of pooling every answer's
+    // images into one question-level grid. Image/video answers keep flowing
+    // into the pooled grid (handled by buildQuestionMediaItems).
+    entry.answerMedia = entry.answerType === 'text' ? buildEntryMediaItems( entry ) : [];
+
+    // Choice answers with no media show their verdict next to the answer text;
+    // when they carry validation media the badge sits on that media instead.
+    entry.showDetectionStatus = isPerAnswerType && Boolean( detectionStatus ) && !entry.answerMedia.length;
+
+    return entry;
   } );
 }
 
@@ -216,21 +294,38 @@ function buildQuestionAnswerEntries( question ) {
  * 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
+ * @param {string} [forcedStatus] when set (image / image-video), every uploaded &
+ *   validation image shows this aggregated verdict instead of its own per-image one
+ * @return {Array} list of { type, label, url, detectionStatus } media items in render order
  */
-function buildQuestionMediaItems( userAnswers = [] ) {
+function buildQuestionMediaItems( userAnswers = [], forcedStatus = '' ) {
   const items = [];
   const seen = new Set();
 
-  const push = ( type, label, url ) => {
+  const push = ( type, label, url, detectionStatus = '' ) => {
     if ( !url || typeof url !== 'string' ) return;
     if ( seen.has( url ) ) return;
     seen.add( url );
-    items.push( { type, label, url } );
+    items.push( { type, label, url, detectionStatus } );
   };
 
+  // Entries that render their media inline with the answer (answerMedia) are
+  // excluded here so their images are not duplicated in the pooled grid.
+  const pool = userAnswers.filter( ( ua ) => !( ua.answerMedia && ua.answerMedia.length ) );
+
+  // Resolve each image's status per answer (per-image; forcedStatus aggregates
+  // image / image-video). Built per answer so positional matching stays aligned.
+  const statusByUrl = new Map();
+  pool.forEach( ( ua ) => {
+    buildAnswerImageStatus( ua, forcedStatus ).forEach( ( status, url ) => statusByUrl.set( url, status ) );
+  } );
+  const statusFor = ( url ) => statusByUrl.get( url ) || '';
+
   // 1. Reference images first (deduped, so a single shared reference shows once).
-  userAnswers.forEach( ( ua ) => {
+  // Skipped for image/video & multipleImage upload questions (hasReferenceImage
+  // is false), which have no comparison reference — only uploaded answers.
+  pool.forEach( ( ua ) => {
+    if ( !ua.hasReferenceImage ) return;
     if ( Array.isArray( ua.multiReferenceImage ) && ua.multiReferenceImage.length ) {
       ua.multiReferenceImage.forEach( ( url ) => push( 'reference', 'Reference Image', url ) );
     } else if ( ua.referenceImage ) {
@@ -238,23 +333,23 @@ function buildQuestionMediaItems( userAnswers = [] ) {
     }
   } );
 
-  // 2. Uploaded images.
-  userAnswers.forEach( ( ua ) => {
+  // 2. Uploaded images — tagged with each image's own detection status (from runAIData).
+  pool.forEach( ( ua ) => {
     if ( ua.answerType === 'image' && ua.answer ) {
-      push( 'uploaded', 'Uploaded Image', ua.answer );
+      push( 'uploaded', 'Uploaded Image', ua.answer, statusFor( ua.answer ) );
     }
   } );
 
   // 3. Validation images (single 'Capture Image' and multi 'Capture Multiple Image').
-  userAnswers.forEach( ( ua ) => {
+  pool.forEach( ( ua ) => {
     if ( !ua.validation ) return;
 
     if ( ua.validationDisplayType === 'image' && ua.validationAnswer ) {
-      push( 'validation', 'Validation Image', ua.validationAnswer );
+      push( 'validation', 'Validation Image', ua.validationAnswer, statusFor( ua.validationAnswer ) );
     }
 
     if ( ua.validationDisplayType === 'multiImage' && Array.isArray( ua.validationImage ) ) {
-      ua.validationImage.forEach( ( url ) => push( 'validation', 'Validation Image', url ) );
+      ua.validationImage.forEach( ( url ) => push( 'validation', 'Validation Image', url, statusFor( url ) ) );
     }
   } );
 
@@ -289,6 +384,125 @@ function getRunAIMatchValues( runAIData ) {
 }
 
 
+// Answer types whose runAI verdict is aggregated across all uploaded images:
+// if any image is not matched, the whole question reads 'Not Matched'. Every
+// other type shows each image's own verdict.
+const AGGREGATE_DETECTION_TYPES = [ 'image', 'image/video' ];
+
+// Choice answers: each selected answer carries its OWN runAI verdict and shows it
+// directly — never aggregated ('.every') across the question's other answers.
+const PER_ANSWER_DETECTION_TYPES = [ 'yes/no', 'multiplechoicesingle', 'multiplechoicemultiple', 'dropdown' ];
+
+
+/**
+ * Maps a single runAI value to a display status.
+ * @param {string|boolean} value
+ * @return {string} 'Matched' | 'Not Matched' | ''
+ */
+function verdictFromValue( value ) {
+  if ( value === 'True' || value === true ) return 'Matched';
+  if ( value === 'False' || value === false ) return 'Not Matched';
+  return '';
+}
+
+
+/**
+ * The filename of an image URL/path, ignoring any query string. Used to match an
+ * uploaded/validation image against its runAIData entry (whose answerImage may
+ * carry a different prefix / signed-URL query), regardless of CDN resolution.
+ * @param {string} url
+ * @return {string}
+ */
+function imageBasename( url ) {
+  return String( url || '' ).split( '?' )[0].split( '/' ).pop();
+}
+
+
+/**
+ * Builds a per-image detection status map from the nested runAIData shape
+ * ([ { answerImage, results: [ { featureName, value } ] } ]), keyed by the
+ * answerImage's filename. The flat shape has no per-image key, so it yields an
+ * empty map and callers fall back to the answer-level status.
+ * @param {Array} runAIData
+ * @return {Object} { [filename]: 'Matched' | 'Not Matched' }
+ */
+function buildImageStatusMap( runAIData ) {
+  const map = {};
+  if ( !Array.isArray( runAIData ) ) return map;
+
+  runAIData.forEach( ( item ) => {
+    if ( !item || !item.answerImage ) return;
+    const results = Array.isArray( item.results ) ? item.results : [ item ];
+    const values = results
+        .filter( ( r ) => r?.featureName === 'Matched/Not Matched' )
+        .map( ( r ) => r.value );
+    if ( !values.length ) return;
+    const matched = values.every( ( v ) => v === 'True' || v === true );
+    map[imageBasename( item.answerImage )] = matched ? 'Matched' : 'Not Matched';
+  } );
+
+  return map;
+}
+
+
+/**
+ * Resolves the detection status for each checked image (uploaded + validation) of a
+ * single answer, returned as a Map of url → 'Matched' | 'Not Matched' | ''.
+ *
+ * Each image gets its OWN verdict — never aggregated across the answer's other images:
+ *   1. matched explicitly by its answerImage filename (nested runAIData), else
+ *   2. matched positionally — the Nth checked image takes the Nth runAI verdict
+ *      (works for the flat runAIData shape and when filenames don't line up).
+ * For image / image-video, forcedStatus (the question-level aggregate) overrides all.
+ * @param {Object} ua a single entry produced by buildQuestionAnswerEntries
+ * @param {string} [forcedStatus] aggregated status applied to every image (image/image-video)
+ * @return {Map<string,string>} url → status
+ */
+function buildAnswerImageStatus( ua = {}, forcedStatus = '' ) {
+  const statusByUrl = new Map();
+  const byName = ua.imageStatus || {};
+  const values = Array.isArray( ua.runAIValues ) ? ua.runAIValues : [];
+  let idx = 0;
+
+  const assign = ( url ) => {
+    if ( !url || typeof url !== 'string' || statusByUrl.has( url ) ) return;
+    let status = forcedStatus;
+    if ( !status ) {
+      const key = imageBasename( url );
+      status = ( key in byName ) ? byName[key] : verdictFromValue( values[idx] );
+      idx++;
+    }
+    statusByUrl.set( url, status );
+  };
+
+  if ( ua.answerType === 'image' && ua.answer ) assign( ua.answer );
+
+  if ( ua.validation ) {
+    if ( ua.validationDisplayType === 'image' && ua.validationAnswer ) assign( ua.validationAnswer );
+    if ( ua.validationDisplayType === 'multiImage' && Array.isArray( ua.validationImage ) ) {
+      ua.validationImage.forEach( assign );
+    }
+  }
+
+  return statusByUrl;
+}
+
+
+/**
+ * Resolves a 'Matched' / 'Not Matched' detection status from runAIData. Handles both
+ * runAIData shapes (per-image nested results, and flat). Any non-match verdict makes
+ * the whole status 'Not Matched'. Returns '' when there is no runAI verdict to report.
+ * @param {Array} runAIData
+ * @return {string} 'Matched' | 'Not Matched' | ''
+ */
+function getDetectionStatus( runAIData ) {
+  const values = getRunAIMatchValues( runAIData );
+  if ( !values.length ) return '';
+  const allMatched = values.every( ( v ) => v === 'True' || v === true );
+  return allMatched ? 'Matched' : 'Not Matched';
+}
+
+
 /**
 
  * Map section array { sectionName, questions[] } (view API or processed checklist) to scores / template sections.
@@ -360,6 +574,22 @@ function mapSectionsFromQuestionAnswer( questionAnswer ) {
       }
 
 
+      // image / image-video aggregate their runAI verdict across all uploaded images
+      // (any 'Not Matched' → whole question 'Not Matched'). Every other type keeps
+      // each image's own verdict, so this stays '' for them.
+      let aggregateDetectionStatus = '';
+      if ( AGGREGATE_DETECTION_TYPES.includes( q.answerType ) ) {
+        const aiAnswers = q.answerType === 'image/video' ?
+          ( q.userAnswer || [] ).filter( ( a ) => a?.answerType === 'image' ) :
+          ( q.userAnswer || [] );
+        const matchValues = aiAnswers.flatMap( ( a ) => getRunAIMatchValues( a?.runAIData ) );
+        if ( matchValues.length ) {
+          aggregateDetectionStatus = matchValues.every( ( v ) => v === 'True' || v === true ) ?
+            'Matched' : 'Not Matched';
+        }
+      }
+
+
       sectionScore += score;
 
       sectionMax += max;
@@ -417,7 +647,7 @@ function mapSectionsFromQuestionAnswer( questionAnswer ) {
 
         answerDisplay: isYes ? 'Yes' : ( isNo ? 'No' : ( answerText && answerText.startsWith( 'http' ) ? 'Image' : ( answerText || '—' ) ) ),
 
-        mediaItems: buildQuestionMediaItems( userAnswersWithRef ),
+        mediaItems: buildQuestionMediaItems( userAnswersWithRef, aggregateDetectionStatus ),
 
         userAnswer: userAnswersWithRef.length ? userAnswersWithRef : [ {
           answer: '',
@@ -442,15 +672,15 @@ function mapSectionsFromQuestionAnswer( questionAnswer ) {
 
       sectionName: section.sectionName || `Section ${sectionIdx + 1}`,
 
-      targetScore: sectionMax,
+      targetScore: sectionMax ? sectionMax : '--',
 
-      actualScore: sectionScore,
+      actualScore: sectionMax ? sectionScore : '--',
 
       questionsCount,
 
       passedCount,
 
-      percentage: sectionMax > 0 ? Math.round( ( sectionScore / sectionMax ) * 100 ) : 0,
+      percentage: sectionMax > 0 ? Math.round( ( sectionScore / sectionMax ) * 100 ) : '--',
 
     } );
 
@@ -939,6 +1169,10 @@ export function createImageCache() {
               if ( typeof u === 'string' && u.startsWith( 'http' ) ) urls.add( u );
             } );
           }
+
+          ua.answerMedia?.forEach( ( m ) => {
+            if ( typeof m.url === 'string' && m.url.startsWith( 'http' ) ) urls.add( m.url );
+          } );
         } );
 
         q.mediaItems?.forEach( ( m ) => {
@@ -1006,6 +1240,12 @@ export function createImageCache() {
           if ( ua.validationDisplayType === 'multiImage' && ua.validationImage?.length ) {
             ua.validationImage = ua.validationImage.map( ( u ) => ( cache.has( u ) ? cache.get( u ) : u ) );
           }
+
+          if ( ua.answerMedia?.length ) {
+            ua.answerMedia.forEach( ( m ) => {
+              if ( cache.has( m.url ) ) m.url = cache.get( m.url );
+            } );
+          }
         } );
 
         if ( q.mediaItems?.length ) {
@@ -1093,6 +1333,12 @@ export function resolveTemplateUrls( templateData, baseUrl = 'https://d1r0hc2ssk
         if ( ua.answer && ua.answerType !== 'text' ) {
           ua.answer = resolveUrl( ua.answer );
         }
+
+        if ( ua.answerMedia?.length ) {
+          ua.answerMedia.forEach( ( m ) => {
+            m.url = resolveUrl( m.url );
+          } );
+        }
       } );
 
       if ( q.mediaItems?.length ) {
@@ -1239,6 +1485,12 @@ export async function generateVisitChecklistPDF( templateData, baseUrl = 'https:
         if ( ua.answer && ua.answerType !== 'text' ) {
           ua.answer = resolveUrl( ua.answer );
         }
+
+        if ( ua.answerMedia?.length ) {
+          ua.answerMedia.forEach( ( m ) => {
+            m.url = resolveUrl( m.url );
+          } );
+        }
       } );
 
       if ( q.mediaItems?.length ) {