Replace updateSortCriteria with setSorting in evaluate absences and t…

…est edit grades
bkd-mba-fbi · Feb 26, 2025 · 203c1e3 · 203c1e3
1 parent 8cbc8d8
commit 203c1e3
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 28 deletions.
diff --git a/...evaluate-absences/components/evaluate-absences-list/evaluate-absences-list.component.html b/...evaluate-absences/components/evaluate-absences-list/evaluate-absences-list.component.html
@@ -38,9 +38,7 @@ <h1>{{ "evaluate-absences.title" | translate }}</h1>
                     "
                     [sortKey]="column.key"
                     [sortCriteria]="sortCriteria"
-                    (sortCriteriaChange)="
-                      state.sortService.updateSortCriteria($event)
-                    "
+                    (sortCriteriaChange)="state.sortService.setSorting($event)"
                     [ngClass]="column.label"
                     [ngbTooltip]="
                       'evaluate-absences.list.header.' + column.label

diff --git a/src/app/events/components/test-edit-grades-header/test-edit-grades-header.component.html b/src/app/events/components/test-edit-grades-header/test-edit-grades-header.component.html
@@ -50,7 +50,7 @@
       [label]="'tests.student.name' | translate"
       [sortKey]="'FullName'"
       [sortCriteria]="sortCriteria"
-      (sortCriteriaChange)="state.updateSortCriteria($event)"
+      (sortCriteriaChange)="state.setSorting($event)"
     >
     </bkd-sortable-header>
   </th>
@@ -63,7 +63,7 @@
       [label]="'tests.grade' | translate"
       [sortKey]="'FinalGrade'"
       [sortCriteria]="sortCriteria"
-      (sortCriteriaChange)="state.updateSortCriteria($event)"
+      (sortCriteriaChange)="state.setSorting($event)"
     >
     </bkd-sortable-header>
   </th>
@@ -74,7 +74,7 @@
       [label]="'tests.mean' | translate"
       [sortKey]="'TestsMean'"
       [sortCriteria]="sortCriteria"
-      (sortCriteriaChange)="state.updateSortCriteria($event)"
+      (sortCriteriaChange)="state.setSorting($event)"
     >
     </bkd-sortable-header>
   </th>
@@ -95,7 +95,7 @@
             [label]="'tests.grade' | translate"
             [sortKey]="'Test-' + test.Id"
             [sortCriteria]="sortCriteria"
-            (sortCriteriaChange)="state.updateSortCriteria($any($event))"
+            (sortCriteriaChange)="state.setSorting($any($event))"
           >
           </bkd-sortable-header>
         </div>

diff --git a/src/app/events/services/events-students-state.service.ts b/src/app/events/services/events-students-state.service.ts
@@ -135,6 +135,10 @@ export class EventsStudentsStateService {
     { initialValue: [] },
   );
 
+  updateSortCriteria(newCriteria: SortCriteria<PrimarySortKey>): void {
+    this.sortCriteria.set(newCriteria);
+  }
+
   private loadEventSummary(eventId: number): Observable<Option<EventSummary>> {
     return this.loadingService.load(
       this.eventsService.getEventSummary(eventId),
@@ -164,10 +168,6 @@ export class EventsStudentsStateService {
     );
   }
 
-  updateSortCriteria(newCriteria: SortCriteria<PrimarySortKey>): void {
-    this.sortCriteria.set(newCriteria);
-  }
-
   private loadStudyCourseStudents({
     Id: eventId,
     Designation: eventDesignation,

diff --git a/src/app/events/services/test-state.service.ts b/src/app/events/services/test-state.service.ts
@@ -243,10 +243,6 @@ export class TestStateService {
     this.expandedHeaderSubject$.next(expanded);
   }
 
-  updateSortCriteria(newCriteria: SortCriteria<StudentGradesSortKey>): void {
-    this.sortService.updateSortCriteria(newCriteria);
-  }
-
   /**
    * Optimistically updates the local state before saving. Returns the original
    * value of the affected test result to be used with `saveGrade`, such that we

diff --git a/src/app/open-absences/services/open-absences.service.ts b/src/app/open-absences/services/open-absences.service.ts
@@ -62,10 +62,6 @@ export class OpenAbsencesService implements IConfirmAbsencesService {
     ascending: false,
   });
 
-  updateSortCriteria(newCriteria: SortCriteria<PrimarySortKey>): void {
-    this.sortCriteriaSubject$.next(newCriteria);
-  }
-
   sortCriteria$ = this.sortCriteriaSubject$.asObservable();
   sortedEntries$ = combineLatest([this.entries$, this.sortCriteria$]).pipe(
     map(spread(sortOpenAbsencesEntries)),
@@ -104,6 +100,10 @@ export class OpenAbsencesService implements IConfirmAbsencesService {
     );
   }
 
+  updateSortCriteria(newCriteria: SortCriteria<PrimarySortKey>): void {
+    this.sortCriteriaSubject$.next(newCriteria);
+  }
+
   get confirmBackLink(): Parameters<Router["navigate"]>[0] {
     if (this.currentDetail) {
       return [

diff --git a/...pp/presence-control/components/presence-control-group/presence-control-group.component.ts b/...pp/presence-control/components/presence-control-group/presence-control-group.component.ts
@@ -76,11 +76,6 @@ export class PresenceControlGroupComponent implements OnInit {
     primarySortKey: "name",
     ascending: true,
   });
-
-  updateSortCriteria(newCriteria: SortCriteria<PrimarySortKey>): void {
-    this.sortCriteriaSubject$.next(newCriteria);
-  }
-
   sortCriteria$ = this.sortCriteriaSubject$.asObservable();
 
   sortedEntries$ = combineLatest([
@@ -170,4 +165,8 @@ export class PresenceControlGroupComponent implements OnInit {
       ),
     );
   }
+
+  updateSortCriteria(newCriteria: SortCriteria<PrimarySortKey>): void {
+    this.sortCriteriaSubject$.next(newCriteria);
+  }
 }
diff --git a/src/app/shared/services/sort.service.ts b/src/app/shared/services/sort.service.ts
@@ -14,10 +14,6 @@ export class SortService<TPrimarySortKey extends SortKey> {
     Option<SortCriteria<TPrimarySortKey>>
   >(null);
 
-  updateSortCriteria(newCriteria: SortCriteria<TPrimarySortKey>): void {
-    this.sortingSubject$.next(newCriteria);
-  }
-
   sorting$ = this.sortingSubject$.asObservable().pipe(
     distinctUntilChanged(isEqual), // Only cause a reload if the sorting changes
     shareReplay(1),