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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.6.0-task-3",
+    "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;
         }
@@ -5474,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;
 
@@ -5893,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;

package/src/controllers/taskDashboard.controllers.js

@@ -336,6 +336,8 @@ export const taskInfoTableV1 = async ( req, res ) => {
         restrictAttendance: 1,
         approvalByEmail: 1,
         approvalTime_string: 1,
+        zoneName: 1,
+        checkListFrom: 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(
         {