Move student list under /events/current #712 #713

bkd-mba-fbi · Dec 17, 2024 · 0283d0a · 0283d0a
1 parent 5d356d9
commit 0283d0a
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 39 deletions.
diff --git a/src/app/dashboard/components/dashboard-timetable/dashboard-timetable.component.spec.ts b/src/app/dashboard/components/dashboard-timetable/dashboard-timetable.component.spec.ts
@@ -172,7 +172,7 @@ describe("DashboardTimetableComponent", () => {
       let link = rows[0].querySelector("td.subject a");
       expect(link?.textContent?.trim()).toBe("Mathematik, 9a");
       expect(link?.getAttribute("href")).toBe(
-        "/events/students/10?returnlink=%252Fdashboard",
+        "/events/current/10?returnlink=%252Fdashboard",
       );
 
       expect(rows[0].querySelector("td.study-class")?.textContent).toContain(
@@ -192,7 +192,7 @@ describe("DashboardTimetableComponent", () => {
       link = rows[1].querySelector("td.subject a");
       expect(link?.textContent?.trim()).toBe("Zeichnen, 8c");
       expect(link?.getAttribute("href")).toBe(
-        "/events/students/20?returnlink=%252Fdashboard",
+        "/events/current/20?returnlink=%252Fdashboard",
       );
 
       expect(rows[1].querySelector("td.study-class")?.textContent).toContain(

diff --git a/...nts-current/events-current.component.html → ...t-list/events-current-list.component.html b/...nts-current/events-current.component.html → ...t-list/events-current-list.component.html
diff --git a/...nts-current/events-current.component.scss → ...t-list/events-current-list.component.scss b/...nts-current/events-current.component.scss → ...t-list/events-current-list.component.scss
diff --git a/src/app/events/components/events-current-list/events-current-list.component.spec.ts b/src/app/events/components/events-current-list/events-current-list.component.spec.ts
@@ -0,0 +1,42 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { StorageService } from "src/app/shared/services/storage.service";
+import { buildTestModuleMetadata } from "src/spec-helpers";
+import { EventsCurrentListComponent } from "./events-current-list.component";
+
+describe("EventsCurrentListComponent", () => {
+  let component: EventsCurrentListComponent;
+  let fixture: ComponentFixture<EventsCurrentListComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule(
+      buildTestModuleMetadata({
+        imports: [EventsCurrentListComponent],
+        providers: [
+          {
+            provide: StorageService,
+            useValue: {
+              getPayload() {
+                return {
+                  culture_info: "",
+                  fullname: "",
+                  id_person: "123",
+                  holder_id: "",
+                  instance_id: "",
+                  roles: "",
+                };
+              },
+            },
+          },
+        ],
+      }),
+    ).compileComponents();
+
+    fixture = TestBed.createComponent(EventsCurrentListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/events/components/events-current-list/events-current-list.component.ts b/src/app/events/components/events-current-list/events-current-list.component.ts
@@ -0,0 +1,13 @@
+import { ChangeDetectionStrategy, Component } from "@angular/core";
+import { TranslateModule } from "@ngx-translate/core";
+import { EventsListComponent } from "../events-list/events-list.component";
+
+@Component({
+  selector: "bkd-events-current-list",
+  standalone: true,
+  imports: [EventsListComponent, TranslateModule],
+  templateUrl: "./events-current-list.component.html",
+  styleUrl: "./events-current-list.component.scss",
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class EventsCurrentListComponent {}
diff --git a/src/app/events/components/events-current/events-current.component.spec.ts b/src/app/events/components/events-current/events-current.component.spec.ts
@@ -1,5 +1,4 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { StorageService } from "src/app/shared/services/storage.service";
 import { buildTestModuleMetadata } from "../../../../spec-helpers";
 import { EventsCurrentComponent } from "./events-current.component";
 
@@ -11,23 +10,6 @@ describe("EventsCurrentComponent", () => {
     await TestBed.configureTestingModule(
       buildTestModuleMetadata({
         imports: [EventsCurrentComponent],
-        providers: [
-          {
-            provide: StorageService,
-            useValue: {
-              getPayload() {
-                return {
-                  culture_info: "",
-                  fullname: "",
-                  id_person: "123",
-                  holder_id: "",
-                  instance_id: "",
-                  roles: "",
-                };
-              },
-            },
-          },
-        ],
       }),
     ).compileComponents();
 

diff --git a/src/app/events/components/events-current/events-current.component.ts b/src/app/events/components/events-current/events-current.component.ts
@@ -1,13 +1,11 @@
 import { Component } from "@angular/core";
-import { TranslateModule } from "@ngx-translate/core";
-import { EventsListComponent } from "../events-list/events-list.component";
+import { RouterOutlet } from "@angular/router";
 
 @Component({
   selector: "bkd-events-current",
-  templateUrl: "./events-current.component.html",
-  styleUrls: ["./events-current.component.scss"],
+  template: `<router-outlet></router-outlet>`,
   standalone: true,
-  imports: [EventsListComponent, TranslateModule],
+  imports: [RouterOutlet],
 })
 export class EventsCurrentComponent {
   constructor() {}

diff --git a/src/app/events/events.routes.ts b/src/app/events/events.routes.ts
@@ -1,5 +1,6 @@
 import { Routes } from "@angular/router";
 import { dossierRoute } from "../shared/components/student-dossier/dossier-route";
+import { EventsCurrentListComponent } from "./components/events-current-list/events-current-list.component";
 import { EventsCurrentComponent } from "./components/events-current/events-current.component";
 import { EventsStudentsListComponent } from "./components/events-students-list/events-students-list.component";
 import { EventsStudentsComponent } from "./components/events-students/events-students.component";
@@ -22,13 +23,16 @@ export const EVENTS_ROUTES: Routes = [
       {
         path: "current",
         component: EventsCurrentComponent,
-      },
-      {
-        path: "students/:id",
-        component: EventsStudentsComponent,
         children: [
-          { path: "", component: EventsStudentsListComponent },
-          dossierRoute,
+          { path: "", component: EventsCurrentListComponent },
+          {
+            path: ":id",
+            component: EventsStudentsComponent,
+            children: [
+              { path: "", component: EventsStudentsListComponent },
+              dossierRoute,
+            ],
+          },
         ],
       },
       {

diff --git a/src/app/events/services/events-state.service.spec.ts b/src/app/events/services/events-state.service.spec.ts
@@ -81,7 +81,7 @@ describe("EventsStateService", () => {
       {
         id: 5,
         designation: "22a",
-        detailLink: "/events/students/5?returnlink=%2F",
+        detailLink: "/events/current/5?returnlink=%2F",
         studentCount: 0,
         state: null,
       },
@@ -92,7 +92,7 @@ describe("EventsStateService", () => {
       {
         id: 6,
         designation: "22b",
-        detailLink: "/events/students/6?returnlink=%2F",
+        detailLink: "/events/current/6?returnlink=%2F",
         studentCount: 0,
         state: EventState.Rating,
         evaluationText: "events.state.rating",
@@ -156,7 +156,7 @@ describe("EventsStateService", () => {
     const courseEvent: EventEntry = {
       id: 1,
       designation: "Physik, 22a, 22b",
-      detailLink: "/events/students/1?returnlink=%2F",
+      detailLink: "/events/current/1?returnlink=%2F",
       dateFrom: new Date("2022-02-09T00:00:00"),
       dateTo: new Date("2022-06-30T00:00:00"),
       studentCount: 20,
@@ -170,7 +170,7 @@ describe("EventsStateService", () => {
         ...courseEvent,
         id: 2,
         designation: "Bio, 22a",
-        detailLink: "/events/students/2?returnlink=%2F",
+        detailLink: "/events/current/2?returnlink=%2F",
         state: EventState.RatingUntil,
         evaluationText: "events.state.rating-until 03.06.2022",
         evaluationLink: "link-to-evaluation-module/2",
@@ -179,7 +179,7 @@ describe("EventsStateService", () => {
         ...courseEvent,
         id: 4,
         designation: "Franz, 22a, 22b",
-        detailLink: "/events/students/4?returnlink=%2F",
+        detailLink: "/events/current/4?returnlink=%2F",
         state: EventState.Tests,
         evaluationText: "events.state.add-tests",
       },
@@ -188,7 +188,7 @@ describe("EventsStateService", () => {
         ...courseEvent,
         id: 3,
         designation: "Zeichnen, 22b",
-        detailLink: "/events/students/3?returnlink=%2F",
+        detailLink: "/events/current/3?returnlink=%2F",
         state: EventState.IntermediateRating,
         evaluationText: "events.state.intermediate-rating",
         evaluationLink: "link-to-evaluation-module/3",
@@ -214,7 +214,7 @@ describe("EventsStateService", () => {
         id: 10,
         designation: "Zentraler Gymnasialer Bildungsgang",
         studentCount: 3,
-        detailLink: "/events/students/10?returnlink=%2F",
+        detailLink: "/events/current/10?returnlink=%2F",
         state: null,
       },
     ];

diff --git a/src/app/events/utils/events-students.ts b/src/app/events/utils/events-students.ts
@@ -15,7 +15,7 @@ export function getEventsStudentsLink(
   const query = new URLSearchParams(
     returnLink ? { returnlink: returnLink } : {},
   );
-  return `/events/students/${eventId}?${query}`;
+  return `/events/current/${eventId}?${query}`;
 }
 
 export function convertCourseToStudentEntries(course: Course): StudentEntries {