Use new teachers timetable endpoint #715

bkd-mba-fbi · Nov 28, 2024 · ad0e496 · ad0e496
1 parent 8458847
commit ad0e496
Show file tree

Hide file tree

Showing 16 changed files with 458 additions and 173 deletions.
diff --git a/...p/dashboard/components/dashboard-timetable-table/dashboard-timetable-table.component.html b/...p/dashboard/components/dashboard-timetable-table/dashboard-timetable-table.component.html
@@ -9,11 +9,9 @@
             {{ "dashboard.timetable.table.teacher" | translate }}
           </th>
         }
-        @if (isStudent$ | async) {
-          <th>
-            {{ "dashboard.timetable.table.room" | translate }}
-          </th>
-        }
+        <th>
+          {{ "dashboard.timetable.table.room" | translate }}
+        </th>
       </tr>
     </thead>
     <tbody>
@@ -46,16 +44,14 @@
               {{ entry.teacher }}
             </td>
           }
-          @if (isStudent$ | async) {
-            <td class="room">
-              @if (entry.room) {
-                <span class="room-label">{{
-                  "dashboard.timetable.table.room" | translate
-                }}</span>
-              }
-              {{ entry.room }}
-            </td>
-          }
+          <td class="room">
+            @if (entry.room) {
+              <span class="room-label">{{
+                "dashboard.timetable.table.room" | translate
+              }}</span>
+            }
+            {{ entry.room }}
+          </td>
         </tr>
       }
     </tbody>

diff --git a/...ashboard/components/dashboard-timetable-table/dashboard-timetable-table.component.spec.ts b/...ashboard/components/dashboard-timetable-table/dashboard-timetable-table.component.spec.ts
@@ -16,7 +16,7 @@ describe("DashboardTimetableTableComponent", () => {
           {
             provide: DashboardService,
             useValue: {
-              studentId$: of(123),
+              userId$: of(123),
               hasLessonTeacherRole$: of(false),
               hasStudentRole$: of(false),
             },

diff --git a/...app/dashboard/components/dashboard-timetable-table/dashboard-timetable-table.component.ts b/...app/dashboard/components/dashboard-timetable-table/dashboard-timetable-table.component.ts
@@ -3,7 +3,7 @@ import { Component, Inject, Input } from "@angular/core";
 import { TranslateModule } from "@ngx-translate/core";
 import { SETTINGS, Settings } from "src/app/settings";
 import { DashboardService } from "../../services/dashboard.service";
-import { DashboardTimetableEntry } from "../dashboard-timetable/dashboard-timetable.component";
+import { DashboardTimetableEntry } from "../../utils/dashboard-timetable-entry";
 
 @Component({
   selector: "bkd-dashboard-timetable-table",