tango-app-api-trax 3.9.2 → 3.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.9.2",
+    "version": "3.9.4",
     "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/controllers/mobileTrax.controller.js

@@ -118,7 +118,7 @@ export async function startChecklist( req, res ) {
         $and: [
           { _id: new ObjectId( requestData.processedcheckListId ) },
           { userId: req.user._id },
-          { date_string: requestData.date },
+          { $or: [ { date_string: requestData.date }, { redoStatus: true } ] },
         ],
       },
     } );
@@ -137,7 +137,9 @@ export async function startChecklist( req, res ) {
     let updateQuery = {};
     updateQuery._id = new ObjectId( requestData.processedcheckListId );
     updateQuery.userId = req.user._id;
-    updateQuery.date_string = requestData.date;
+    if ( getBeforeChecklist?.[0]?.date_string == dayjs().format( 'YYYY-MM-DD' ) ) {
+      updateQuery.date_string = requestData.date;
+    }
 
     if ( PCLQusestion && PCLQusestion?.questionAnswers && PCLQusestion?.questionAnswers.length > 0 ) {
       await PCLQusestion.questionAnswers.forEach( ( section ) => {
@@ -317,7 +319,7 @@ export async function startChecklist( req, res ) {
       return res.sendError( 'something went wrong please try again', 500 );
     }
   } catch ( e ) {
-    // console.log( 'e =>', e );
+    console.log( 'e =>', e );
     logger.error( { function: 'startChecklist', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
@@ -661,12 +663,12 @@ export async function sopMobilechecklistQuestionValidatorv1( req, res, next ) {
             let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
             if ( sectionQuestion.length ) {
               if ( requestData.submittype == 'submit' ) {
-                if ( ( [ 'multipleImage', 'multiplechoicemultiple' ].includes( question.answerType ) || ( question.answerType =='dropdown' && question.allowMultiple ) ) ) {
+                if ( ( [ 'multipleImage', 'multiplechoicemultiple', 'image/video' ].includes( question.answerType ) || ( question.answerType =='dropdown' && question.allowMultiple ) ) ) {
                   if ( ( !sectionQuestion[0].linkType || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled ) ) && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
                     validationCount++;
                   }
                 } else {
-                  if ( ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) && ( question.answerType =='dropdown' && !question.allowMultiple ) ) && ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) ) {
+                  if ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) {
                     validationCount++;
                   }
                 }
@@ -1819,7 +1821,6 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                     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 ) ) {
-                        console.log( qaans[k].redo, separatedArray[s].redo, qaans[k].redo == separatedArray[s].redo, 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 ) {
@@ -2723,6 +2724,9 @@ 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' );
+      if ( getchecklist?.[0]?.redoEdit != undefined ) {
+        updateData.redoEdit = false;
+      }
       if ( requestData.deviceDetails && requestData.deviceDetails != '' ) {
         updateData.deviceDetails =JSON.parse( requestData.deviceDetails );
       }
@@ -3503,6 +3507,9 @@ export async function dashboardv1( req, res ) {
     // const { store_id, date } = req.query;
     const { date } = req.query;
     const userId = req.user._id;
+    let fromDate = new Date( req.query.date );
+    let toDate = new Date( req.query.date );
+    toDate.setDate( toDate.getDate() + 1 );
 
     // //Get User Based Checklist //
     const clientId = { client_id: req.user.clientId };
@@ -3519,7 +3526,7 @@ export async function dashboardv1( req, res ) {
       ...storeMatch,
     };
     const buildPipeline = ( matchExtraConditions = {} ) => [
-      { $match: { ...baseMatch, ...matchExtraConditions } },
+      { $match: { $or: [ { ...baseMatch, ...matchExtraConditions }, { $and: [ { redoStatus: true }, { scheduleStartTime_iso: { $lt: toDate } }, { scheduleEndTime_iso: { $gte: fromDate } }, { userId }, { ...storeMatch } ] } ] } },
       {
         $facet: {
           total: [ { $count: 'total' } ],
@@ -3539,9 +3546,7 @@ export async function dashboardv1( req, res ) {
       },
     ];
 
-    let fromDate = new Date( req.query.date );
-    let toDate = new Date( req.query.date );
-    toDate.setDate( toDate.getDate() + 1 );
+
     const taskBaseMatch = {
       // eslint-disable-next-line camelcase
       // store_id,
@@ -3719,6 +3724,9 @@ export async function checklistv1( req, res ) {
     // const { store_id, date, checklistStatus, searchValue } = req.query;
     const { date, checklistStatus, searchValue } = req.query;
     const userId = req.user._id;
+    let fromDate = new Date( req.query.date );
+    let toDate = new Date( req.query.date );
+    toDate.setDate( toDate.getDate() + 1 );
 
     // Get User Based Checklist //
     const clientId = { client_id: req.user.clientId };
@@ -3730,7 +3738,7 @@ export async function checklistv1( req, res ) {
         // eslint-disable-next-line camelcase
         // { store_id },
         { userId },
-        { date_string: date },
+        { $or: [ { date_string: date }, { $and: [ { redoStatus: true }, { scheduleStartTime_iso: { $lt: toDate } }, { scheduleEndTime_iso: { $gte: fromDate } } ] } ] },
         { timeFlagStatus: true },
         ...matchExtraConditions,
         clientId,
@@ -3792,9 +3800,7 @@ export async function checklistv1( req, res ) {
       return pipeline;
     };
 
-    let fromDate = new Date( req.query.date );
-    let toDate = new Date( req.query.date );
-    toDate.setDate( toDate.getDate() + 1 );
+
     const taskBuildPipeline = ( matchExtraConditions = [], projectExtraConditions = {} ) => {
       const matchConditions = [
         // eslint-disable-next-line camelcase
@@ -4174,7 +4180,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;
             }