tango-app-api-trax 3.4.1-beta-2 → 3.5.0-alpha-0

package/src/controllers/traxDashboard.controllers.js

@@ -1251,8 +1251,8 @@ export const checklistInfo = async ( req, res ) => {
         coverage: { $first: '$coverage' },
         createdByName: { $first: '$createdByName' },
         userName: { $first: '$userName' },
-        userEmail: { $first: '$userEmail' },
         checklistStatus: { $last: '$checklistStatus' },
+        userEmail: { $first: '$userEmail' },
         submitTime_string: { $push: '$submitTime_string' },
         storeName: { $first: '$storeName' },
         checkListType: { $first: '$checkListType' },
@@ -1272,6 +1272,8 @@ export const checklistInfo = async ( req, res ) => {
             else: 0,
           },
         } },
+        approvalByEmail: { $first: '$approvalByEmail' },
+        approvalTime_string: { $push: '$approvalTime_string' },
         idList: { $push: '$_id' },
       },
     } );
@@ -1284,8 +1286,8 @@ export const checklistInfo = async ( req, res ) => {
         coverage: 1,
         createdByName: 1,
         userName: 1,
-        userEmail: '$_id.email',
         checklistStatus: 1,
+        userEmail: '$_id.email',
         submitTime_string: { $arrayElemAt: [ '$submitTime_string', 0 ] },
         storeName: 1,
         checkListType: 1,
@@ -1300,6 +1302,8 @@ export const checklistInfo = async ( req, res ) => {
         reinitiateStatus: 1,
         redoStatus: 1,
         submitCount: 1,
+        approvalByEmail: 1,
+        approvalTime_string: { $arrayElemAt: [ '$approvalTime_string', 0 ] },
       },
     } );
 
@@ -1311,7 +1315,6 @@ export const checklistInfo = async ( req, res ) => {
         checkListChar: { $substr: [ '$checkListName', 0, 2 ] },
         createdByName: 1,
         userName: 1,
-        userEmail: 1,
         checklistStatus: {
           $cond: {
             if: { $eq: [ '$checklistStatus', 'submit' ] },
@@ -1325,6 +1328,7 @@ export const checklistInfo = async ( req, res ) => {
             },
           },
         },
+        userEmail: 1,
         // submitTime_string: 1,
         submitTime_string: {
           $cond: {
@@ -1348,6 +1352,8 @@ export const checklistInfo = async ( req, res ) => {
         reinitiateStatus: 1,
         redoStatus: 1,
         submitCount: 1,
+        approvalByEmail: 1,
+        approvalTime_string: 1,
       },
     } );
 
@@ -1396,19 +1402,24 @@ export const checklistInfo = async ( req, res ) => {
             'Date': element.date_string || '--',
             'Store Name': element.storeName || '--',
             'Checklist Owner': element.userName || '--',
-            'Submitted By': element.userName || '--',
             'Status': element.checklistStatus || '--',
+            'Submitted By': element.userName || '--',
             'Submitted On': element.submitTime_string || '--',
             'Flags': element.flaggedChecklist || '--',
+            'Approval By': element.approvalByEmail || '--',
+            'Approval On': element.approvalTime_string || '--',
           } );
         } else if ( requestData.groupByType==='Store' ) {
           exportdata.push( {
             'CheckList Name': element.checkListName || '--',
             'Checklist Owner': element.userName || '--',
-            'Submitted By': element.userName || '--',
             'Status': element.checklistStatus || '--',
+            'Submitted By': element.userName || '--',
             'Submitted On': element.submitTime_string || '--',
             'Flags': element.flaggedChecklist || '--',
+            'Approval By': element.approvalByEmail || '--',
+            'Approval On': element.approvalTime_string || '--',
+
           } );
         } else {
           exportdata.push( {
@@ -1419,6 +1430,8 @@ export const checklistInfo = async ( req, res ) => {
             'Status': element.checklistStatus || '--',
             'Submitted On': element.submitTime_string || '--',
             'Flags': element.flaggedChecklist || '--',
+            'Approval By': element.approvalByEmail || '--',
+            'Approval On': element.approvalTime_string || '--',
           } );
         }
       } );

package/src/dtos/downloadValidation.dtos.js

@@ -26,6 +26,7 @@ export const validateDownloadInsertSchema = joi.object( {
   filter: joi.string().optional().allow( '' ),
   filtertype: joi.string().optional().allow( '' ),
   checkListType: joi.string().required(),
+  approveFilter: joi.string().optional().allow( '' ),
 } );
 
 export const validateDownloadInsertParams = {

package/src/routes/activityLog.router.js

@@ -0,0 +1,18 @@
+import express from 'express';
+import { isAllowedInternalAPIHandler, isAllowedSessionHandler } from 'tango-app-api-middleware';
+
+export const traxActivityLogRouter = express.Router();
+
+import {
+  insertLog,
+  updateLog,
+  listLog,
+} from '../controllers/activityLog.controller.js';
+
+traxActivityLogRouter
+    .post( '/insertLog', isAllowedInternalAPIHandler, insertLog )
+    .post( '/updateLog', isAllowedInternalAPIHandler, updateLog )
+    .post( '/listLog', isAllowedSessionHandler, listLog );
+
+
+export default traxActivityLogRouter;

package/src/routes/gallery.routes.js

@@ -1,6 +1,6 @@
 
 
-import { getchecklist, viewchecklist, getMobileUseagelist, storeOpencloselist, getcustomerunattendedlist, storesList, checklistDropdown, redoChecklist, approveChecklist, approvalstatus, getLogs, headerStoresV2, teamsList, userList } from '../controllers/gallery.controller.js';
+import { getchecklist, viewchecklist, getMobileUseagelist, storeOpencloselist, getcustomerunattendedlist, storesList, checklistDropdown, redoChecklist, redomultiChecklist, approveChecklist, approvalstatus, getLogs, headerStoresV2, teamsList, userList } from '../controllers/gallery.controller.js';
 import express from 'express';
 export const galleryRouter = express.Router();
 import { validate, isAllowedSessionHandler, isAllowedClient, getAssinedStore } from 'tango-app-api-middleware';
@@ -24,6 +24,7 @@ galleryRouter
 galleryRouter
     .post( '/updateApprove', isAllowedSessionHandler, approveChecklist )
     .post( '/redo', isAllowedSessionHandler, redoChecklist )
+    .post( '/multiredo', isAllowedSessionHandler, redomultiChecklist )
     .post( '/approvalstatus', isAllowedSessionHandler, approvalstatus )
     .post( '/getLogs', isAllowedSessionHandler, getLogs );
 galleryRouter

package/src/routes/mobileTrax.routes.js

@@ -13,6 +13,7 @@ mobileRouter
     .post( '/submitCheckList', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidator, mobileController.sopMobilechecklistMultiSectionFormatter, mobileController.submitChecklist )
     .post( '/submitCheckListv5', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobilechecklistQuestionValidatorv1, mobileController.sopMobilechecklistMultiSectionFormatterv1, mobileController.submitChecklist )
     .post( '/submitTask', isAllowedSessionHandler, mobileController.sopMobilechecklistValidater, mobileController.sopMobileTaskQuestionValidator, mobileController.sopMobileTaskMultiSectionFormatter, mobileController.submitTask )
+    .post( '/submiteyeTestTask', isAllowedSessionHandler, mobileController.submiteyeTestTask )
     .get( '/dashboard', isAllowedSessionHandler, validate( dashboardValidation ), mobileController.dashboard )
     .get( '/dashboardv1', isAllowedSessionHandler, validate( dashboardValidation ), mobileController.dashboardv1 )
     .get( '/checklist', isAllowedSessionHandler, validate( mobileChecklistValidation ), mobileController.checklist )

package/src/services/camera.service.js

@@ -0,0 +1,14 @@
+import model from 'tango-api-schema';
+
+export const aggregate = async ( query ={} ) => {
+  return model.cameraModel.aggregate( query );
+};
+
+export const updateOne = async ( query, record ) => {
+  return model.cameraModel.updateOne( query, { $set: record }, { upsert: true } );
+};
+
+export const findOne = async ( query ={}, field={} ) => {
+  return model.cameraModel.findOne( query, field );
+};
+