tango-app-api-trax 3.9.1 → 3.9.3

package/package.json

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

package/src/controllers/gallery.controller.js

@@ -437,12 +437,14 @@ export async function redoChecklist( req, res ) {
     }
 
 
-    let checklistDetails = await processedChecklist.findOne( { _id: req.body.payload._id }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1, submitTime: 1, userName: 1, answerType: 1, coverage: 1, userEmail: 1 } );
+    let checklistDetails = await processedChecklist.findOne( { _id: req.body.payload._id }, { questionAnswers: 1, redoStatus: 1, checklistStatus: 1, client_id: 1, store_id: 1, storeName: 1, checkListType: 1, sourceCheckList_id: 1, checkListName: 1, submitTime: 1, userName: 1, answerType: 1, coverage: 1, userEmail: 1, scheduleEndTime_iso: 1, redoEdit: 1 } );
+
     if ( !checklistDetails ) {
       return res.sendError( 'No data found', 204 );
     }
     let question = checklistDetails.questionAnswers;
 
+    let checklistConfigDetails = await checklistService.findOne( { _id: checklistDetails.sourceCheckList_id }, { redoValidity: 1 } );
 
     let sectionIndex = question.findIndex( ( sec ) => sec.sectionName == req.body.payload.sectionName );
     if ( sectionIndex == -1 ) {
@@ -451,37 +453,97 @@ 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 data = { ...question[sectionIndex].questions[findQuestion], redo: true, ...( !req.body.payload?.answerIndex && { redoComment: req.body.payload?.checklistDescription || '' } ) };
+    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;
+            if ( Array.isArray( question?.[sectionIndex]?.questions?.[eleIndex]?.answers )?.length ) {
+              question[sectionIndex].questions[eleIndex].answers.forEach( ( ans ) => {
+                ans.validationAnswer = '';
+                delete ans.redoComment;
+                delete ans.redo;
+              } );
+            }
+            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.answers[matchedAnsIdx].redoComment = req.body.payload?.checklistDescription || '';
+          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 = [];
+      if ( Array.isArray( question[sectionIndex].questions[findQuestion].answers ) ) {
+        question[sectionIndex].questions[findQuestion].answers.forEach( ( ans ) => {
+          ans.validationAnswer = '';
+          delete ans.redoComment;
+          delete ans.redo;
+        } );
+      }
+      question[sectionIndex].questions[findQuestion].remarks = '';
+    }
     checklistDetails.questionAnswers = question;
     let updateData = {
-      checklistStatus: 'open',
+      checklistStatus: checklistDetails.checklistStatus != 'submit' ? checklistDetails.checklistStatus : 'open',
       redoStatus: true,
-      reinitiateStatus: true,
+      ...( !checklistConfigDetails?.redoValidity && { reinitiateStatus: true } ),
       questionAnswers: question,
       ...( checklistDetails.checklistStatus != 'submit' && checklistDetails.redoStatus ) ? { redoEdit: true } : {},
       ...( ( checklistDetails.redoEdit === undefined && checklistConfigDetails.redoValidity ) ) ? { scheduleEndTime_iso: dayjs( checklistDetails.scheduleEndTime_iso ).add( checklistConfigDetails.redoValidity, 'day' ).format() } :{},

package/src/routes/mobileTrax.routes.js

@@ -12,7 +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( '/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 )