tango-app-api-trax 3.9.6 → 3.9.8

package/package.json

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

package/src/controllers/gallery.controller.js

@@ -546,7 +546,7 @@ export async function redoChecklist( req, res ) {
       ...( !checklistConfigDetails?.redoValidity && { reinitiateStatus: true } ),
       questionAnswers: question,
       ...( checklistDetails.checklistStatus == 'inprogress' && checklistDetails.redoStatus ) ? { redoEdit: true } : {},
-      ...( ( checklistDetails.redoEdit === undefined && checklistConfigDetails.redoValidity ) ) ? { scheduleEndTime_iso: dayjs( checklistDetails.scheduleEndTime_iso ).add( checklistConfigDetails.redoValidity, 'day' ).format() } :{},
+      ...( !checklistDetails.redoStatus && checklistConfigDetails.redoValidity ) ? { scheduleEndTime_iso: dayjs( checklistDetails.scheduleEndTime_iso ).add( checklistConfigDetails.redoValidity, 'day' ).format() } :{},
     };
 
     let response = await processedChecklist.updateOne( { _id: req.body.payload._id }, updateData );

package/src/controllers/mobileTrax.controller.js

@@ -660,7 +660,7 @@ export async function sopMobilechecklistQuestionValidatorv1( req, res, next ) {
           requestSection.forEach( ( item ) => item.section_id = section.section_id );
           section.questions.forEach( ( question ) => {
             // question.answers.forEach( ( answer ) => {
-            let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
+            let sectionQuestion = requestSection.filter( ( secQuestion ) => ( secQuestion.qname == question.oldQname || secQuestion.qname == question.qname ) && ( secQuestion.answerType == question.answerType ) );
             if ( sectionQuestion.length ) {
               if ( requestData.submittype == 'submit' ) {
                 if ( ( [ 'multipleImage', 'multiplechoicemultiple', 'image/video' ].includes( question.answerType ) || ( question.answerType =='dropdown' && question.allowMultiple ) ) ) {
@@ -1084,12 +1084,15 @@ export async function sopMobilechecklistMultiSectionFormatterv1( req, res, next
   try {
     let requestData = req.body;
     requestData.questionAnswers = typeof requestData.questionAnswers == 'string' ? JSON.parse( requestData.questionAnswers ) : requestData.questionAnswers;
-    let getChecklistQA = await processedchecklist.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 1 } );
+    let getChecklistQA = await processedchecklist.findOne( { _id: new ObjectId( requestData.processedcheckListId ) }, { questionAnswers: 1, redoEdit: 1 } );
     let reqAnswers = requestData.questionAnswers;
     logger.error( { functionName: 'updatedPayload', message: reqAnswers } );
     let CLQAnswers = getChecklistQA.questionAnswers;
 
     if ( requestData.submittype == 'submit' ) {
+      if ( getChecklistQA?.redoEdit ) {
+        requestData.submittype = 'draft';
+      }
       reqAnswers.forEach( ( reqA ) => {
         if ( ![ 'multiplechoicemultiple', 'multipleImage', 'image/video' ].includes( reqA?.answerType ) && ( reqA.answerType == 'dropDown' && !reqA.allowMultiple ) ) {
           if ( ( !reqA.linkType && ( reqA.answer == null || reqA.answer == '' ) ) || ( reqA.linkType && reqA.linkquestionenabled && ( reqA.answer == null || reqA.answer == '' ) ) ) {