tango-app-api-trax 3.9.5 → 3.9.7

package/package.json

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

package/src/controllers/gallery.controller.js

@@ -545,8 +545,8 @@ export async function redoChecklist( req, res ) {
       redoStatus: 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() } :{},
+      ...( checklistDetails.checklistStatus == 'inprogress' && checklistDetails.redoStatus ) ? { redoEdit: true } : {},
+      ...( !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 ) ) ) {
@@ -3316,7 +3316,7 @@ async function updateOpenSearch( user, data ) {
       $and: [
         { _id: new ObjectId( data.processedcheckListId ) },
         { userId: user._id },
-        { date_string: data.date },
+        { $or: [ { date_string: data.date }, { redoStatus: true } ] },
       ],
     },
   } ];