-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Display & sort by lastname, firstname - Remove heading margin - Adjust margin after header - Use ';' as emails separator in mailto link - Show companies on class list as well - Rename search placeholder - Invert study course list sort arrow - Visit dossier addresses instead of absences tab - Switch presence control grid from breakpoints to CSS grid
- Loading branch information
Showing
18 changed files
with
150 additions
and
151 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,8 +19,7 @@ describe("EventsStudentsCourseEntryComponent", () => { | |
|
||
fixture.componentRef.setInput("entry", { | ||
id: 1, | ||
firstName: "Jane", | ||
lastName: "Doe", | ||
name: "Doe Jane", | ||
email: "[email protected]", | ||
studyClass: "26a", | ||
company: "Coop Genossenschaft", | ||
|
@@ -31,9 +30,9 @@ 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", | ||
"student/1/addresses?returnparams=returnlink%3D%252Fevents%252Fcurrent", | ||
); | ||
}); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
src/app/events/components/events-students-header/events-students-header.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,32 +38,28 @@ describe("EventsStudentsListComponent", () => { | |
const entries: ReadonlyArray<StudentEntry> = [ | ||
{ | ||
id: 10, | ||
firstName: "Paul", | ||
lastName: "McCartney", | ||
name: "McCartney Paul", | ||
email: "[email protected]", | ||
studyClass: "26a", | ||
company: "Apple Records – Abbey Road Studios", | ||
}, | ||
{ | ||
id: 20, | ||
firstName: "John", | ||
lastName: "Lennon", | ||
name: "Lennon John", | ||
email: "[email protected]", | ||
studyClass: "26a", | ||
company: undefined, | ||
}, | ||
{ | ||
id: 30, | ||
firstName: "George", | ||
lastName: "Harrison", | ||
name: "Harrison George", | ||
email: "[email protected]", | ||
studyClass: "26c", | ||
company: undefined, | ||
}, | ||
{ | ||
id: 40, | ||
firstName: "Ringo", | ||
lastName: "Starr", | ||
name: "Starr Ringo", | ||
email: "[email protected]", | ||
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", () => { | ||
|
2 changes: 1 addition & 1 deletion
2
...ents/events-students-study-course-entry/events-students-study-course-entry.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
<a class="name" [routerLink]="link()" [queryParams]="linkParams()">{{ | ||
name() | ||
entry().name | ||
}}</a> | ||
<div class="status">{{ entry().status }}</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,8 +17,7 @@ describe("EventsStudentsStudyCourseEntryComponent", () => { | |
element = fixture.debugElement.nativeElement; | ||
fixture.componentRef.setInput("entry", { | ||
id: 1, | ||
firstName: "Jane", | ||
lastName: "Doe", | ||
name: "Doe Jane", | ||
email: "[email protected]", | ||
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", | ||
); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.