feature: display enrolled user lab usage

Irhutchi · Jan 17, 2023 · 6cd33da · 6cd33da
1 parent b45c4a6
commit 6cd33da
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/apps/time/src/routes/time/[courseid]/[...userid]/+page.svelte b/apps/time/src/routes/time/[courseid]/[...userid]/+page.svelte
@@ -12,6 +12,7 @@
   import NavBar from "$lib/navigators/NavBar.svelte";
   import CalendarTime from "$lib/time/CalendarTime.svelte";
   import { authService } from "tutors-reader-lib/src/services/auth-service";
+  import { page } from "$app/stores";
 
   export let data: PageData;
   const storeTab: Writable<string> = writable("Labs");
@@ -44,6 +45,9 @@
     <Tab value="Calendar">Calendar</Tab>
     {#if instructorMode}
       <Tab value="allLabs">Labs All Students</Tab>
+      {#if data.course.hasEnrollment()}
+        <Tab value="allEnrolledLabs">Labs All Enrolled Students</Tab>
+      {/if}
       <Tab value="allLabsChart">Labs All Students - Chart</Tab>
       <Tab value="allCalendar">Calendar All Students</Tab>
     {/if}
@@ -60,6 +64,9 @@
   {#if $storeTab === "allLabs"}
     <InstructorLabTime userMap="{data.users}" allLabs="{data.allLabs}" chart="{false}" />
   {/if}
+  {#if $storeTab === "allEnrolledLabs"}
+    <InstructorLabTime userMap="{data.enrolledUsers}" allLabs="{data.allLabs}" chart="{false}" />
+  {/if}
   {#if $storeTab === "allLabsChart"}
     <InstructorLabTime userMap="{data.users}" allLabs="{data.allLabs}" chart="{true}" />
   {/if}

diff --git a/apps/time/src/routes/time/[courseid]/[...userid]/+page.ts b/apps/time/src/routes/time/[courseid]/[...userid]/+page.ts
@@ -14,12 +14,25 @@ export const load: PageLoad = async ({ params }) => {
   const user: UserMetric = await fetchUserById(params.courseid, params.userid, allLabs);
   currentUser.set(user);
   const users: Map<string, UserMetric> = await fetchAllUsers(params.courseid, allLabs);
+  const enrolledUsers: Map<string, UserMetric> = new Map<string, UserMetric>();
+  if (course.hasEnrollment()) {
+    const students = course.getEnrolledStudentIds();
+    for (const githubId of users.keys()) {
+      if (students.includes(githubId)) {
+        const enrolledUser = users.get(githubId);
+        if (enrolledUser) {
+          enrolledUsers.set(githubId, enrolledUser);
+        }
+      }
+    }
+  }
   return {
     user: user,
     course: course,
     allLabs: course.walls.get("lab"),
     calendar: course.calendar,
     ignorePin: course.lo.properties?.ignorepin?.toString(),
-    users: users
+    users: users,
+    enrolledUsers
   };
 };