tango-app-api-trax 3.8.28 → 3.8.30

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.8.28",
+    "version": "3.8.30",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -29,7 +29,7 @@
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
         "puppeteer": "^24.39.1",
-        "tango-api-schema": "^2.5.88",
+        "tango-api-schema": "^2.5.92",
         "tango-app-api-middleware": "^3.5.2",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/gallery.controller.js

@@ -451,37 +451,83 @@ export async function redoChecklist( req, res ) {
     let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.payload.qno );
 
     let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
-    // if ( checklistDetails.client_id == '458' ) {
-    data.answers.forEach( ( item ) => {
-      if ( item.showLinked ) {
-        item.nestedQuestion.forEach( ( ele ) => {
-          let eleIndex = question[sectionIndex].questions.findIndex( ( qn ) => qn.qno == parseInt( ele ) );
-          let element = { ...question[sectionIndex].questions[eleIndex], redo: true, redoComment: '', linkquestionenabled: false };
-          question[sectionIndex].questions[eleIndex] = element;
-          question[sectionIndex].questions[eleIndex].userAnswer = [];
-          question[sectionIndex].questions[eleIndex].remarks = '';
+    let answerIndex = req.body.payload?.answerIndex;
+    let isSingleAnswerRedo = answerIndex != null;
+
+    if ( !isSingleAnswerRedo ) {
+      // if ( checklistDetails.client_id == '458' ) {
+      data.answers.forEach( ( item ) => {
+        if ( item.showLinked ) {
+          item.nestedQuestion.forEach( ( ele ) => {
+            let eleIndex = question[sectionIndex].questions.findIndex( ( qn ) => qn.qno == parseInt( ele ) );
+            let element = { ...question[sectionIndex].questions[eleIndex], redo: true, redoComment: '', linkquestionenabled: false };
+            question[sectionIndex].questions[eleIndex] = element;
+            question[sectionIndex].questions[eleIndex].userAnswer = [];
+            question[sectionIndex].questions[eleIndex].remarks = '';
+          } );
+        }
+      } );
+      // data.answers.forEach( ( item ) => {
+      //   if ( item.showLinked ) {
+      //     item.nestedQuestion = [];
+      //     item.showLinked = false;
+      //     item.linkedQuestion = 0;
+      //   }
+      // } );
+      // }
+    }
+    let userAnswer = Array.isArray( data.userAnswer ) ? [ ...data.userAnswer ] : [];
+
+    question[sectionIndex].questions[findQuestion] = data;
+    if ( isSingleAnswerRedo ) {
+      let targetQuestion = question[sectionIndex].questions[findQuestion];
+      let targetUserAnswerIndex = targetQuestion.userAnswer?.findIndex( ( ele ) => ele.answer == req.body.payload.answerName );
+      let targetUserAnswer = targetQuestion.userAnswer[targetUserAnswerIndex];
+      if ( targetUserAnswer && Array.isArray( targetQuestion.answers ) ) {
+        let matchedAnsIdx = targetQuestion.answers.findIndex( ( ans ) => {
+          // if ( targetUserAnswer.no !== undefined && ans.index === targetUserAnswer.no ) return true;
+          // if ( targetUserAnswer.index !== undefined && ans.index === targetUserAnswer.index ) return true;
+          // if ( targetUserAnswer.answeroptionNumber !== undefined && ans.answeroptionNumber === targetUserAnswer.answeroptionNumber ) return true;
+          return ans.answer === targetUserAnswer.answer;
         } );
+        if ( matchedAnsIdx !== -1 ) {
+          targetQuestion.answers[matchedAnsIdx].redo = true;
+          targetQuestion.answers[matchedAnsIdx].validationAnswer = '';
+          targetQuestion.remarks = '';
+        }
+        targetQuestion.userAnswer.splice( targetUserAnswerIndex, 1 );
       }
-    } );
-    // data.answers.forEach( ( item ) => {
-    //   if ( item.showLinked ) {
-    //     item.nestedQuestion = [];
-    //     item.showLinked = false;
-    //     item.linkedQuestion = 0;
-    //   }
-    // } );
-    // }
-    let userAnswer = data.userAnswer;
 
-    question[sectionIndex].questions[findQuestion] = data;
-    question[sectionIndex].questions[findQuestion].userAnswer = [];
-    question[sectionIndex].questions[findQuestion].remarks = '';
+      let currentQno = req.body.payload.qno;
+      let parentQIndex = -1;
+      // let parentAnsIndex = -1;
+      for ( let i = 0; i < question[sectionIndex].questions.length; i++ ) {
+        let parentAnswers = question[sectionIndex].questions[i].answers || [];
+        let foundAnsIdx = parentAnswers.findIndex( ( ans ) => Array.isArray( ans?.nestedQuestion ) && ans.nestedQuestion.some( ( ele ) => parseInt( ele ) == currentQno ) );
+        if ( foundAnsIdx !== -1 ) {
+          parentQIndex = i;
+          // parentAnsIndex = foundAnsIdx;
+          break;
+        }
+      }
+      if ( parentQIndex !== -1 ) {
+        let parentQno = question[sectionIndex].questions[parentQIndex].qno;
+        question[sectionIndex].questions[findQuestion].parentQno = parentQno;
+        // question[sectionIndex].questions[findQuestion].remarks = '';
+        // question[sectionIndex].questions[parentQIndex].answers[parentAnsIndex].redo = true;
+        // question[sectionIndex].questions[parentQIndex].answers[parentAnsIndex].validationAnswer = '';
+      }
+    } else {
+      question[sectionIndex].questions[findQuestion].userAnswer = [];
+      question[sectionIndex].questions[findQuestion].remarks = '';
+    }
     checklistDetails.questionAnswers = question;
     let updateData = {
-      checklistStatus: 'open',
+      checklistStatus: checklistDetails.checklistStatus != 'submit' ? checklistDetails.checklistStatus : 'open',
       redoStatus: true,
       reinitiateStatus: true,
       questionAnswers: question,
+      ...( checklistDetails.checklistStatus != 'submit' && checklistDetails.redoStatus ) ? { redoEdit: true } : {},
     };
 
     let response = await processedChecklist.updateOne( { _id: req.body.payload._id }, updateData );

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

@@ -1082,12 +1082,15 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
   try {
     let requestData = req.body;
     requestData.questionAnswers = typeof requestData.questionAnswers == 'string' ? JSON.parse( requestData.questionAnswers ) : requestData.questionAnswers;
-    let getChecklistQA = await processedchecklist.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 1 } );
+    let getChecklistQA = await processedchecklist.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 1, redoEdit: 1 } );
     let reqAnswers = requestData.questionAnswers;
     logger.error( { functionName: 'updatedPayload', message: reqAnswers } );
     let CLQAnswers = getChecklistQA.questionAnswers;
 
     if ( requestData.submittype == 'submit' ) {
+      if ( getChecklistQA?.redoEdit ) {
+        requestData.submittype = 'draft';
+      }
       reqAnswers.forEach( ( reqA ) => {
         if ( ![ 'multiplechoicemultiple', 'multipleImage', 'image/video' ].includes( reqA?.answerType ) && ( reqA.answerType == 'dropDown' && !reqA.allowMultiple ) ) {
           if ( ( !reqA.linkType && ( reqA.answer == null || reqA.answer == '' ) ) || ( reqA.linkType && reqA.linkquestionenabled && ( reqA.answer == null || reqA.answer == '' ) ) ) {
@@ -1307,27 +1310,35 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
                 for ( let k = 0; k < qaans.length; k++ ) {
                   let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
                   for ( let s = 0; s < separatedArray.length; s++ ) {
-                    if ( separatedArray[s].answer == qaans[k].answer ) {
-                      if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
-                        if ( separatedArray[s].validationAnswer ) {
-                          let validationAnswer = decodeURIComponent( separatedArray[s].validationAnswer.split( '?' )[0] );
-                          if ( validationAnswer.length ) {
-                            let splitImgUrl = validationAnswer.split( '/' );
-                            if ( splitImgUrl.length > 1 ) {
-                              splitImgUrl.splice( 0, 3 );
-                              qaans[k].validationAnswer = splitImgUrl.join( '/' ) || '';
+                    if ( ( separatedArray[s].answer == qaans[k].answer ) ) {
+                      if ( ( getChecklistQA?.redoEdit && qaans[k].redo == separatedArray[s].redo ) || !getChecklistQA?.redoEdit ) {
+                        if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
+                          if ( separatedArray[s].validationAnswer ) {
+                            let validationAnswer = decodeURIComponent( separatedArray[s].validationAnswer.split( '?' )[0] );
+                            if ( validationAnswer.length ) {
+                              let splitImgUrl = validationAnswer.split( '/' );
+                              if ( splitImgUrl.length > 1 ) {
+                                splitImgUrl.splice( 0, 3 );
+                                qaans[k].validationAnswer = splitImgUrl.join( '/' ) || '';
+                              }
                             }
                           }
-                        }
-                      } else {
+                        } else {
                         // qaans[k].descriptivetype = qaAnswers[j].descriptivetype || '';
-                        qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
+                          qaans[k].validationAnswer = separatedArray[s].validationAnswer || '';
+                        }
                       }
 
                       mcmo.push( qaans[k] );
                     }
                   }
                 }
+                qaAnswers[j].answers.forEach( ( ele ) => {
+                  if ( typeof ele?.redo === 'boolean' && requestData.submittype === 'submit' ) {
+                    ele.redo = false;
+                  }
+                } );
+
                 let structure = {};
                 structure.qno = qaAnswers[j].qno;
                 structure.uniqueqno = qaAnswers[j].uniqueqno;
@@ -2113,8 +2124,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 } );
@@ -2168,6 +2183,7 @@ export async function submitChecklist( req, res ) {
       let flagCount = QuestionFlag( req, res );
       updateData.questionFlag = flagCount;
       updateData.submitTime_string = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+      updateData.redoEdit = false;
       if ( requestData.deviceDetails && requestData.deviceDetails != '' ) {
         updateData.deviceDetails =JSON.parse( requestData.deviceDetails );
       }
@@ -2440,7 +2456,8 @@ export async function submitTask( req, res ) {
             'storeResponseTime': currentDateTime.format( 'HH:mm:ss - MMM DD, YYYY' ),
             'message_mode': 'retriggered',
           };
-          sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).storeHygiene}`, JSON.stringify( sqsData ) );
+          let sqsResponse = await sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).storeHygiene}`, JSON.stringify( sqsData ) );
+          console.log( sqsResponse );
         }
         if ( !excludedChecklists.includes( checklist.checkListName ) ) {
           const query1 = [
@@ -3616,7 +3633,7 @@ export async function questionList( req, res ) {
                   checkvalidation = answer.validationAnswer;
                 }
               }
-              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
+              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation, ...( answer.redo && { redo: answer.redo } ) } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
             }
 

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>