tango-app-api-trax 3.3.1-beta-66 → 3.3.1-beta-68

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-66",
+    "version": "3.3.1-beta-68",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/gallery.controller.js

@@ -362,14 +362,14 @@ export async function redoChecklist( req, res ) {
       return res.sendError( 'section is not found', 400 );
     }
 
-    let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele?.parentQuestion ? ele.qno == req.body.payload.qno && ele.parentQuestion == req.body.payload.parentQuestion : ele.qno == req.body.payload.qno );
+    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?.parentQuestion ? qn.qno == parseInt( ele ) && qn?.parentQuestion == req.body.payload?.parentQuestion : qn.qno == parseInt( 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 = [];

package/src/controllers/mobileTrax.controller.js

@@ -234,45 +234,18 @@ export async function startChecklist( req, res ) {
       await checklistLogs.create( logInsertData );
       let getchecklist = getupdatedchecklist;
       let questions = [];
-      for ( let [ index, data ] of getchecklist.entries() ) {
-        for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
-          questions = [];
-          for ( let question of section.questions ) {
-            if ( !question.linkType ) {
-              question.parentQuestion = question.qno;
-              questions.push( question );
-              let linkedAnswer = new Set( question.answers.filter( ( ele ) => ele.showLinked ).flatMap( ( ele ) => ele.nestedQuestion ) );
-              let linkedQuestion = section.questions.filter( ( qn ) => qn?.parentQuestion ? qn?.parentQuestion == question.qno && linkedAnswer.has( qn.qno ) : linkedAnswer.has( qn.qno ) );
-              linkedQuestion = JSON.parse( JSON.stringify( linkedQuestion ) );
-              linkedQuestion.forEach( ( linkQn ) => {
-                linkQn.parentQuestion = question.qno;
-              } );
-              questions.push( ...linkedQuestion );
-            }
-          }
-          getchecklist[index].questionAnswers[secIndex].questions = questions;
-        }
-      }
-      function processQuestion( question, section, questions, nested = false ) {
-        let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno && item.parentQuestion == question.parentQuestion );
+      function processQuestion( question, section, questions, nested=false ) {
+        let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
         if ( findExists && nested ) {
-          let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno && item.parentQuestion == question.parentQuestion );
+          let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno );
           questions.splice( findIndex, 1 );
           questions.push( question );
-          for ( let answer of question.answers ) {
-            if ( answer.showLinked && answer?.linkedQuestion != '' ) {
-              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion && item.parentQuestion == question.parentQuestion );
-              if ( linkedQuestion ) {
-                processQuestion( linkedQuestion, section, questions, true );
-              }
-            }
-          }
         }
         if ( !findExists ) {
           questions.push( question );
           for ( let answer of question.answers ) {
             if ( answer.showLinked && answer?.linkedQuestion != '' ) {
-              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion && item.parentQuestion == question.parentQuestion );
+              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
               if ( linkedQuestion ) {
                 processQuestion( linkedQuestion, section, questions, true );
               }
@@ -2669,34 +2642,15 @@ export async function questionList( req, res ) {
       }
 
       let questions = [];
-      for ( let [ index, data ] of getchecklist.entries() ) {
-        for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
-          questions = [];
-          for ( let question of section.questions ) {
-            if ( !question.linkType ) {
-              question.parentQuestion = question.qno;
-              questions.push( question );
-              let linkedAnswer = new Set( question.answers.filter( ( ele ) => ele.showLinked ).flatMap( ( ele ) => ele.nestedQuestion ) );
-              let linkedQuestion = section.questions.filter( ( qn ) => qn?.parentQuestion ? qn?.parentQuestion == question.qno && linkedAnswer.has( qn.qno ) : linkedAnswer.has( qn.qno ) );
-              linkedQuestion = JSON.parse( JSON.stringify( linkedQuestion ) );
-              linkedQuestion.forEach( ( linkQn ) => {
-                linkQn.parentQuestion = question.qno;
-              } );
-              questions.push( ...linkedQuestion );
-            }
-          }
-          getchecklist[index].questionAnswers[secIndex].questions = questions;
-        }
-      }
-      function processQuestion( question, section, questions, nested = false ) {
-        let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno && item.parentQuestion == question.parentQuestion );
+      function processQuestion( question, section, questions, nested=false ) {
+        let findExists = questions.find( ( item ) => item?.qno && item.qno == question.qno );
         if ( findExists && nested ) {
-          let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno && item.parentQuestion == question.parentQuestion );
+          let findIndex = questions.findIndex( ( item ) => item?.qno && item.qno == question.qno );
           questions.splice( findIndex, 1 );
           questions.push( question );
           for ( let answer of question.answers ) {
             if ( answer.showLinked && answer?.linkedQuestion != '' ) {
-              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion && item.parentQuestion == question.parentQuestion );
+              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
               if ( linkedQuestion ) {
                 processQuestion( linkedQuestion, section, questions, true );
               }
@@ -2707,7 +2661,7 @@ export async function questionList( req, res ) {
           questions.push( question );
           for ( let answer of question.answers ) {
             if ( answer.showLinked && answer?.linkedQuestion != '' ) {
-              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion && item.parentQuestion == question.parentQuestion );
+              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
               if ( linkedQuestion ) {
                 processQuestion( linkedQuestion, section, questions, true );
               }

package/src/controllers/trax.controller.js

@@ -3240,6 +3240,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         element4.approvalEnable = getCLconfig.approver.length ? true : false;
         element4.remainder = getCLconfig?.remainder || [];
         element4.restrictAttendance = getCLconfig?.restrictAttendance;
+        element4.coverage = getCLconfig?.coverage;
         assignUserList.push( { ...element4 } );
       }
     } ) );
@@ -3691,7 +3692,7 @@ export async function checklistAssign( req, res ) {
         clientId: req.body.clientId,
       };
       let uploadData = await assignUsers( assignedData );
-      if ( uploadData.length ) {
+      if ( uploadData?.length ) {
         uniqueArr.push( ...uploadData );
       }
     } ) );

package/src/controllers/traxDashboard.controllers.js

@@ -1283,7 +1283,7 @@ export const checklistInfo = async ( req, res ) => {
         userName: 1,
         userEmail: '$_id.email',
         checklistStatus: 1,
-        submitTime_string: { $arrayElemAt: [ '$submitTime_string', -1 ] },
+        submitTime_string: { $arrayElemAt: [ '$submitTime_string', 0 ] },
         storeName: 1,
         checkListType: 1,
         scheduleRepeatedType: 1,
@@ -1380,6 +1380,10 @@ export const checklistInfo = async ( req, res ) => {
       totalCount: getChecklistPerformanceData?.[0]?.count?.[0]?.total || 0,
       checklistInfo: getChecklistPerformanceData?.[0]?.data || [],
     };
+
+    result.checklistInfo.forEach( ( item ) => {
+      item.date_string = dayjs( item.date_string, 'YYYY-MM-DD' ).format( 'DD MMM YYYY' );
+    } );
     if ( requestData.export ) {
       const exportdata = [];
       result.checklistInfo.forEach( ( element ) => {