+@if (state.isFilterValid$ | async) {
+ @if (state.loading$ | async) {
+
+ @if (entries && entries.length > 0) {
+
-
-
-
-
-
-
-
-
-
-
+ } @else {
+
+
-
-
+
-
-
-
-
-
-
-
- {{ category.icon }}
-
-
- {{ entry.EventDesignation
- }}, {{ entry.StudyClassNumber }}
-
-
- {{ entry.LessonDateTimeFrom | date: "HH:mm" }}–{{
- entry.LessonDateTimeTo | date: "HH:mm"
- }}
-
-
- {{ entry.TeacherInformation }}
-
-
- {{ presenceTypeDesignation }}
+
-
+ {{ "my-absences.report.list.all" | translate }}
+
+
-
-
- {{ entry.LessonDateTimeFrom | date: "dd.MM.yyyy" }}
-
-
- {{ entry.LessonDateTimeFrom | bkdDaysDifference }}
-
-
- {{ entry.LessonDateTimeFrom | date: "dd.MM.yyyy" }},
- {{ entry.LessonDateTimeFrom | bkdDaysDifference }}
+ @for (entry of entries; track entry.Id) {
+
+ @let category = getPresenceCategory(entry) | async;
+ @if (!category) {
+
+ }
+
+
+ } @else {
+
+ {{ category.icon }}
+
+ }
+
+ {{ entry.EventDesignation }}
+ @if (entry.StudyClassNumber) {
+ , {{ entry.StudyClassNumber }}
+ }
+
+
+ {{ entry.LessonDateTimeFrom | date: "HH:mm" }}–{{
+ entry.LessonDateTimeTo | date: "HH:mm"
+ }}
+
+
+ {{ entry.TeacherInformation }}
+
+ @let presenceTypeDesignation =
+ getPresenceTypeDesignation(entry) | async;
+ @if (presenceTypeDesignation) {
+
+ {{ presenceTypeDesignation }}
+
+ }
+
+ {{ entry.LessonDateTimeFrom | date: "dd.MM.yyyy" }}
+
+
+ {{ entry.LessonDateTimeFrom | bkdDaysDifference }}
+
+
+ {{ entry.LessonDateTimeFrom | date: "dd.MM.yyyy" }},
+ {{ entry.LessonDateTimeFrom | bkdDaysDifference }}
+
+ - {{ "my-absences.report.no-entries" | translate }} -
-{{ "my-absences.report.no-filter" | translate }}
-+ {{ "my-absences.report.no-entries" | translate }} +
+ } + } +} @else { +{{ "my-absences.report.no-filter" | translate }}
+} diff --git a/src/app/my-absences/components/my-absences-report-list/my-absences-report-list.component.ts b/src/app/my-absences/components/my-absences-report-list/my-absences-report-list.component.ts index d98c18dd7..403bae85e 100644 --- a/src/app/my-absences/components/my-absences-report-list/my-absences-report-list.component.ts +++ b/src/app/my-absences/components/my-absences-report-list/my-absences-report-list.component.ts @@ -1,4 +1,4 @@ -import { AsyncPipe, DatePipe, NgFor, NgIf } from "@angular/common"; +import { AsyncPipe, DatePipe } from "@angular/common"; import { AfterViewInit, ChangeDetectionStrategy, @@ -24,7 +24,6 @@ import { ScrollPositionService } from "src/app/shared/services/scroll-position.s import { parseISOLocalDate } from "src/app/shared/utils/date"; import { not } from "src/app/shared/utils/filter"; import { SpinnerComponent } from "../../../shared/components/spinner/spinner.component"; -import { LetDirective } from "../../../shared/directives/let.directive"; import { DaysDifferencePipe } from "../../../shared/pipes/days-difference.pipe"; import { MyAbsencesReportSelectionService } from "../../services/my-absences-report-selection.service"; import { @@ -40,11 +39,8 @@ import { MyAbsencesReportHeaderComponent } from "../my-absences-report-header/my changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - LetDirective, MyAbsencesReportHeaderComponent, - NgIf, RouterLink, - NgFor, SpinnerComponent, AsyncPipe, DatePipe, diff --git a/src/app/my-absences/components/my-absences-show/my-absences-show.component.html b/src/app/my-absences/components/my-absences-show/my-absences-show.component.html index 4a6e9b9ab..0bd41387f 100644 --- a/src/app/my-absences/components/my-absences-show/my-absences-show.component.html +++ b/src/app/my-absences/components/my-absences-show/my-absences-show.component.html @@ -1,9 +1,6 @@ -
+@let absenceCounts = myAbsencesService.counts$ | async;
+
+
({{ data.absenceCounts.checkableAbsences }})
-
+ @if (absenceCounts?.checkableAbsences !== null) {
+ ({{ absenceCounts?.checkableAbsences }})
+ }
{{ "my-absences.title" | translate }}
{{ "my-absences.description" | translate }}
@@ -33,9 +30,9 @@ {{ "my-absences.title" | translate }}
(click)="checkableAbsences.toggle()" > {{ "shared.profile.checkable-absences" | translate }} -
@@ -56,9 +53,9 @@ ({{ data.absenceCounts.openAbsences }})
-
+ @if (absenceCounts?.openAbsences !== null) {
+ ({{ absenceCounts?.openAbsences }})
+ }
{{ "my-absences.title" | translate }}
(click)="openAbsences.toggle()" > {{ "shared.profile.open-absences" | translate }} -
@@ -84,9 +81,9 @@ ({{ data.absenceCounts.excusedAbsences }})
-
+ @if (absenceCounts?.excusedAbsences !== null) {
+ ({{ absenceCounts?.excusedAbsences }})
+ }
{{ "my-absences.title" | translate }}
(click)="excusedAbsences.toggle()" > {{ "shared.profile.excused-absences" | translate }} -
@@ -107,9 +104,9 @@ ({{ data.absenceCounts.unexcusedAbsences }})
-
+ @if (absenceCounts?.unexcusedAbsences !== null) {
+ ({{ absenceCounts?.unexcusedAbsences }})
+ }
{{ "my-absences.title" | translate }}
(click)="unexcusedAbsences.toggle()" > {{ "shared.profile.unexcused-absences" | translate }} -
@@ -131,9 +128,9 @@ ({{ data.absenceCounts.incidents }})
-
+ @if (absenceCounts?.incidents !== null) {
+ ({{ absenceCounts?.incidents }})
+ }
{{ "my-absences.title" | translate }}
(click)="incidents.toggle()" > {{ "shared.profile.incidents" | translate }} -
diff --git a/src/app/my-absences/components/my-absences-show/my-absences-show.component.ts b/src/app/my-absences/components/my-absences-show/my-absences-show.component.ts
index a7dd0119d..a90892c3e 100644
--- a/src/app/my-absences/components/my-absences-show/my-absences-show.component.ts
+++ b/src/app/my-absences/components/my-absences-show/my-absences-show.component.ts
@@ -1,4 +1,4 @@
-import { AsyncPipe, NgIf } from "@angular/common";
+import { AsyncPipe } from "@angular/common";
import { ChangeDetectionStrategy, Component } from "@angular/core";
import {
NgbAccordionBody,
@@ -20,7 +20,6 @@ import {
import { ReportsLinkComponent } from "../../../shared/components/reports-link/reports-link.component";
import { StudentDossierAbsencesComponent } from "../../../shared/components/student-dossier/student-dossier-absences/student-dossier-absences.component";
import { StudentDossierEntryHeaderComponent } from "../../../shared/components/student-dossier/student-dossier-entry-header/student-dossier-entry-header.component";
-import { LetDirective } from "../../../shared/directives/let.directive";
import { LessonAbsence } from "../../../shared/models/lesson-absence.model";
import { LessonIncident } from "../../../shared/models/lesson-incident.model";
import { MyAbsencesService } from "../../services/my-absences.service";
@@ -33,7 +32,6 @@ import { MyAbsencesReportLinkComponent } from "../my-absences-report-link/my-abs
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [
- LetDirective,
ReportsLinkComponent,
NgbAccordionDirective,
NgbAccordionItem,
@@ -43,7 +41,6 @@ import { MyAbsencesReportLinkComponent } from "../my-absences-report-link/my-abs
NgbAccordionCollapse,
NgbAccordionBody,
StudentDossierEntryHeaderComponent,
- NgIf,
StudentDossierAbsencesComponent,
AsyncPipe,
TranslateModule,
diff --git a/src/app/my-grades/components/my-grades-show/my-grades-show.component.html b/src/app/my-grades/components/my-grades-show/my-grades-show.component.html
index 6e0851640..44f659b05 100644
--- a/src/app/my-grades/components/my-grades-show/my-grades-show.component.html
+++ b/src/app/my-grades/components/my-grades-show/my-grades-show.component.html
@@ -1,22 +1,18 @@
-
+@let courses = myGradesService.studentCoursesSorted$ | async;
+@let studentId = myGradesService.studentId$ | async;
+@let gradingScales = myGradesService.gradingScales$ | async;
+
+
+ @if (myGradesService.loading$ | async) {
+ } @else {
+
{{ "my-grades.title" | translate }}
+@let formGroup = formGroup$ | async;
+@let student = student$ | async;
+
+