Merge pull request #697 from OneCommunityGlobal/vishala_lb_view_hotfix

Leaderboard View for Admins Hotfix
OneCommunityGlobal · Jan 11, 2024 · 52cb753 · 52cb753
2 parents 0d9e52a + b03f597
commit 52cb753
Showing 1 changed file with 1 addition and 39 deletions.
diff --git a/src/helpers/dashboardhelper.js b/src/helpers/dashboardhelper.js
@@ -223,46 +223,8 @@ const dashboardhelper = function () {
         )
         .then((res) => res)
         .catch((e) => {});
-    } else if (userRole == "Administrator") {
-      // All users except Owner and Core Team
-      const excludedRoles = ["Core Team", "Owner"];
-      teamMembers = await userProfile
-        .find(
-          { isActive: true, role: { $nin: excludedRoles } },
-          {
-            role: 1,
-            firstName: 1,
-            lastName: 1,
-            isVisible: 1,
-            weeklycommittedHours: 1,
-            weeklySummaries: 1,
-            timeOffFrom: 1,
-            timeOffTill: 1,
-          }
-        )
-        .then((res) => res)
-        .catch((e) => {});
-    } else if (userRole == "Administrator") {
-      // All users except Owner and Core Team
-      const excludedRoles = ["Core Team", "Owner"];
-      teamMembers = await userProfile
-        .find(
-          { isActive: true, role: { $nin: excludedRoles } },
-          {
-            role: 1,
-            firstName: 1,
-            lastName: 1,
-            isVisible: 1,
-            weeklycommittedHours: 1,
-            weeklySummaries: 1,
-            timeOffFrom: 1,
-            timeOffTill: 1,
-          }
-        )
-        .then((res) => res)
-        .catch((e) => {});
     } else {
-      // 'Core Team', 'Owner' //All users
+      // 'Core Team', 'Owner' , 'Admin' //Show All users
       teamMembers = await userProfile
         .find(
           { isActive: true },