Display/sort lastname, firstname on students lists #712 #713

bkd-mba-fbi · Dec 16, 2024 · 6369eb2 · 6369eb2
1 parent 23ec8f5
commit 6369eb2
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 112 deletions.
diff --git a/...vents/components/events-students-course-entry/events-students-course-entry.component.html b/...vents/components/events-students-course-entry/events-students-course-entry.component.html
@@ -6,10 +6,10 @@
 ></bkd-avatar>
 <a
   class="name"
-  [title]="name()"
+  [title]="entry().name"
   [routerLink]="link()"
   [queryParams]="linkParams()"
-  >{{ name() }}</a
+  >{{ entry().name }}</a
 >
 <div class="study-class">
   {{ multipleStudyClasses() ? entry().studyClass : "" }}

diff --git a/...ts/components/events-students-course-entry/events-students-course-entry.component.spec.ts b/...ts/components/events-students-course-entry/events-students-course-entry.component.spec.ts
@@ -19,8 +19,7 @@ describe("EventsStudentsCourseEntryComponent", () => {
 
     fixture.componentRef.setInput("entry", {
       id: 1,
-      firstName: "Jane",
-      lastName: "Doe",
+      name: "Doe Jane",
       email: "jane.doe@example.com",
       studyClass: "26a",
       company: "Coop Genossenschaft",
@@ -31,7 +30,7 @@ describe("EventsStudentsCourseEntryComponent", () => {
 
   it("renders firstname/lastname with link to dossier including returnlink", () => {
     const link = element.querySelector<HTMLAnchorElement>("a.name");
-    expect(link?.textContent).toContain("Jane Doe");
+    expect(link?.textContent).toContain("Doe Jane");
     expect(link?.href).toContain(
       "student/1/absences?returnparams=returnlink%3D%252Fevents%252Fcurrent",
     );

diff --git a/.../events/components/events-students-course-entry/events-students-course-entry.component.ts b/.../events/components/events-students-course-entry/events-students-course-entry.component.ts
@@ -21,10 +21,6 @@ export class EventsStudentsCourseEntryComponent {
   multipleStudyClasses = input(false);
   returnLink = input<Option<string>>(null);
 
-  name = computed<string>(
-    () => `${this.entry().firstName} ${this.entry().lastName}`,
-  );
-
   link = computed<RouterLink["routerLink"]>(() => [
     "student",
     this.entry().id,

diff --git a/src/app/events/components/events-students-list/events-students-list.component.spec.ts b/src/app/events/components/events-students-list/events-students-list.component.spec.ts
@@ -38,32 +38,28 @@ describe("EventsStudentsListComponent", () => {
               const entries: ReadonlyArray<StudentEntry> = [
                 {
                   id: 10,
-                  firstName: "Paul",
-                  lastName: "McCartney",
+                  name: "McCartney Paul",
                   email: "paul.mccartney@example.com",
                   studyClass: "26a",
                   company: "Apple Records – Abbey Road Studios",
                 },
                 {
                   id: 20,
-                  firstName: "John",
-                  lastName: "Lennon",
+                  name: "Lennon John",
                   email: "john.lennon@example.com",
                   studyClass: "26a",
                   company: undefined,
                 },
                 {
                   id: 30,
-                  firstName: "George",
-                  lastName: "Harrison",
+                  name: "Harrison George",
                   email: "george.harrison@example.com",
                   studyClass: "26c",
                   company: undefined,
                 },
                 {
                   id: 40,
-                  firstName: "Ringo",
-                  lastName: "Starr",
+                  name: "Starr Ringo",
                   email: "ringo.starr@example.com",
                   studyClass: "26c",
                   company: undefined,
@@ -104,10 +100,10 @@ describe("EventsStudentsListComponent", () => {
         element.querySelector("bkd-events-students-course-list"),
       ).not.toBeNull();
       expect(element.querySelector("h1")?.textContent).toContain("English-S3");
-      expect(element.textContent).toContain("Paul McCartney");
-      expect(element.textContent).toContain("John Lennon");
-      expect(element.textContent).toContain("George Harrison");
-      expect(element.textContent).toContain("Ringo Starr");
+      expect(element.textContent).toContain("McCartney Paul");
+      expect(element.textContent).toContain("Lennon John");
+      expect(element.textContent).toContain("Harrison George");
+      expect(element.textContent).toContain("Starr Ringo");
     });
 
     it("renders placeholder if no entries are available", () => {
@@ -129,10 +125,10 @@ describe("EventsStudentsListComponent", () => {
         element.querySelector("bkd-events-students-study-course-list"),
       ).not.toBeNull();
       expect(element.querySelector("h1")?.textContent).toContain("English-S3");
-      expect(element.textContent).toContain("Paul McCartney");
-      expect(element.textContent).toContain("John Lennon");
-      expect(element.textContent).toContain("George Harrison");
-      expect(element.textContent).toContain("Ringo Starr");
+      expect(element.textContent).toContain("McCartney Paul");
+      expect(element.textContent).toContain("Lennon John");
+      expect(element.textContent).toContain("Harrison George");
+      expect(element.textContent).toContain("Starr Ringo");
     });
 
     it("renders placeholder if no entries are available", () => {

diff --git a/...ents/events-students-study-course-entry/events-students-study-course-entry.component.html b/...ents/events-students-study-course-entry/events-students-study-course-entry.component.html
@@ -1,4 +1,4 @@
 <a class="name" [routerLink]="link()" [queryParams]="linkParams()">{{
-  name()
+  entry().name
 }}</a>
 <div class="status">{{ entry().status }}</div>
diff --git a/...s/events-students-study-course-entry/events-students-study-course-entry.component.spec.ts b/...s/events-students-study-course-entry/events-students-study-course-entry.component.spec.ts
@@ -17,8 +17,7 @@ describe("EventsStudentsStudyCourseEntryComponent", () => {
     element = fixture.debugElement.nativeElement;
     fixture.componentRef.setInput("entry", {
       id: 1,
-      firstName: "Jane",
-      lastName: "Doe",
+      name: "Doe Jane",
       email: "jane.doe@example.com",
       studyClasses: ["26a", "26c"],
       company: "Coop Genossenschaft",
@@ -33,7 +32,7 @@ describe("EventsStudentsStudyCourseEntryComponent", () => {
 
   it("renders firstname/lastname with link to dossier including returnlink", () => {
     const link = element.querySelector<HTMLAnchorElement>("a.name");
-    expect(link?.textContent).toBe("Jane Doe");
+    expect(link?.textContent).toBe("Doe Jane");
     expect(link?.href).toContain(
       "student/1/absences?returnparams=returnlink%3D%252Fevents%252Fcurrent",
     );

diff --git a/...onents/events-students-study-course-entry/events-students-study-course-entry.component.ts b/...onents/events-students-study-course-entry/events-students-study-course-entry.component.ts
@@ -19,9 +19,6 @@ export class EventsStudentsStudyCourseEntryComponent {
   entry = input.required<StudentEntry>();
   returnLink = input<Option<string>>(null);
 
-  name = computed<string>(
-    () => `${this.entry().firstName} ${this.entry().lastName}`,
-  );
   link = computed<RouterLink["routerLink"]>(() => [
     "student",
     this.entry().id,