tango-app-api-trax 3.2.0-beta.17 → 3.2.0-beta.19

package/package.json

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

package/src/controllers/gallery.controller.js

@@ -357,23 +357,26 @@ export async function redoChecklist( req, res ) {
     let findQuestion = question[sectionIndex].questions.findIndex( ( ele ) => ele.qno == req.body.payload.qno );
 
     let data = { ...question[sectionIndex].questions[findQuestion], redo: true, redoComment: req.body.payload?.checklistDescription || '' };
-    if ( checklistDetails.client_id == '458' ) {
-      data.answers.forEach( ( item ) => {
-        if ( item.showLinked ) {
-          item.nestedQuestion.forEach( ( ele ) => {
-            let element = { ...question[sectionIndex].questions[parseInt( ele ) - 1], redo: true, redoComment: '' };
-            question[sectionIndex].questions[ele - 1] = element;
-          } );
-        }
-      } );
-      // data.answers.forEach( ( item ) => {
-      //   if ( item.showLinked ) {
-      //     item.nestedQuestion = [];
-      //     item.showLinked = false;
-      //     item.linkedQuestion = 0;
-      //   }
-      // } );
-    }
+    // if ( checklistDetails.client_id == '458' ) {
+    data.answers.forEach( ( item ) => {
+      if ( item.showLinked ) {
+        item.nestedQuestion.forEach( ( ele ) => {
+          let eleIndex = question[sectionIndex].questions.findIndex( ( qn ) => qn.qno == parseInt( ele ) );
+          let element = { ...question[sectionIndex].questions[eleIndex], redo: true, redoComment: '', linkquestionenabled: false };
+          question[sectionIndex].questions[eleIndex] = element;
+          question[sectionIndex].questions[eleIndex].userAnswer = [];
+          question[sectionIndex].questions[eleIndex].remarks = '';
+        } );
+      }
+    } );
+    // data.answers.forEach( ( item ) => {
+    //   if ( item.showLinked ) {
+    //     item.nestedQuestion = [];
+    //     item.showLinked = false;
+    //     item.linkedQuestion = 0;
+    //   }
+    // } );
+    // }
     let userAnswer = data.userAnswer;
 
     question[sectionIndex].questions[findQuestion] = data;

package/src/controllers/mobileTrax.controller.js

@@ -2948,6 +2948,11 @@ export async function uploadAnswerImage( req, res ) {
     let date = dayjs().format( 'YYYY-MM-DD' );
     let folder;
 
+    let getChecklistDetails = await processedchecklist.findOne( { _id: input.checklistId } );
+    if ( getChecklistDetails ) {
+      input.type = 'custom';
+    }
+
     if ( input.type == 'custom' ) {
       folder = 'checklist-answers';
     } else {

package/src/controllers/trax.controller.js

@@ -2042,7 +2042,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
         tokenList.push( getToken.fcmToken );
       }
       if ( !element4?.sendNotification ) {
-        notifyUserList.push( { token: getToken.fcmToken, storeName: element4.storeName, id: element4._id } );
+        notifyUserList.push( { token: getToken?.fcmToken, storeName: element4.storeName, id: element4._id } );
       }
       if ( !getCLconfig?.allowedMultiSubmit ) {
         let query;
@@ -2229,11 +2229,23 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
     }
     if ( allQuestion ) {
-      if ( getCLconfig?.allowedMultiSubmit && processId ) {
-        let processedDetails = await processedchecklist.findOne( { _id: processId } );
-        if ( processedDetails ) {
-          let submitUser = allQuestion.find( ( item ) => item.userId.toString() == processedDetails.userId.toString() && item.store_id == processedDetails.store_id );
-          await processedchecklist.insertMany( submitUser );
+      if ( getCLconfig?.allowedMultiSubmit || processId ) {
+        if ( processId ) {
+          let processedDetails = await processedchecklist.findOne( { _id: processId } );
+          if ( processedDetails ) {
+            let submitUser = allQuestion.find( ( item ) => item.userId.toString() == processedDetails.userId.toString() && item.store_id == processedDetails.store_id );
+            await processedchecklist.insertMany( submitUser );
+          }
+        } else {
+          let deleteQuery = {
+            date_string: insertdata.date_string,
+            date_iso: insertdata.date_iso,
+            client_id: insertdata.client_id,
+            checkListId: updatedchecklist._id,
+            checklistStatus: { $nin: [ 'submit' ] },
+          };
+          await processedchecklist.deleteMany( deleteQuery );
+          await processedchecklist.insertMany( allQuestion );
         }
       } else {
         let unAssignedList = allQuestion.reduce( ( acc, item ) => {
@@ -2255,6 +2267,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
           }
         }
 
+
         Promise.all( allQuestion.map( async ( ele ) => {
           await processedchecklist.updateOne( { date_string: insertdata.date_string, date_iso: insertdata.date_iso, client_id: insertdata.client_id, checkListId: updatedchecklist._id, userEmail: ele.userEmail, store_id: ele.store_id }, ele );
         } ) );