Filter available categories to get active categories

bkd-mba-fbi · May 5, 2020 · 82def49 · 82def49
1 parent 0846fa5
commit 82def49
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/src/app/edit-absences/components/edit-absences-edit/edit-absences-edit.component.html b/src/app/edit-absences/components/edit-absences-edit/edit-absences-edit.component.html
@@ -1,7 +1,8 @@
 <div
   class="erz-container erz-container-padding-y"
   *erzLet="{
-    confirmationStates: confirmationStates$ | async
+    confirmationStates: confirmationStates$ | async,
+    categories: activeCategories$ | async
   } as data"
 >
   <form
@@ -14,7 +15,10 @@
     </div>
 
     <div class="form-group pb-4">
-      <div *ngFor="let category of categories" class="form-check mt-2 mb-3">
+      <div
+        *ngFor="let category of data.categories"
+        class="form-check mt-2 mb-3"
+      >
         <input
           type="radio"
           class="form-check-input"

diff --git a/src/app/edit-absences/components/edit-absences-edit/edit-absences-edit.component.ts b/src/app/edit-absences/components/edit-absences-edit/edit-absences-edit.component.ts
@@ -68,9 +68,10 @@ export class EditAbsencesEditComponent implements OnInit, OnDestroy {
     startWith([])
   );
 
-  categories = [
+  availableCategories = [
     Category.Absent,
     Category.Dispensation,
+    Category.HalfDay,
     Category.Late,
     Category.Present,
   ];
@@ -83,7 +84,17 @@ export class EditAbsencesEditComponent implements OnInit, OnDestroy {
     .getConfirmationTypes()
     .pipe(map(sortPresenceTypes), shareReplay(1));
 
-  presenceTypes$ = this.presenceTypesService.getList().pipe(shareReplay(1));
+  // Remove Category HalfDay if the corresponding PresenceType is inactive
+  activeCategories$ = this.presenceTypesService.getList().pipe(
+    map((types) =>
+      Boolean(types.find((t) => isHalfDay(t, this.settings))?.Active)
+    ),
+    map((isActive) =>
+      isActive
+        ? this.availableCategories
+        : this.availableCategories.filter((c) => c !== Category.HalfDay)
+    )
+  );
 
   private destroy$ = new Subject<void>();
 
@@ -120,19 +131,6 @@ export class EditAbsencesEditComponent implements OnInit, OnDestroy {
         .pipe(takeUntil(this.destroy$))
         .subscribe(this.updateAbsenceTypeIdDisabled.bind(this));
     }
-
-    // Add Category HalfDay if the corresponding PresenceType is active
-    this.presenceTypes$
-      .pipe(
-        map((types) =>
-          Boolean(types.find((t) => isHalfDay(t, this.settings))?.Active)
-        )
-      )
-      .subscribe((activeHalfDay) => {
-        if (activeHalfDay) {
-          this.categories.push(Category.HalfDay);
-        }
-      });
   }
 
   ngOnDestroy(): void {