tango-app-api-trax 3.8.21 → 3.8.22-nike

package/src/controllers/teaxFlag.controller.js

@@ -608,7 +608,7 @@ export const flagCardsV1 = async ( req, res ) => {
         {
           client_id: clientId,
           publish: true,
-          checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] },
+          checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] },
         },
         { checkListType: 1 },
     );
@@ -2743,7 +2743,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           $or: [
             { questionFlag: { $gte: 1 } },
             { timeFlag: { $gte: 1 } },
-            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] } },
+            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] } },
             {
               runAIQuestionCount: { $gte: 1 },
             },
@@ -2945,7 +2945,7 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
           {
             client_id: requestData.clientId,
             publish: true,
-            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] },
+            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] },
           },
           { checkListType: 1 },
       );
@@ -3047,7 +3047,7 @@ export const flagTablesV2 = async ( req, res ) => {
     }
 
     if ( requestData?.filter === 'all' ) {
-      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] } } ] } );
+      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] } } ] } );
     } else if ( requestData?.filter === 'question' ) {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { questionFlag: { $gte: 1 } } );
@@ -3055,7 +3055,7 @@ export const flagTablesV2 = async ( req, res ) => {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { timeFlag: { $gte: 1 } } );
     } else if ( requestData?.filter === 'detection' ) {
-      findAndQuery.push( { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ] } } );
+      findAndQuery.push( { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount', 'storehygienemonitoring' ] } } );
     } else if ( requestData?.filter === 'runAI' ) {
       if ( req.body.runAIChecklistName ) {
         findAndQuery.push( { checkListName: { $in: req.body.runAIChecklistName } } );

package/src/controllers/trax.controller.js

@@ -1729,6 +1729,7 @@ export const updateConfigure = async ( req, res ) => {
       owner: inputBody?.checkListDetails?.owner || [],
       restrictAttendance: inputBody?.checkListDetails?.restrictAttendance || false,
       enableNewDeployedStore: inputBody?.checkListDetails?.enableNewDeployedStore || false,
+      redoValidity: inputBody?.checkListDetails?.redoValidity || 7,
     };
 
     if ( inputBody?.checkListDetails?.approver.length ) {
@@ -3907,6 +3908,8 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
               }
             }
             getsubmitDetails[0].questionAnswers = sectionList;
+            getsubmitDetails[0].scheduleEndTime = getCLconfig.scheduleEndTime;
+            getsubmitDetails[0].scheduleEndTime_iso = endTimeIso.format();
             if ( modifiedCount ) {
               getsubmitDetails[0].checklistStatus = 'inprogress';
               getsubmitDetails[0].date_string = dayjs( currentdate ).format( 'YYYY-MM-DD' );
@@ -4030,6 +4033,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() } );
           inprogressData.forEach( ( item ) => {
             let checkData = assignUserList.find( ( ele ) => ele.userId.toString() == item.userId.toString() && ele.store_id == item.store_id );
             if ( !checkData ) {
@@ -4127,7 +4131,7 @@ async function updateOpenSearch( user, data ) {
 export const aiChecklist = async ( req, res ) => {
   try {
     let storeDetails = await storeService.count( { clientId: req.query.clientId, status: 'active' } );
-    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ];
+    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'cleaning', 'scrum', 'suspiciousactivity', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ];
     let checklistDetails = [];
     let publishList = [];
     let unpublishList = [];
@@ -4140,7 +4144,7 @@ export const aiChecklist = async ( req, res ) => {
     checklistDetails = [ ...publishList, ...unpublishList ];
 
     checklistDetails.forEach( ( item ) => {
-      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert' ].includes( item.checkListType ) ) {
+      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking', 'halfshutter', 'tvcompliance', 'cameratampering', 'queuealert', 'staffgrouping', 'boxalert', 'employeeCount' ].includes( item.checkListType ) ) {
         item.storeCount = storeDetails;
       }
     } );

package/src/hbs/recurringFlag.hbs

@@ -67,12 +67,14 @@
                             <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}}
-                                        Recurring flags has been detected across multiple stores and across multiple checklists on recent submissions, exceeding the configured threshold of {{data.threshold}} occurrences.
+                                    {{#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 store <b>{{data.storeName}}</b> across multiple checklists on recent submissions, exceeding the configured threshold of {{data.threshold}} occurrences.
+                                        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.
                                     {{else}}
-                                        A recurring flag has been identified for store <b>{{data.storeName}}</b>.where a question has been flagged multiple times in recent {{data.checklistName}} submissions, exceeding the configured threshold of {{data.threshold}} occurrences.
+                                        A recurring flag has been identified for {{data.subjectLabelLower}} <b>{{data.subjectName}}</b>.where a question has been flagged multiple times in recent {{data.checklistName}} submissions, exceeding the configured threshold of {{data.threshold}} occurrences.
                                     {{/if}}
                                 </span>
                             </div>
@@ -86,8 +88,10 @@
                             <div class="highlight">
                                 <b>Key Highlights:</b>
                                 <ul style="margin:8px 0 0 0;padding-left:18px;">
-                                    <li>Total Stores with Recurring Flags: {{data.highlights.totalStores}}</li>
+                                    <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>
@@ -102,7 +106,7 @@
                                 {{#if data.isMultiStore}}
                                     Details of the Recurring Flags are as follows:
                                 {{else if data.isMultiChecklist}}
-                                    Details of the Recurring Flags from Store {{data.storeName}} (last {{data.threshold}} days):
+                                    Details of the Recurring Flags from {{data.subjectLabel}} {{data.subjectName}} are as follows:
                                 {{else}}
                                     Details of the Recurring Flags from checklist are as follows:
                                 {{/if}}
@@ -119,9 +123,9 @@
             <td align="center" bgcolor="#dbe5ea" style="padding:0 10px 0 10px">
                 <table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 680px;">
                     <tr bgcolor="#ffffff">
-                        <td class="flagText" style="padding-left:30px;line-height: 24px;color:#000000">Store Name :</td>
+                        <td class="flagText" style="padding-left:30px;line-height: 24px;color:#000000">{{data.subjectLabel}} Name :</td>
                         <td></td><td></td>
-                        <td class="flagText">{{data.storeName}}</td>
+                        <td class="flagText">{{data.subjectName}}</td>
                     </tr>
                     <tr bgcolor="#ffffff">
                         <td class="flagText" style="padding-left:30px;line-height: 24px;">Checklist Name :</td>
@@ -141,7 +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}} - "{{data.questionName}}" has flagged for {{data.days}} day{{#if data.daysPlural}}s{{/if}} in a Row</td>
+                        <td class="flagText">{{data.totalFlags}} (Question Flags: {{data.flagCount}}, Run AI Flags: {{data.runAICount}})</td>
                     </tr>
                 </table>
             </td>
@@ -158,9 +162,8 @@
                             <table class="rfTable">
                                 <thead>
                                     <tr>
-                                        {{#if data.isMultiStore}}<th>Store Name</th>{{/if}}
-                                        <th>Checklist Name</th>
-                                        <th>Question</th>
+                                        {{#if data.isMultiStore}}{{#unless data.isUserCoverage}}<th>{{data.subjectLabel}} Name</th>{{/unless}}{{/if}}
+                                        {{#unless data.isMultiStoreSingleChecklist}}<th>Checklist Name</th>{{/unless}}
                                         <th>Last Submitted By</th>
                                         <th>Last Submission Date</th>
                                         <th>Total Recurring Flags</th>
@@ -169,12 +172,11 @@
                                 <tbody>
                                     {{#each data.rows}}
                                     <tr>
-                                        {{#if ../data.isMultiStore}}<td>{{this.storeName}}</td>{{/if}}
-                                        <td>{{this.checklistName}}</td>
-                                        <td>{{this.questionName}}</td>
+                                        {{#if ../data.isMultiStore}}{{#unless ../data.isUserCoverage}}<td>{{this.subjectName}}</td>{{/unless}}{{/if}}
+                                        {{#unless ../data.isMultiStoreSingleChecklist}}<td>{{this.checklistName}}</td>{{/unless}}
                                         <td>{{this.lastSubmittedBy}}</td>
                                         <td>{{this.lastSubmissionDate}}</td>
-                                        <td>{{this.days}}</td>
+                                        <td>{{this.totalFlags}} (Question Flags: {{this.flagCount}}, Run AI Flags: {{this.runAICount}})</td>
                                     </tr>
                                     {{/each}}
                                 </tbody>

package/src/hbs/template.hbs

@@ -136,6 +136,10 @@
         .headertitle.submittedText {
             width:116px !important;
         }
+
+        .flagged {
+            color:red
+        }
     </style>
 </head>
 
@@ -197,21 +201,24 @@
             {{#each data.questionAnswers}}
             <div class="pdfcontent">
                 <div style="padding-bottom:20px;">
-                    <span class="sectionname">{{sectionName}} </span>&nbsp;<div class="horizondal-line">
-                        <hr />
-                    </div>
+                    <table style="width:100%;border-collapse:collapse;">
+                        <tr>
+                            <td class="sectionname" style="white-space:nowrap;padding-right:8px;width:1%;">{{sectionName}}</td>
+                            <td style="width:99%;"><hr class="horizondal-line" style="margin:0;border:none;border-top:1px solid #98A2B3;"/></td>
+                        </tr>
+                    </table>
                 </div>
                 {{#each questions}}
                 <div style="padding-bottom:20px">
                     {{#if userAnswer.length}}
                         <span class="question">{{qno}}.</span>&nbsp;<span class="question">{{qname}}</span>
                         {{#neq questionReferenceImage ''}}
-                            <div class="Reference"><span>Reference Image</span><br>
+                            <div class="Reference"><span>Question Reference Image</span><br>
                                 <img src="{{questionReferenceImage}}" width="200" height="180" />
                             </div>
                         {{/neq}}
                         {{#if multiQuestionReferenceImage.length}}
-                            <div class="Reference"><span>Reference Images</span><br>
+                            <div class="Reference"><span>Question Reference Image</span><br>
                                 {{#each multiQuestionReferenceImage}}
                                     <img src="{{this}}" width="200" height="180" />
                                 {{/each}}
@@ -221,7 +228,7 @@
                         <div class="px-4 answer">
                             {{#if (includes ../../../data.validateType ../answerType)}}
                                 {{#eq sopFlag true }}
-                                    <span id="agreed" style="color:red">{{answer}}</span><br>
+                                    <span id="agreed flagged">{{answer}}</span><br>
                                 {{/eq}}
                                 {{#eq sopFlag false }}
                                     <span id="agreed">{{answer}}</span><br>
@@ -252,7 +259,7 @@
                                                     <a href="{{validationAnswer}}" target="_blank" style="text-decoration: underline;color:#0085D2" id="agreed">{{validationAnswer}}</a><br>
                                                 {{/eq}}
                                                 {{#eq validationType 'Descriptive Answer'}}
-                                                    {{validationAnswer}}
+                                                    <span class="{{#if this.sopFlag}}flagged{{/if}}">Validation Answer: {{validationAnswer}}</span>
                                                 {{/eq}}
                                                 {{#eq validationType 'Capture Multiple Image with description'}}
                                                     <div class="Reference"><span>Uploaded Image</span><br>
@@ -274,15 +281,15 @@
                                 {{!-- {{#each ../answers}} --}}
                                     <table style="width:100%">
                                         <tr>
-                                            {{#neq referenceImage ''}}
+                                            {{#if multiReferenceImage.length}}
                                                 <td style="width:50%">
-                                                    {{#each multiReferenceImage}}
-                                                        <div class="Reference"><span>Reference Image</span><br>
+                                                    <div class="Reference"><span>Reference Image</span><br>
+                                                        {{#each multiReferenceImage}}
                                                             <img src="{{this}}" width="200" height="180" />
-                                                        </div>
-                                                    {{/each}}
+                                                        {{/each}}
+                                                    </div>
                                                 </td>
-                                            {{/neq}}
+                                            {{/if}}
                                             <td style="width:50%">
                                                 <div class="Reference"><span>Uploaded Image</span><br>
                                                     <img src="{{answer}}" width="200" height="180" />
@@ -296,15 +303,15 @@
                             {{!-- {{#each ../answers}} --}}
                             <table style="width:100%">
                                 <tr>
-                                    {{#neq referenceImage ''}}
+                                    {{#if multiReferenceImage.length}}
                                     <td style="width:50%">
-                                        {{#each multiReferenceImage}}
                                         <div class="Reference"><span>Reference Image</span><br>
+                                            {{#each multiReferenceImage}}
                                             <img src="{{this}}" width="200" height="180" />
+                                            {{/each}}
                                         </div>
-                                        {{/each}}
                                     </td>
-                                    {{/neq}}
+                                    {{/if}}
                                     <td style="width:50%">
                                         <div class="Reference"><span>Uploaded Image</span><br>
                                             <img src="{{answer}}" width="200" height="180" />
@@ -318,13 +325,15 @@
                             {{!-- {{#each ../answers}} --}}
                             <table style="width:100%">
                                 <tr>
-                                    {{#neq referenceImage ''}}
+                                    {{#if multiReferenceImage.length}}
                                     <td style="width:50%">
                                         <div class="Reference"><span>Reference Image</span><br>
-                                            <img src="{{referenceImage}}" width="200" height="180" />
+                                            {{#each multiReferenceImage}}
+                                                <img src="{{this}}" width="200" height="180" />
+                                            {{/each}}
                                         </div>
                                     </td>
-                                    {{/neq}}
+                                    {{/if}}
                                     {{#eq answerType 'image'}}
                                         <td style="width:50%">
                                             <div class="Reference"><span>Uploaded Image</span><br>
@@ -345,13 +354,15 @@
                             {{!-- {{#each ../answers}} --}}
                             <table style="width:100%">
                                 <tr>
-                                    {{#neq referenceImage ''}}
+                                    {{#if multiReferenceImage.length}}
                                     <td style="width:50%">
                                         <div class="Reference"><span>Reference Image</span><br>
-                                            <img src="{{referenceImage}}" width="200" height="180" />
+                                            {{#each multiReferenceImage}}
+                                                <img src="{{this}}" width="200" height="180" />
+                                            {{/each}}
                                         </div>
                                     </td>
-                                    {{/neq}}
+                                    {{/if}}
                                     <td style="width:50%">
                                         <div class="Reference"><span>Uploaded Image</span><br>
                                             <img src="{{answer}}" width="200" height="180" />

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}
@@ -181,16 +183,18 @@
 </div>
 {{#if this.questionReferenceImage}}
 <div class="q-answer-media">
-  <div class="q-answer-caption">Reference Image</div>
+  <div class="q-answer-caption">Question Reference Image</div>
   <img src="{{this.questionReferenceImage}}" alt="Reference Image" />
 </div>
 {{/if}}
 {{#if this.multiQuestionReferenceImage.length}}
 <div class="q-answer-media">
-  <div class="q-answer-caption">Reference Images</div>
-  {{#each this.multiQuestionReferenceImage}}
-  <img src="{{this}}" alt="Reference Image" />
-  {{/each}}
+  <div class="q-answer-caption">Question Reference Images</div>
+  <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>
@@ -230,13 +215,83 @@
     </div>
     {{/if}}
   {{/eq}}
+  {{#eq this.validationDisplayType 'text'}}
+    {{#if this.validationAnswer}}
+    <div class="q-answer-text {{#if this.sopFlag}}flagged{{/if}}">validation Answer: {{this.validationAnswer}}</div>
+    {{/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}}
 
-  <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>
+            {{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}}
+    </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>
-        <img src="{{this.answer}}" alt="Uploaded Image" />
+          {{#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.validation}}
@@ -245,18 +300,7 @@
           <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}}        
         {{#eq this.validationDisplayType 'multiImage'}}
           {{#if this.validationImage.length}}
           <div class="q-answer-caption">Validation Image</div>