Merge pull request #927 from OneCommunityGlobal/Anirudh_endDatedisplay

Anirudh - Fetch end date field from dashboardhelper
OneCommunityGlobal · Jun 17, 2024 · f9417ca · f9417ca
2 parents 0e0b44f + 39ec17f
commit f9417ca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/helpers/dashboardhelper.js b/src/helpers/dashboardhelper.js
@@ -49,6 +49,7 @@ const dashboardhelper = function () {
           name: 1,
           weeklycommittedHours: 1,
           role: 1,
+          endDate: 1,
           timeEntryData: {
             $filter: {
               input: '$timeEntryData',
@@ -84,6 +85,7 @@ const dashboardhelper = function () {
         $project: {
           personId: 1,
           weeklycommittedHours: 1,
+          endDate: 1,
           totalSeconds: {
             $cond: [
               {
@@ -190,7 +192,9 @@ const dashboardhelper = function () {
             weeklySummaries: 1,
             timeOffFrom: 1,
             timeOffTill: 1,
-          },
+            endDate: 1,
+          }
+
         );
       } else {
         // 'Core Team', 'Owner' //All users
@@ -205,6 +209,8 @@ const dashboardhelper = function () {
             weeklySummaries: 1,
             timeOffFrom: 1,
             timeOffTill: 1,
+            endDate: 1,
+
           },
         );
       }
@@ -254,10 +260,11 @@ const dashboardhelper = function () {
               : false,
           weeklycommittedHours: teamMember.weeklycommittedHours,
           totaltangibletime_hrs:
-            (timeEntryByPerson[teamMember._id.toString()]?.tangibleSeconds || 0) / 3600,
+            (timeEntryByPerson[teamMember._id.toString()]?.tangibleSeconds ?? 0) / 3600,
           totalintangibletime_hrs:
-            (timeEntryByPerson[teamMember._id.toString()]?.intangibleSeconds || 0) / 3600,
-          totaltime_hrs: (timeEntryByPerson[teamMember._id.toString()]?.totalSeconds || 0) / 3600,
+            (timeEntryByPerson[teamMember._id.toString()]?.intangibleSeconds ?? 0) / 3600,
+          totaltime_hrs: (timeEntryByPerson[teamMember._id.toString()]?.totalSeconds ?? 0) / 3600,
+
           percentagespentintangible:
             timeEntryByPerson[teamMember._id.toString()] &&
             timeEntryByPerson[teamMember._id.toString()]?.totalSeconds !== 0 &&
@@ -268,6 +275,7 @@ const dashboardhelper = function () {
               : 0,
           timeOffFrom: teamMember.timeOffFrom || null,
           timeOffTill: teamMember.timeOffTill || null,
+          endDate: teamMember.endDate || null,
         };
         leaderBoardData.push(obj);
       });
@@ -592,6 +600,7 @@ const dashboardhelper = function () {
           percentagespentintangible: (intangibleSeconds / tangibleSeconds) * 100,
           timeOffFrom: user.timeOffFrom,
           timeOffTill: user.timeOffTill,
+          endDate: user.endDate || null,
         },
       ];
     } catch (err) {