tango-app-api-trax 3.6.0-sec-8 → 3.6.0-sec-10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.6.0-sec-8",
+    "version": "3.6.0-sec-10",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/internalTrax.controller.js

@@ -295,6 +295,13 @@ export async function PCLconfigCreation( req, res ) {
                   isdeleted: false,
                 },
               } );
+
+              sectionQuery.push( {
+                $sort: {
+                  sectionNumber: 1,
+                },
+              } );
+
               let getSections = await CLquestions.aggregate( sectionQuery );
               if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection', 'customerunattended', 'staffleftinthemiddle', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in' ].includes( getCLconfig.checkListType ) ) {
                 if ( getSections.length ) {
@@ -302,7 +309,9 @@ export async function PCLconfigCreation( req, res ) {
                     let collectQuestions = {};
                     collectQuestions.section_id = element3._id;
                     collectQuestions.sectionName = element3.section;
+                    collectQuestions.sectionOldName = element3.sectionOldName || '';
                     collectQuestions.questions = element3.question;
+                    collectQuestions.sectionNumber = element3.sectionNumber|| '';
                     collectSections.push( collectQuestions );
                   }
                 }

package/src/controllers/mobileTrax.controller.js

@@ -611,47 +611,47 @@ export async function sopMobilechecklistQuestionValidatorv1( req, res, next ) {
       return res.sendError( 'Please Fill all Required Fields', 400 );
     }
 
-    if ( requestData.submittype == 'submit' ) {
-      let reqAnswers = requestData.questionAnswers;
-      logger.error( { functionName: 'payload', message: reqAnswers } );
-      let CLQAnswers = getChecklistQA.questionAnswers;
-      logger.error( { functionName: 'CLQAnswers', message: CLQAnswers } );
-      let validationCount= 0;
-      let errorCount = 0;
-      CLQAnswers.forEach( ( section ) => {
-        let requestSection = reqAnswers.filter( ( reqSection ) => reqSection.sectionName == section?.sectionOldName || reqSection.sectionName == section?.sectionName );
-        if ( requestSection.length ) {
-          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 );
-            if ( sectionQuestion.length ) {
-              if ( question.answerType == 'multiplechoicemultiple' && ( sectionQuestion[0].Multianswer == null || sectionQuestion[0].Multianswer == '' || !sectionQuestion[0].Multianswer.length ) ) {
+    // if ( requestData.submittype == 'submit' ) {
+    let reqAnswers = requestData.questionAnswers;
+    logger.error( { functionName: 'payload', message: reqAnswers } );
+    let CLQAnswers = getChecklistQA.questionAnswers;
+    logger.error( { functionName: 'CLQAnswers', message: CLQAnswers } );
+    let validationCount= 0;
+    let errorCount = 0;
+    CLQAnswers.forEach( ( section ) => {
+      let requestSection = reqAnswers.filter( ( reqSection ) => reqSection.sectionName == section?.sectionOldName || reqSection.sectionName == section?.sectionName );
+      if ( requestSection.length ) {
+        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 );
+          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 {
-                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 {
+            errorCount++;
+          }
+          // } );
+        } );
       } else {
-        next();
+        errorCount++;
       }
+    } );
+    if ( validationCount && requestData.submittype == 'submit' ) {
+      return res.sendError( 'Please Fill all Required Fields', 400 );
+    } else if ( errorCount && !requestData?.editSubmit ) {
+      return res.sendError( 'Checklist got edited.please contact admin', 400 );
     } else {
       next();
     }
+    // } else {
+    //   next();
+    // }
   } catch ( e ) {
     logger.error( { function: 'sopMobilechecklistQuestionValidator', error: e, body: req.body } );
     return res.sendError( e, 500 );

package/src/controllers/trax.controller.js

@@ -2969,6 +2969,11 @@ export async function insertSingleProcessData( checklistId, processId = 0, oldDa
           isdeleted: false,
         },
       } );
+      sectionQuery.push( {
+        $sort: {
+          sectionNumber: 1,
+        },
+      } );
       let getSections = await questionService.aggregate( sectionQuery );
       if ( getSections.length || [ 'storeopenandclose', 'mobileusagedetection', 'uniformdetection' ].includes( getCLconfig.checkListType ) ) {
         if ( getSections.length ) {
@@ -2978,6 +2983,7 @@ export async function insertSingleProcessData( checklistId, processId = 0, oldDa
             collectQuestions.sectionName = element3.section;
             collectQuestions.sectionOldName = element3.sectionOldName;
             collectQuestions.questions = element3.question;
+            collectQuestions.sectionNumber = element3.sectionNumber || 0;
             collectSections.push( collectQuestions );
           }
         }
@@ -3719,7 +3725,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         await processedchecklist.deleteMany( { date_string: insertdata.date_string,
           date_iso: insertdata.date_iso,
           client_id: insertdata.client_id,
-          checkListId: updatedchecklist._id, checklistStatus: 'open' } );
+          checkListId: updatedchecklist._id, checklistStatus: 'open', redoStatus: false } );
 
 
         let actionType = 'deleteOpenUsers';
@@ -3733,7 +3739,18 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
           date_iso: insertdata.date_iso,
           client_id: insertdata.client_id,
           checkListId: updatedchecklist._id,
-          checklistStatus: 'inprogress',
+          // checklistStatus: 'inprogress',
+          $or: [
+            {
+              $and: [
+                { checklistStatus: 'open' },
+                { redoStatus: true },
+              ],
+            },
+            {
+              checklistStatus: 'inprogress',
+            },
+          ],
         }, { userId: 1, store_id: 1 } );
 
         if ( inprogressData.length ) {
@@ -3752,7 +3769,7 @@ async function insertPCBulkV4( getCLconfig, checklistId, currentdate, updatedche
         }
 
         if ( deletedList.length ) {
-          await processedchecklist.deleteMany( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, _id: { $in: deletedList } } );
+          await processedchecklist.deleteMany( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, _id: { $in: deletedList }, redoStatus: false } );
         }
         await processedchecklist.insertMany( assignUserList );
         actionType = 'insertAssignUsers';