tango-app-api-trax 3.2.0-beta.2 → 3.2.0-beta.4

package/package.json

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

package/src/controllers/mobileTrax.controller.js

@@ -453,10 +453,10 @@ export async function sopMobilechecklistQuestionValidator( req, res, next ) {
       return res.sendError( 'Check List Got Edited Please Fill Again', 422 );
     }
 
-    if ( getChecklistQA ) {
+    if ( getChecklistQA && requestData.submittype == 'submit' ) {
       let checkChecklistStatus = await checklistService.findOne( { _id: getChecklistQA.sourceCheckList_id }, { publish: 1 } );
       if ( !checkChecklistStatus.publish ) {
-        return res.sendError( 'Check List Got Edited Please Fill Again', 422 );
+        return res.sendError( 'Checklist got edited.please contact admin', 400 );
       }
     }
 
@@ -468,23 +468,34 @@ export async function sopMobilechecklistQuestionValidator( req, res, next ) {
       let reqAnswers = requestData.questionAnswers;
       let CLQAnswers = getChecklistQA.questionAnswers;
       let validationCount= 0;
+      let errorCount = 0;
       CLQAnswers.forEach( ( section ) => {
         let requestSection = reqAnswers.filter( ( reqSection ) => reqSection.section_id == section.section_id );
-        section.questions.forEach( ( question ) => {
-          question.answers.forEach( ( answer ) => {
-            let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qno == question.qno );
-            if ( question.answerType == 'multiplechoicemultiple' && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
-              validationCount++;
-            } else {
-              if ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) && ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) ) {
-                validationCount++;
+        if ( requestSection.length ) {
+          section.questions.forEach( ( question ) => {
+            question.answers.forEach( ( answer ) => {
+              let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qno == question.qno );
+              if ( sectionQuestion.length ) {
+                if ( question.answerType == 'multiplechoicemultiple' && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
+                  validationCount++;
+                } else {
+                  if ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) && ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) ) {
+                    validationCount++;
+                  }
+                }
+              } else {
+                errorCount++;
               }
-            }
+            } );
           } );
-        } );
+        } else {
+          errorCount++;
+        }
       } );
       if ( validationCount ) {
         return res.sendError( 'Please Fill all Required Fields', 400 );
+      } else if ( errorCount ) {
+        return res.sendError( 'Checklist got edited.please contact admin', 400 );
       } else {
         next();
       }
@@ -2434,6 +2445,15 @@ export async function uploadAnswerImage( req, res ) {
       return res.sensError( 'Invalid Request: Please include questionNo!', 400 );
     }
 
+    let getChecklistQA = await processedchecklist.findOne( { _id: input.checklistId }, { sourceCheckList_id: 1 } );
+
+    if ( getChecklistQA ) {
+      let checkChecklistStatus = await checklistService.findOne( { _id: getChecklistQA.sourceCheckList_id }, { publish: 1 } );
+      if ( !checkChecklistStatus.publish ) {
+        return res.sendError( 'Checklist got edited.please contact admin', 400 );
+      }
+    }
+
     let date = dayjs().format( 'YYYY-MM-DD' );
     let folder;
 

package/src/controllers/trax.controller.js

@@ -2045,6 +2045,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
             if ( getsubmitDetails[0].checkListDescription != getCLconfig.checkListDescription ) {
               getsubmitDetails[0].checkListDescription = getCLconfig.checkListDescription;
             }
+            let sectionList = [];
             for ( let [ index, section ] of questionList.entries() ) {
               let checkExists = getsubmitDetails[0].questionAnswers.findIndex( ( sec ) => sec.sectionName == section.sectionOldName );
               if ( checkExists != -1 ) {
@@ -2085,11 +2086,13 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
                   }
                 } );
                 getsubmitDetails[0].questionAnswers[index].questions = question;
+                sectionList.push( getsubmitDetails[0].questionAnswers[index].questions );
               } else {
                 modifiedCount++;
-                getsubmitDetails[0].questionAnswers.push( section );
+                sectionList.push( section );
               }
             }
+            getsubmitDetails[0].questionAnswers = sectionList;
             if ( modifiedCount ) {
               getsubmitDetails[0].checklistStatus = 'inprogress';
             }