tango-app-api-task 3.6.0-task-1 → 3.6.0-task-4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.6.0-task-1",
+    "version": "3.6.0-task-4",
     "description": "Task",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "mongodb": "^6.10.0",
         "nodemon": "^3.1.7",
         "npm": "^10.9.2",
-        "tango-api-schema": "^2.2.147",
+        "tango-api-schema": "^2.2.193",
         "tango-app-api-middleware": "^3.1.77",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/task.controller.js

@@ -1276,6 +1276,7 @@ export async function insertSingleProcessData( checklistId, answerTypechange, in
       insertdata.restrictAttendance = getCLconfig?.restrictAttendance;
       insertdata.coverage = getCLconfig?.coverage;
       insertdata.checkListFrom = getCLconfig?.checkListFrom;
+      insertdata.zoneName = getCLconfig?.zoneName || '';
       let collectSections = [];
       let sectionQuery = [];
       sectionQuery.push( {
@@ -1523,6 +1524,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
         element4.restrictAttendance = getCLconfig?.restrictAttendance;
         element4.coverage = getCLconfig?.coverage;
         element4.checkListFrom = getCLconfig?.checkListFrom;
+        element4.zoneName = getCLconfig?.zoneName || '';
         if ( inputBody && inputBody?.streamId ) {
           element4.streamId = inputBody?.streamId;
         }
@@ -2711,17 +2713,20 @@ export const taskDropdown = async ( req, res ) => {
     let requestData = req.body;
     let fromDate = new Date( requestData.fromDate );
     let toDate = new Date( requestData.toDate );
-    let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
-    toDate = new Date( toDate.getTime() - userTimezoneOffset );
-    toDate.setUTCHours( 23, 59, 59, 59 );
+    // let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
+    // toDate = new Date( toDate.getTime() - userTimezoneOffset );
+    // toDate.setUTCHours( 23, 59, 59, 59 );
     let result = {};
+    toDate.setDate( toDate.getDate() + 1 );
 
     let findQuery = [];
     let findAndQuery = [];
     findAndQuery.push(
         { client_id: requestData.clientId },
-        { date_iso: { $gte: fromDate } },
-        { date_iso: { $lte: toDate } },
+        // { date_iso: { $gte: fromDate } },
+        // { date_iso: { $lte: toDate } },
+        { scheduleStartTime_iso: { $lt: toDate } },
+        { scheduleEndTime_iso: { $gte: fromDate } },
         { checkListType: { $in: [ 'task', 'checklistTask', 'cctv' ] } },
     );
 
@@ -3681,7 +3686,7 @@ export async function StoreHygienetaskOld( req, res ) {
     return res.sendError( e, 500 );
   }
 }
-export async function eyeTesttaskOld( req, res ) {
+export async function eyeTesttask( req, res ) {
   try {
     let inputBody = req.body;
     inputBody.clientId = 11;
@@ -5471,6 +5476,8 @@ export async function StoreHygienetask( req, res ) {
         ...( inputBody?.checkListId ) ? { referenceCheckListId: inputBody?.checkListId } : {},
         coverage: 'store',
         checkListFrom: 'api',
+        zoneName: inputBody.zoneName || '',
+        checkListType: 'task',
       };
       data['approver'] = userAdmin;
 
@@ -5593,14 +5600,14 @@ export async function StoreHygienetask( req, res ) {
   }
 }
 
-export async function eyeTesttask( req, res ) {
+export async function eyeTesttaskNew( req, res ) {
   try {
     let inputBody = req.body;
     inputBody.clientId = 11;
     inputBody.taskDescription = '';
     let userId;
     let storeDetails = await storeService.findOne( { storeName: inputBody.storeName, clientId: inputBody.clientId, status: 'active' }, { storeId: 1, storeName: 1, storeProfile: 1 } );
-    console.log( 'storeDetails =>', storeDetails );
+    // console.log( 'storeDetails =>', storeDetails );
     if ( !storeDetails ) {
       return res.sendError( 'Store Not Found', 500 );
     }
@@ -5890,6 +5897,8 @@ async function insertStoreHygienetaskSingleProcessedTask( checkTask, inputBody,
     newData.createdAt = new Date();
     newData.updatedAt = new Date();
     newData.questionAnswers = [ questions ];
+    newData.zoneName = inputBody.zoneName || '';
+    newData.checkListType = 'task' || '';
     let insertprocessdata = await taskProcessedService.insert( newData );
     if ( insertprocessdata ) {
       return true;
@@ -5964,7 +5973,7 @@ async function insertEyetestSingleProcessedTask( checkTask, inputBody, date, tim
     delete newData._id;
     newData.date_iso = new Date( dayjs( date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
     newData.date_string = dayjs( date ).format( 'YYYY-MM-DD' );
-    newData.scheduleStartTime_iso = date;
+    newData.scheduleStartTime_iso = dayjs.utc().format( 'YYYY-MM-DD hh:mm A' );
     newData.scheduleEndTime_iso = dayjs.utc( `${date} ${time}`, 'YYYY-MM-DD hh:mm A' ).format();
     newData.store_id = storeDetails.storeId;
     newData.storeName = storeDetails.storeName;

package/src/controllers/taskActionCenter.controllers.js

@@ -39,6 +39,10 @@ export const overallCardsV1 = async ( req, res ) => {
     let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
+
+    let taskToDate = new Date( requestData.toDate );
+    taskToDate.setDate( taskToDate.getDate() + 1 );
+
     let groupQuery = {
       $group: {
         _id: '',
@@ -55,7 +59,9 @@ export const overallCardsV1 = async ( req, res ) => {
     let taskQuery = [
       {
         $match: {
-          date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+          // date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+          scheduleStartTime_iso: { $lt: taskToDate },
+          scheduleEndTime_iso: { $gte: fromDate },
           sourceCheckList_id: { $in: taskIdList },
           checklistStatus: 'submit',
           approvalStatus: false,
@@ -130,6 +136,9 @@ export const approvalTableV1 = async ( req, res ) => {
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
 
+    let taskToDate = new Date( requestData.toDate );
+    taskToDate.setDate( taskToDate.getDate() + 1 );
+
     let groupQuery = [ {
       $sort: {
         checkListName: 1,
@@ -202,7 +211,9 @@ export const approvalTableV1 = async ( req, res ) => {
       query = [
         {
           $match: {
-            date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+            // date_iso: { $gte: new Date( req.body.fromDate ), $lte: toDate },
+            scheduleStartTime_iso: { $lt: taskToDate },
+            scheduleEndTime_iso: { $gte: fromDate },
             sourceCheckList_id: { $in: taskIdList },
             // ...( req.body?.storeId?.length ) ? { store_id: { $in: req.body.storeId } } :{},
             $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes || [] } } ],

package/src/controllers/taskDashboard.controllers.js

@@ -312,7 +312,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
 
     findQuery.push( {
       $project: {
-        _id: 0,
+        _id: 1,
         checkListName: 1,
         createdByName: 1,
         userName: 1,
@@ -336,6 +336,8 @@ export const taskInfoTableV1 = async ( req, res ) => {
         restrictAttendance: 1,
         approvalByEmail: 1,
         approvalTime_string: 1,
+        zoneName: 1,
+        checkListFrom: 1,
       },
     } );
 
@@ -347,7 +349,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
 
     findQuery.push( {
       $project: {
-        _id: 0,
+        _id: 1,
         checkListName: 1,
         checkListChar: { $substr: [ '$checkListName', 0, 2 ] },
         createdByName: 1,
@@ -388,6 +390,8 @@ export const taskInfoTableV1 = async ( req, res ) => {
         restrictAttendance: 1,
         approvalByEmail: 1,
         approvalTime_string: 1,
+        zoneName: 1,
+        checkListFrom: 1,
       },
     } );
 
@@ -408,7 +412,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
     } );
 
     let taskInfoData = await processedTaskService.aggregate( findQuery );
-    console.log( 'taskInfoData =>', taskInfoData.length );
+    // console.log( 'taskInfoData =>', taskInfoData );
 
     if ( !taskInfoData[0].data.length ) {
       return res.sendError( 'no data found', 204 );
@@ -425,11 +429,12 @@ export const taskInfoTableV1 = async ( req, res ) => {
       for ( let task of result.taskInfo ) {
         exportResult.push( {
           'Store': task?.storeName ||'--',
-          'Store SPOC': task?.userEmail ||'--',
+          'user Name': task?.userEmail ||'--',
+          'User Email': task?.userEmail ||'--',
+          ...( task?.checkListFrom === 'api' && { 'Zone Name': task?.zoneName || '--' } ),
           'Due On': dayjs.utc( task?.scheduleEndTime_iso ).format( 'DD MMM, YYYY' ) || '--',
           'status': task?.checklistStatus ||'--',
           'Submitted On': task?.submitTime_string || '--',
-          'Assigned To': task?.storeCount ||'--',
           'Approval By': task.approvalByEmail || '--',
           'Approval On': task.approvalTime_string || '--',
         } );
@@ -774,7 +779,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
     );
     findQuery.push( { $match: { $and: findAndQuery } }, { $sort: { date_iso: -1 } } );
 
-    findQuery.push( { $match: { $or: [ { checkListName: 'Store Hygiene Check' }, { checkListName: 'EyeTest QR Verification' } ] } } );
+    // findQuery.push( { $match: { $or: [ { checkListName: 'Store Hygiene Check' }, { checkListName: 'Store Hygiene Check new' } ] } } );
 
     findQuery.push(
         {