tango-app-api-trax 3.3.1-beta-38 → 3.3.1-beta-39

package/package.json

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

package/src/controllers/mobileTrax.controller.js

@@ -269,6 +269,37 @@ export async function startChecklist( req, res ) {
           getchecklist[index].questionAnswers[secIndex].questions = questions;
         }
       }
+
+      let orderedQuestions = [];
+
+      function processQuestion( question, section, questions, nested=false ) {
+        let findExists = orderedQuestions.find( ( item ) => item?.qno && item.qno == question.qno );
+        if ( findExists && nested && question.parentQuestion == findExists.parentQuestion ) {
+          let findIndex = orderedQuestions.findIndex( ( item ) => item?.qno && item.qno == question.qno );
+          orderedQuestions.splice( findIndex, 1 );
+          orderedQuestions.push( question );
+        }
+        if ( !findExists ) {
+          orderedQuestions.push( question );
+          for ( let answer of question.answers ) {
+            if ( answer.showLinked && answer?.linkedQuestion != '' ) {
+              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
+              if ( linkedQuestion ) {
+                processQuestion( linkedQuestion, section, questions, true );
+              }
+            }
+          }
+        }
+      }
+      for ( let [ index, data ] of getchecklist.entries() ) {
+        for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
+          orderedQuestions = [];
+          for ( let question of section.questions ) {
+            processQuestion( question, section, questions );
+          }
+          getchecklist[index].questionAnswers[secIndex].questions = orderedQuestions;
+        }
+      }
       return res.sendSuccess( getchecklist );
     } else {
       return res.sendError( 'something went wrong please try again', 500 );
@@ -2681,6 +2712,37 @@ export async function questionList( req, res ) {
         }
       }
 
+      let orderedQuestions = [];
+
+      function processQuestion( question, section, questions, nested=false ) {
+        let findExists = orderedQuestions.find( ( item ) => item?.qno && item.qno == question.qno );
+        if ( findExists && nested && question.parentQuestion == findExists.parentQuestion ) {
+          let findIndex = orderedQuestions.findIndex( ( item ) => item?.qno && item.qno == question.qno );
+          orderedQuestions.splice( findIndex, 1 );
+          orderedQuestions.push( question );
+        }
+        if ( !findExists ) {
+          orderedQuestions.push( question );
+          for ( let answer of question.answers ) {
+            if ( answer.showLinked && answer?.linkedQuestion != '' ) {
+              let linkedQuestion = section.questions.find( ( item ) => item.qno == answer.linkedQuestion );
+              if ( linkedQuestion ) {
+                processQuestion( linkedQuestion, section, questions, true );
+              }
+            }
+          }
+        }
+      }
+      for ( let [ index, data ] of getchecklist.entries() ) {
+        for ( let [ secIndex, section ] of data.questionAnswers.entries() ) {
+          orderedQuestions = [];
+          for ( let question of section.questions ) {
+            processQuestion( question, section, questions );
+          }
+          getchecklist[index].questionAnswers[secIndex].questions = orderedQuestions;
+        }
+      }
+
       return res.sendSuccess( getchecklist );
     }
   } catch ( e ) {