tango-app-api-trax 3.8.28 → 3.8.29

package/package.json

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

package/src/controllers/internalTrax.controller.js

@@ -4533,8 +4533,8 @@ export async function recurringFlagAlert( req, res ) {
           } );
         }
         const g = groupMap.get( k );
-        g.questionCount += 1;
-        g.runAICount += ( i.runAICount || 0 );
+        if ( i.sopFired ) g.questionCount += 1;
+        if ( i.runAIFired ) g.runAICount += 1;
         if ( parseSubmissionDate( i.lastSubmissionDate ) > parseSubmissionDate( g.lastSubmissionDate ) ) {
           g.lastSubmissionDate = i.lastSubmissionDate;
           g.lastSubmittedBy = i.lastSubmittedBy;
@@ -4573,6 +4573,7 @@ export async function recurringFlagAlert( req, res ) {
         isMultiStore,
         isMultiChecklist,
         isMultiStoreSingleChecklist,
+        isUserCoverage: isAllUser,
         showTable: isMultiStore || isMultiChecklist,
         hasAttachment,
         domain: flagDomain,
@@ -4699,7 +4700,7 @@ function computeWow( current, previous ) {
 
 async function aggregateWeeklyFlagsByStore( weekStart, weekEnd ) {
   const rows = await processedchecklist.aggregate( [
-    { $match: { date_string: { $gte: weekStart, $lte: weekEnd }, isdeleted: { $ne: true } } },
+    { $match: { date_string: { $gte: weekStart, $lte: weekEnd }, checkListType: 'custom' } },
     { $group: {
       _id: { client_id: '$client_id', store_id: '$store_id' },
       storeName: { $last: '$storeName' },
@@ -4982,7 +4983,7 @@ export async function weeklyWrapAlert( req, res ) {
         // resolveUserAssignedStores — superadmin / tango users see everything, regular admins see only
         // stores they own (assignedStores + clusters they lead + teams they're in/lead).
         const adminUsers = await userService.find(
-            { clientId: String( clientId ), email: { $in: [ 'gopisjkg@gmail.com', 'sh9628hs@gmail.com' ] }, role: { $in: [ 'admin', 'superadmin' ] } },
+            { clientId: String( clientId ), role: { $in: [ 'admin', 'superadmin' ] } },
             { email: 1, assignedStores: 1, userName: 1, userType: 1, role: 1, clientId: 1 },
         );
         console.log( adminUsers );

package/src/controllers/mobileTrax.controller.js

@@ -2113,8 +2113,12 @@ async function updateRecurringFlagTracker( processedChecklist, questionAnswers,
       } );
     } );
     if ( ops.length ) {
-      let data = await recurringFlagTracker.bulkWrite( ops );
-      console.log( data );
+      try {
+        let data = await recurringFlagTracker.bulkWrite( ops, { ordered: false } );
+        console.log( 'recurringFlagTracker bulkWrite result', data );
+      } catch ( bulkErr ) {
+        logger.error( { function: 'updateRecurringFlagTracker.bulkWrite', code: bulkErr?.code, message: bulkErr?.message, writeErrors: bulkErr?.writeErrors } );
+      }
     }
   } catch ( error ) {
     logger.error( { function: 'updateRecurringFlagTracker', error } );

package/src/hbs/recurringFlag.hbs

@@ -162,7 +162,7 @@
                             <table class="rfTable">
                                 <thead>
                                     <tr>
-                                        {{#if data.isMultiStore}}<th>{{data.subjectLabel}} Name</th>{{/if}}
+                                        {{#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>
@@ -172,7 +172,7 @@
                                 <tbody>
                                     {{#each data.rows}}
                                     <tr>
-                                        {{#if ../data.isMultiStore}}<td>{{this.subjectName}}</td>{{/if}}
+                                        {{#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>

package/src/hbs/template.hbs

@@ -136,6 +136,10 @@
         .headertitle.submittedText {
             width:116px !important;
         }
+
+        .flagged {
+            color:red
+        }
     </style>
 </head>
 
@@ -224,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>
@@ -255,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>

package/src/hbs/visit-checklist.hbs

@@ -215,6 +215,17 @@
     </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;table-layout:fixed"><tr>
     <td style="width:50%;vertical-align:top;padding-right:8px">
@@ -233,16 +244,54 @@
               <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}}
@@ -251,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>