tango-app-api-trax 1.0.0-beta-task.4 → 1.0.0-beta-task.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "1.0.0-beta-task.4",
+    "version": "1.0.0-beta-task.7",
     "description": "Trax",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "2.2.3",
+        "tango-api-schema": "2.2.5",
         "tango-app-api-middleware": "3.1.43-alpha.10",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/gallery.controller.js

@@ -443,6 +443,11 @@ export async function getLogs( req, res ) {
 
 export async function approvalstatus( req, res ) {
   try {
+    if ( ( req?.user?.userType == 'client' && req.user.role == 'superadmin' ) ) {
+      return res.sendError( 'No Content', 204 );
+    }
+
+
     let Approver = await ApproverModel.find( { checkListId: req.body.checklistId } );
     if ( Approver.length === 0 ) {
       return res.sendSuccess( 'suceess' );

package/src/controllers/internalTrax.controller.js

@@ -599,6 +599,7 @@ export async function updatePublish( req, res ) {
   try {
     let query = {
       publish: true,
+      checkListType: 'custom',
       $or: [
         { scheduleDate: { $lt: new Date() } },
         { configEndDate: { $lt: new Date() } },
@@ -1352,8 +1353,8 @@ export async function taskPushNotification( req, res ) {
       const message = {
         tokens: item.token,
         notification: {
-          title: 'Reminder to Fill checklist',
-          body: `${item.checklistName} checklist is going to breach within few minutes`,
+          title: 'Reminder to Fill task',
+          body: `${item.checklistName} task is going to breach within few minutes`,
         },
         data: {
           customKey: 'customValue',

package/src/controllers/mobileTrax.controller.js

@@ -596,7 +596,10 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
                 if ( qaAnswers[j]?.redo ) {
                   structure.redo = false;
-                }
+                };
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicesingle' ) {
                 let qaans = qaAnswers[j].answers;
@@ -638,7 +641,10 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
                 if ( qaAnswers[j]?.redo ) {
                   structure.redo = false;
-                }
+                };
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicemultiple' ) {
                 let qaans = qaAnswers[j].answers;
@@ -684,7 +690,10 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
                 if ( qaAnswers[j]?.redo ) {
                   structure.redo = false;
-                }
+                };
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multipleImage' ) {
                 let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
@@ -735,7 +744,10 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
                 if ( qaAnswers[j]?.redo ) {
                   structure.redo = false;
-                }
+                };
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
                 newArray.push( structure );
               } else {
                 let des = [];
@@ -781,7 +793,10 @@ export async function sopMobilechecklistMultiSectionFormatter( req, res, next )
                 structure.descriptivetype = qaAnswers[j].descriptivetype;
                 if ( qaAnswers[j]?.redo ) {
                   structure.redo = false;
-                }
+                };
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
                 newArray.push( structure );
               }
             }
@@ -874,13 +889,17 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.remarks = requestSection[i].remarks;
                 structure.answers = qaAnswers[j].answers;
                 structure.userAnswer = yn;
-                structure.linkType = qaAnswers[j].linkType,
-                structure.linkquestionenabled = requestSection[i].linkquestionenabled,
-                structure.parentanswer = requestSection[i].parentanswer,
-                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
-                structure.descriptivetype = qaAnswers[j].descriptivetype,
-                structure.redo = qaAnswers[j]?.redo,
-                structure.redoComment = qaAnswers[j]?.redoComment,
+                structure.linkType = qaAnswers[j].linkType;
+                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
+                structure.parentanswer = requestSection[i].parentanswer;
+                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
+                structure.descriptivetype = qaAnswers[j].descriptivetype;
+                if ( qaAnswers[j]?.redo ) {
+                  structure.redo = false;
+                };
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicesingle' ) {
                 let qaans = qaAnswers[j].answers;
@@ -915,13 +934,17 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.remarks = requestSection[i].remarks;
                 structure.answers = qaAnswers[j].answers;
                 structure.userAnswer = ms;
-                structure.linkType = qaAnswers[j].linkType,
-                structure.linkquestionenabled = requestSection[i].linkquestionenabled,
-                structure.parentanswer = requestSection[i].parentanswer,
-                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
-                structure.descriptivetype = qaAnswers[j].descriptivetype,
-                structure.redo = qaAnswers[j]?.redo,
-                structure.redoComment = qaAnswers[j]?.redoComment,
+                structure.linkType = qaAnswers[j].linkType;
+                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
+                structure.parentanswer = requestSection[i].parentanswer;
+                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
+                structure.descriptivetype = qaAnswers[j].descriptivetype;
+                if ( qaAnswers[j]?.redo ) {
+                  structure.redo = false;
+                };
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multiplechoicemultiple' ) {
                 let qaans = qaAnswers[j].answers;
@@ -960,13 +983,17 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.remarks = requestSection[i].remarks;
                 structure.answers = qaAnswers[j].answers;
                 structure.userAnswer = mcmo;
-                structure.linkType = qaAnswers[j].linkType,
-                structure.linkquestionenabled = requestSection[i].linkquestionenabled,
-                structure.parentanswer = requestSection[i].parentanswer,
-                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
-                structure.descriptivetype = qaAnswers[j].descriptivetype,
-                structure.redo = qaAnswers[j]?.redo,
-                structure.redoComment = qaAnswers[j]?.redoComment,
+                structure.linkType = qaAnswers[j].linkType;
+                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
+                structure.parentanswer = requestSection[i].parentanswer;
+                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
+                structure.descriptivetype = qaAnswers[j].descriptivetype;
+                if ( qaAnswers[j]?.redo ) {
+                  structure.redo = false;
+                };
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
                 newArray.push( structure );
               } else if ( qaAnswers[j].answerType == 'multipleImage' ) {
                 let separatedArray = typeof requestSection[i].Multianswer == 'string' ? JSON.parse( requestSection[i].Multianswer ) : requestSection[i].Multianswer;
@@ -1010,13 +1037,17 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.remarks = requestSection[i].remarks;
                 structure.answers = qaAnswers[j].answers;
                 structure.userAnswer = mcmi;
-                structure.linkType = qaAnswers[j].linkType,
-                structure.linkquestionenabled = requestSection[i].linkquestionenabled,
-                structure.parentanswer = requestSection[i].parentanswer,
-                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
-                structure.descriptivetype = qaAnswers[j].descriptivetype,
-                structure.redo = qaAnswers[j]?.redo,
-                structure.redoComment = qaAnswers[j]?.redoComment,
+                structure.linkType = qaAnswers[j].linkType;
+                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
+                structure.parentanswer = requestSection[i].parentanswer;
+                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
+                structure.descriptivetype = qaAnswers[j].descriptivetype;
+                if ( qaAnswers[j]?.redo ) {
+                  structure.redo = false;
+                };
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
                 newArray.push( structure );
               } else {
                 let des = [];
@@ -1058,13 +1089,17 @@ export async function sopMobileTaskMultiSectionFormatter( req, res, next ) {
                 structure.remarks = requestSection[i].remarks;
                 structure.answers = qaAnswers[j].answers;
                 structure.userAnswer = des;
-                structure.linkType = qaAnswers[j].linkType,
-                structure.linkquestionenabled = requestSection[i].linkquestionenabled,
-                structure.parentanswer = requestSection[i].parentanswer,
-                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage,
-                structure.descriptivetype = qaAnswers[j].descriptivetype,
-                structure.redo = qaAnswers[j]?.redo,
-                structure.redoComment = qaAnswers[j]?.redoComment,
+                structure.linkType = qaAnswers[j].linkType;
+                structure.linkquestionenabled = requestSection[i].linkquestionenabled;
+                structure.parentanswer = requestSection[i].parentanswer;
+                structure.questionReferenceImage = qaAnswers[j].questionReferenceImage;
+                structure.descriptivetype = qaAnswers[j].descriptivetype;
+                if ( qaAnswers[j]?.redo ) {
+                  structure.redo = false;
+                };
+                if ( qaAnswers[j]?.redoComment ) {
+                  structure.redoComment = qaAnswers[j]?.redoComment;
+                };
                 newArray.push( structure );
               }
             }
@@ -1763,6 +1798,7 @@ export async function checklistv1( req, res ) {
             timeDifference: { $subtract: [ '$scheduleEndTime_iso', '$date_iso' ] },
             redoStatus: { $ifNull: [ '$redoStatus', false ] },
             type: { $ifNull: [ '$checkListType', '' ] },
+            priorityType: { $ifNull: [ '$priorityType', '' ] },
           },
         },
       ];
@@ -2001,6 +2037,7 @@ export async function taskQuestionList( req, res ) {
           questionAnswers: { $ifNull: [ '$questionAnswers', '' ] },
           userEmail: { $ifNull: [ '$userEmail', '' ] },
           storeName: { $ifNull: [ '$storeName', '' ] },
+          redoStatus: { $ifNull: [ '$redoStatus', false ] },
         },
       },
     ];
@@ -2086,9 +2123,17 @@ export async function taskQuestionList( req, res ) {
         }
 
         if ( [ 'multiplechoicemultiple', 'multipleImage' ].includes( answerType ) ) {
-          question.Multianswer = multiAnswer.length ?
-            multiAnswer.map( ( item ) => ( { ...item, answer: item.validationAnswer ? item.answer : null } ) ) :
-            [ { answer: null, no: 0, validationAnswer: null } ];
+          question.Multianswer = multiAnswer.length > 0 ?
+            multiAnswer.map( ( item ) => ( {
+              answer: item.validationAnswer ? item.answer : null,
+              no: item.no,
+              validationAnswer: item.validationAnswer,
+            } ) ) :
+            answers.map( ( _, index ) => ( {
+              answer: null,
+              no: index,
+              validationAnswer: null,
+            } ) );
         }
       }
     }

package/src/controllers/trax.controller.js

@@ -1839,6 +1839,8 @@ export async function insertSingleProcessData( checklistId, processId = 0, oldDa
       insertdata.locationCount = getCLconfig.locationCount;
       insertdata.scheduleRepeatedType = getCLconfig.scheduleRepeatedType;
       insertdata.allowedMultiSubmit = getCLconfig.allowedMultiSubmit;
+      insertdata.approver = getCLconfig?.approver || [];
+      insertdata.remainder = getCLconfig?.remainder || [];
       let collectSections = [];
       let sectionQuery = [];
       sectionQuery.push( {
@@ -2029,6 +2031,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, currentdate, updatedche
       assigndeletequery.client_id = insertdata.client_id;
       assigndeletequery.checkListId = updatedchecklist._id;
       assigndeletequery.checklistStatus = { $nin: [ 'submit' ] };
+      assigndeletequery.redoStatus = false;
       if ( getCLconfig?.allowedMultiSubmit && processId ) {
         let processedDetails = await processedchecklist.findOne( { _id: processId } );
         if ( processedDetails ) {

package/src/controllers/traxDashboard.controllers.js

@@ -3528,16 +3528,15 @@ export const checklistDropdown = async ( req, res ) => {
 export async function sendAlert( req, res ) {
   try {
     let inputBody = req.body;
+    if ( inputBody?.id ) {
+      inputBody.id = inputBody.id.map( ( item ) => new mongoose.Types.ObjectId( item ) );
+    }
     let query = {
       date_iso: new Date( dayjs().format( 'YYYY-MM-DD' ) ),
-      sourceCheckList_id: new mongoose.Types.ObjectId( inputBody.sourceCheckList_id ),
+      ...( inputBody?.sourceCheckList_id ) ? { sourceCheckList_id: new mongoose.Types.ObjectId( inputBody.sourceCheckList_id ) } : { _id: { $in: inputBody.id } },
       checklistStatus: { $ne: 'submit' },
       timeFlag: 0,
     };
-    if ( inputBody.userEmail && inputBody.storeName ) {
-      query.userEmail = inputBody.userEmail;
-      query.storeName = inputBody.storeName;
-    }
 
     query = [ { $match: query } ];