tango-app-api-trax 3.9.3 → 3.9.4

package/package.json

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

package/src/controllers/mobileTrax.controller.js

@@ -118,7 +118,7 @@ export async function startChecklist( req, res ) {
         $and: [
           { _id: new ObjectId( requestData.processedcheckListId ) },
           { userId: req.user._id },
-          { date_string: requestData.date },
+          { $or: [ { date_string: requestData.date }, { redoStatus: true } ] },
         ],
       },
     } );
@@ -137,7 +137,9 @@ export async function startChecklist( req, res ) {
     let updateQuery = {};
     updateQuery._id = new ObjectId( requestData.processedcheckListId );
     updateQuery.userId = req.user._id;
-    updateQuery.date_string = requestData.date;
+    if ( getBeforeChecklist?.[0]?.date_string == dayjs().format( 'YYYY-MM-DD' ) ) {
+      updateQuery.date_string = requestData.date;
+    }
 
     if ( PCLQusestion && PCLQusestion?.questionAnswers && PCLQusestion?.questionAnswers.length > 0 ) {
       await PCLQusestion.questionAnswers.forEach( ( section ) => {
@@ -317,7 +319,7 @@ export async function startChecklist( req, res ) {
       return res.sendError( 'something went wrong please try again', 500 );
     }
   } catch ( e ) {
-    // console.log( 'e =>', e );
+    console.log( 'e =>', e );
     logger.error( { function: 'startChecklist', error: e, body: req.body } );
     return res.sendError( e, 500 );
   }
@@ -661,12 +663,12 @@ export async function sopMobilechecklistQuestionValidatorv1( req, res, next ) {
             let sectionQuestion = requestSection.filter( ( secQuestion ) => secQuestion.qname == question.oldQname || secQuestion.qname == question.qname );
             if ( sectionQuestion.length ) {
               if ( requestData.submittype == 'submit' ) {
-                if ( ( [ 'multipleImage', 'multiplechoicemultiple' ].includes( question.answerType ) || ( question.answerType =='dropdown' && question.allowMultiple ) ) ) {
+                if ( ( [ 'multipleImage', 'multiplechoicemultiple', 'image/video' ].includes( question.answerType ) || ( question.answerType =='dropdown' && question.allowMultiple ) ) ) {
                   if ( ( !sectionQuestion[0].linkType || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled ) ) && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
                     validationCount++;
                   }
                 } else {
-                  if ( ( ![ 'multiplechoicemultiple', 'multipleImage' ].includes( question.answerType ) && ( question.answerType =='dropdown' && !question.allowMultiple ) ) && ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) ) {
+                  if ( ( !sectionQuestion[0].linkType && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) || ( sectionQuestion[0].linkType && sectionQuestion[0].linkquestionenabled && ( sectionQuestion[0].answer == null || sectionQuestion[0].answer == '' ) ) ) {
                     validationCount++;
                   }
                 }
@@ -1819,7 +1821,6 @@ export async function sopMobilechecklistMultiSectionFormatterv2( req, res, next
                     let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
                     for ( let s = 0; s < separatedArray.length; s++ ) {
                       if ( ( separatedArray[s].answer == qaans[k].answer ) ) {
-                        console.log( qaans[k].redo, separatedArray[s].redo, qaans[k].redo == separatedArray[s].redo, qaans[k].answer );
                         if ( ( getChecklistQA?.redoEdit && qaans[k].redo == separatedArray[s].redo ) || !getChecklistQA?.redoEdit ) {
                           if ( qaans[k].validationType == 'Capture Image' || qaans[k].validationType == 'Capture Video' ) {
                             if ( separatedArray[s].validationAnswer ) {
@@ -2723,6 +2724,9 @@ export async function submitChecklist( req, res ) {
       let flagCount = QuestionFlag( req, res );
       updateData.questionFlag = flagCount;
       updateData.submitTime_string = currentDateTime.format( 'hh:mm A, DD MMM YYYY' );
+      if ( getchecklist?.[0]?.redoEdit != undefined ) {
+        updateData.redoEdit = false;
+      }
       if ( requestData.deviceDetails && requestData.deviceDetails != '' ) {
         updateData.deviceDetails =JSON.parse( requestData.deviceDetails );
       }
@@ -3503,6 +3507,9 @@ export async function dashboardv1( req, res ) {
     // const { store_id, date } = req.query;
     const { date } = req.query;
     const userId = req.user._id;
+    let fromDate = new Date( req.query.date );
+    let toDate = new Date( req.query.date );
+    toDate.setDate( toDate.getDate() + 1 );
 
     // //Get User Based Checklist //
     const clientId = { client_id: req.user.clientId };
@@ -3519,7 +3526,7 @@ export async function dashboardv1( req, res ) {
       ...storeMatch,
     };
     const buildPipeline = ( matchExtraConditions = {} ) => [
-      { $match: { ...baseMatch, ...matchExtraConditions } },
+      { $match: { $or: [ { ...baseMatch, ...matchExtraConditions }, { $and: [ { redoStatus: true }, { scheduleStartTime_iso: { $lt: toDate } }, { scheduleEndTime_iso: { $gte: fromDate } }, { userId }, { ...storeMatch } ] } ] } },
       {
         $facet: {
           total: [ { $count: 'total' } ],
@@ -3539,9 +3546,7 @@ export async function dashboardv1( req, res ) {
       },
     ];
 
-    let fromDate = new Date( req.query.date );
-    let toDate = new Date( req.query.date );
-    toDate.setDate( toDate.getDate() + 1 );
+
     const taskBaseMatch = {
       // eslint-disable-next-line camelcase
       // store_id,
@@ -3719,6 +3724,9 @@ export async function checklistv1( req, res ) {
     // const { store_id, date, checklistStatus, searchValue } = req.query;
     const { date, checklistStatus, searchValue } = req.query;
     const userId = req.user._id;
+    let fromDate = new Date( req.query.date );
+    let toDate = new Date( req.query.date );
+    toDate.setDate( toDate.getDate() + 1 );
 
     // Get User Based Checklist //
     const clientId = { client_id: req.user.clientId };
@@ -3730,7 +3738,7 @@ export async function checklistv1( req, res ) {
         // eslint-disable-next-line camelcase
         // { store_id },
         { userId },
-        { date_string: date },
+        { $or: [ { date_string: date }, { $and: [ { redoStatus: true }, { scheduleStartTime_iso: { $lt: toDate } }, { scheduleEndTime_iso: { $gte: fromDate } } ] } ] },
         { timeFlagStatus: true },
         ...matchExtraConditions,
         clientId,
@@ -3792,9 +3800,7 @@ export async function checklistv1( req, res ) {
       return pipeline;
     };
 
-    let fromDate = new Date( req.query.date );
-    let toDate = new Date( req.query.date );
-    toDate.setDate( toDate.getDate() + 1 );
+
     const taskBuildPipeline = ( matchExtraConditions = [], projectExtraConditions = {} ) => {
       const matchConditions = [
         // eslint-disable-next-line camelcase
@@ -4174,7 +4180,7 @@ export async function questionList( req, res ) {
                   checkvalidation = answer.validationAnswer;
                 }
               }
-              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation } );
+              Multianswer.push( { 'answer': answer.answer, 'no': ansIndex, 'validationAnswer': checkvalidation, ...( answer.redo && { redo: answer.redo } ) } );
               getchecklist[0].questionAnswers[secIndex].questions[questionIndex].answers[ansIndex].index = ansIndex;
             }