tango-app-api-trax 3.8.26 → 3.8.27-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

@@ -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>

package/src/routes/mobileTrax.routes.js

@@ -12,6 +12,7 @@ mobileRouter
     .post( '/startTask', isAllowedSessionHandler, validate( startValidation ), mobileController.startTask )
     .post( '/submitCheckList', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidator, mobileController.sopMobilechecklistMultiSectionFormatter, mobileController.submitChecklist )
     .post( '/submitCheckListv5', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidatorv1, mobileController.sopMobilechecklistMultiSectionFormatterv1, mobileController.submitChecklist )
+    .post( '/submitCheckListv6', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidatorv1, mobileController.sopMobilechecklistMultiSectionFormatterv2, mobileController.submitChecklist )
     .post( '/submitTask', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobileTaskQuestionValidator, mobileController.sopMobileTaskMultiSectionFormatter, mobileController.submitTask )
     .post( '/submiteyeTestTask', isAllowedSessionHandler, mobileController.submiteyeTestTask )
     .get( '/dashboard', isAllowedSessionHandler, validate( dashboardValidation ), mobileController.dashboard )

package/src/utils/visitChecklistPdf.utils.js

@@ -444,7 +444,7 @@ export function buildVisitChecklistTemplateDataFromProcessed( processedDoc, bran
 
   const checklistName = doc.checkListName || 'Visit Checklist';
 
-  const refFromId = doc._id && String( doc._id ).length > 8 ? String( doc._id ).slice( -8 ).toUpperCase() : ( doc._id ? String( doc._id ) : '--' );
+  // const refFromId = doc._id && String( doc._id ).length > 8 ? String( doc._id ).slice( -8 ).toUpperCase() : ( doc._id ? String( doc._id ) : '--' );
 
   const { titleLine1, titleLine2 } = splitCoverTitle( checklistName );