From 8c307962339ba8a64dd86ba654fadfced82aabbd Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Wed, 3 Apr 2024 01:08:15 +0800 Subject: [PATCH 1/6] dev: Use new angular syntax for select spotting elements Signed-off-by: Kwong Tung Nan --- .../spotting-form.component.html | 489 ++++++++++-------- src/app/spotting/spotting-main.component.html | 118 +++-- .../inline-history.component.html | 133 ++--- .../spotting-table.component.html | 227 ++++---- .../vehicle-type-container.component.html | 112 ++-- 5 files changed, 582 insertions(+), 497 deletions(-) diff --git a/src/app/spotting/spotting-form/spotting-form.component.html b/src/app/spotting/spotting-form/spotting-form.component.html index 35e70d06..ab7ae3dc 100644 --- a/src/app/spotting/spotting-form/spotting-form.component.html +++ b/src/app/spotting/spotting-form/spotting-form.component.html @@ -9,31 +9,28 @@ [nzLabelWrap]="true" >
- + @if (!(authService.userData | async)) { + + }
@@ -67,12 +64,13 @@ " (ngModelChange)="onLineChanges($event)" > - + @for (line of lineOptions; track line) { + + } @@ -94,34 +92,43 @@ (ngModelChange)="onVehicleChanges($event)" [nzFilterOption]="vehicleSearchFn" > - - -
- - {{ vehicle.name }} - - -
- - + @for ( + vehicle of vehicleType.vehicles; + track vehicle + ) { + +
+ + {{ vehicle.name }} + + @if (vehicle.status) { + + } +
+ + } + + } -
- - - - - It seems that you are trying to record a - vehicle that is either decommissioned, - married, out of service or unknown. Please - complete the sanity test below. - - - - - - - - -
+ + + + + +
+ } @@ -207,20 +216,24 @@ formControlName="status" (ngModelChange)="onChanges($event)" > - + @for (status of statusOptions; track status) { + + } - + @@ -238,16 +251,20 @@ formControlName="type" (ngModelChange)="onInputTypeChanged($event)" > - + @for ( + entryType of typeOptions; + track entryType + ) { + + } -
+ @if (showRunNumberInput) { Run Number -
+ } -
- - Altitude - - - - + @if (formGroup.value.type === "LOCATION") { + @if (formGroup.value.location.altitude) { + + Altitude + + + + + } - - Heading - - - - + @if (formGroup.value.location.heading) { + + Heading + + + + + } - - Speed - - - - + @if (formGroup.value.location.speed) { + + Speed + + + + + } - - Coordinates - - - - -
+ @if (formGroup.value.location.latitude) { + + Coordinates + + + + + } + } -
+ @if (formGroup.value.type == "BETWEEN_STATIONS") { Origin Station @@ -355,12 +389,16 @@ nzPlaceHolder="Source Station" formControlName="originStation" > - + @for ( + station of stationOptions; + track station + ) { + + } @@ -384,18 +422,22 @@ nzPlaceHolder="Destination Station" formControlName="destinationStation" > - + @for ( + station of stationOptions; + track station + ) { + + } -
+ } -
+ @if (formGroup.value.type == "AT_STATION") { At Station @@ -411,16 +453,20 @@ nzPlaceHolder="Station" formControlName="atStation" > - + @for ( + station of stationOptions; + track station + ) { + + } -
+ }
@@ -435,13 +481,15 @@ nzPlaceHolder="Wheel Status (Optional)" formControlName="wheelStatus" > - + @for ( + wheelStatus of wheelStatusOptions; + track wheelStatus + ) { + + } @@ -477,20 +525,19 @@
-
-
-
-
- As of Current Session, you added the following entries + @if ( + (authService.userData | async) && + (sessionHistoryService.historyStoreLength | async) + ) { +
+
+
+
+ As of Current Session, you added the following entries +
+
-
-
+ } diff --git a/src/app/spotting/spotting-main.component.html b/src/app/spotting/spotting-main.component.html index 8eb1c394..8227bf55 100644 --- a/src/app/spotting/spotting-main.component.html +++ b/src/app/spotting/spotting-main.component.html @@ -1,34 +1,34 @@
- - - - + @if (hadUpload) { + + @if ($totalCountIcon) { + + } + @if (($uploadPercentage | async) !== 100) { + + } + + }
- +@if (showLoading) { +
- - {{ colOption.header }} - + @for ( + colOption of dataTableOptions.columns; + track colOption.header + ) { + + {{ colOption.header }} + + } @@ -138,52 +145,56 @@

" (click)="toggleExpand(rowItem)" > - - - - - - - - - - - - - - - {{ rowItem[colOption.field] }} + @if (rowItem.$expandConfig.expandable) { + -
- {{ rowItem.nickname }} - + [class]=" + rowItem.$expandConfig?.expand + ? 'icon-chevron-down' + : 'icon-chevron-right' + " + > - {{ - rowItem[colOption.field] - }} - + } + @for ( + colOption of dataTableOptions.columns; + track colOption + ) { + + @switch (colOption.fieldType) { + @case ("status") { + + } + + @case ("wheelStatus") { + + } + + @case ("id") { + {{ rowItem[colOption.field] }} + @if (rowItem.nickname) { + +
+ {{ rowItem.nickname }} + + } + } + + @default { + {{ rowItem[colOption.field] }} + } + } + + } " > - - + @if (rowItem.incidentCount > 0) { + + } + @if (rowItem.timesSpotted > 0) { + + } diff --git a/src/app/spotting/vehicle-type-container/vehicle-type-container.component.html b/src/app/spotting/vehicle-type-container/vehicle-type-container.component.html index 5bd82eb4..b7a36eb0 100644 --- a/src/app/spotting/vehicle-type-container/vehicle-type-container.component.html +++ b/src/app/spotting/vehicle-type-container/vehicle-type-container.component.html @@ -1,55 +1,67 @@ - -
-
- - - - - -
- - -

- {{ title }} -

-
-
+@if (showLoading) { + +} @else { +
+
+ + + + + +
+ + +

+ {{ title }} +

+
+
-
- - - - +
+ + + + - | + | - - - - + @for (elem of tagListDisplayConfig; track elem) { + + + + + } +
-
+} -
- -
+@for (elem of tableData; track elem) { +
+ +
+} From 6422f44d82a851d0f7d03d4df57ea3f33ef7fd87 Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Wed, 3 Apr 2024 10:07:40 +0800 Subject: [PATCH 2/6] dev: Use new angular syntax for select elements Signed-off-by: Kwong Tung Nan --- .../spotting-image-list.component.html | 45 +-- .../spotting-type-cell-display.component.html | 153 +++++---- src/app/about/about.component.html | 71 ++-- .../avatar-card/avatar-card.component.html | 31 +- .../events-table/events-table.component.html | 302 ++++++++++-------- src/app/header/menu/menu.component.html | 92 +++--- .../image-drawer/image-drawer.component.html | 44 +-- .../spottings/spottings.component.html | 167 +++++----- 8 files changed, 474 insertions(+), 431 deletions(-) diff --git a/src/app/@ui/spotting-image-list/spotting-image-list.component.html b/src/app/@ui/spotting-image-list/spotting-image-list.component.html index 96770085..0c3ddd41 100644 --- a/src/app/@ui/spotting-image-list/spotting-image-list.component.html +++ b/src/app/@ui/spotting-image-list/spotting-image-list.component.html @@ -1,28 +1,29 @@ - - - - - + @if (imageSrcs.length > 0) { + + @for (src of imageSrcs; track src; let i = $index) { + + } + + } @else if (imageSrcs.length === 0 && !loading) { + + } + @if (isMine) {

Add Images

- + } diff --git a/src/app/@ui/spotting-type-cell-display/spotting-type-cell-display.component.html b/src/app/@ui/spotting-type-cell-display/spotting-type-cell-display.component.html index 9ba3b6c0..4f41c489 100644 --- a/src/app/@ui/spotting-type-cell-display/spotting-type-cell-display.component.html +++ b/src/app/@ui/spotting-type-cell-display/spotting-type-cell-display.component.html @@ -1,82 +1,93 @@

- - - {{ rowItem.location | coordinatesHumanizer : 3 }} - - - {{ rowItem.originStation.displayName }} - - - {{ rowItem.originStation.displayName }} -> - {{ rowItem.destinationStation.displayName }} - + @if (rowItem.location) { + + @if (showLocationPopover) { + + } + {{ rowItem.location | coordinatesHumanizer: 3 }} + + } @else if (rowItem.originStation) { + @if (rowItem.type == "AT_STATION") { + {{ rowItem.originStation.displayName }} + } @else if ( + rowItem.type == "BETWEEN_STATIONS" && rowItem.destinationStation + ) { + {{ rowItem.originStation.displayName }} -> + {{ rowItem.destinationStation.displayName }} + } + }
- - - - - - - - - - - - - - - + + + + + } +
Location: - {{ - rowItem.location - | coordinatesHumanizer : 3 : ["location-only"] - }} -
Accuracy:{{ rowItem.location.accuracy | beautifulDecimal }}m
Altitude: - {{ rowItem.location.altitude | beautifulDecimal }}m - ± + @if (rowItem.location) { + + + + + - - - - - - + rowItem.location + | coordinatesHumanizer: 3 : ["location-only"] + }} + + + + + + + + @if (rowItem.location.altitude) { + + + + + + } + @if (rowItem.location.heading) { + + + + + + } - - - - - -
Location: {{ - rowItem.location.altitudeAccuracy | beautifulDecimal - }}m -
Heading:{{ rowItem.location.heading | beautifulDecimal }}°
Accuracy:{{ rowItem.location.accuracy | beautifulDecimal }}m
Altitude: + {{ rowItem.location.altitude | beautifulDecimal }}m + @if (rowItem.location.altitudeAccuracy) { + ± + {{ + rowItem.location.altitudeAccuracy + | beautifulDecimal + }}m + } +
Heading:{{ rowItem.location.heading | beautifulDecimal }}°
Speed:{{ rowItem.location.speed * 3.6 | beautifulDecimal }} km/h
+ @if (rowItem.location.speed) { +
Speed: + {{ + rowItem.location.speed * 3.6 | beautifulDecimal + }} + km/h +
+ } diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index ac023813..997c8597 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -33,20 +33,15 @@

-
- - - -
+ @for (item of items?.projects; track item) { +
+ + @if (item.display) { + + } + +
+ }
@@ -82,21 +77,21 @@

About the team

-
- - - -
+ @for (item of items?.personnel; track item) { +
+ + @if (item.display) { + + } + +
+ }
@@ -111,17 +106,13 @@

Tech Stacks & Open Souce

-
- - - -
+ @for (item of items?.techStacks; track item) { +
+ + + +
+ }
diff --git a/src/app/about/avatar-card/avatar-card.component.html b/src/app/about/avatar-card/avatar-card.component.html index b029c1b3..66a0687a 100644 --- a/src/app/about/avatar-card/avatar-card.component.html +++ b/src/app/about/avatar-card/avatar-card.component.html @@ -5,21 +5,22 @@

{{ data.description }}

diff --git a/src/app/console/events-table/events-table.component.html b/src/app/console/events-table/events-table.component.html index c1609da3..7dbbf6ed 100644 --- a/src/app/console/events-table/events-table.component.html +++ b/src/app/console/events-table/events-table.component.html @@ -19,12 +19,14 @@ >

-
-
- Mark as Read -
+ @if (showCheckbox) { +
+
+ + Mark as Read + +
+ } - - {{ colOption.header }} - + @for ( + colOption of dataTableOptions.columns; + track colOption.header + ) { + + {{ colOption.header }} + + } @@ -59,142 +63,162 @@ dTableRow [ngClass]="{ 'table-row-selected': rowItem.$checked }" > - - - - - - - - -
- 🏃: {{ rowItem["runNumber"] }} -
-
- 🛞: - {{ - rowItem["wheelStatus"].replace("_", " ") - | titlecase - }} -
- - - - {{ rowItem[colOption.field] }} - - - - + @if (showCheckbox) { + + + + + } + + @for ( + colOption of dataTableOptions.columns; + track colOption + ) { + + @switch (colOption.fieldType) { + @case ("status") { + + @if (rowItem["runNumber"]) { +
+ 🏃: {{ rowItem["runNumber"] }} +
+ } + @if (rowItem["wheelStatus"]) { +
+ 🛞: + {{ + rowItem["wheelStatus"].replace( + "_", + " " + ) | titlecase + }} +
+ } + } + } + @switch (colOption.fieldType) { + @case ("id") { - {{ - rowItem[colOption.field][ - "nickname" - ] === "" - ? rowItem[colOption.field][ - "shortId" - ] - : rowItem[colOption.field][ - "nickname" - ] - }} + {{ rowItem[colOption.field] }} - + {{ + rowItem[colOption.field][ + "nickname" + ] === "" + ? rowItem[colOption.field][ + "shortId" + ] + : rowItem[colOption.field][ + "nickname" + ] + }} + + @if ( rowItem[colOption.field][ - 'nickname' - ] !== '' + "nickname" + ] !== "" + ) { + + {{ + rowItem[colOption.field][ + "shortId" + ] + }} + + } + } @else { + -- + } + } + + @case ("datetime") { + {{ + rowItem[colOption.field] + | date: "MMM dd, y" + }} +
+ {{ + rowItem[colOption.field] + | date: "HH:mm:ss" + }} + } + + @case ("vehicle") { + + } + + @case ("spottingType") { + - {{ - rowItem[colOption.field]["shortId"] - }} - - - - -- - - - - {{ - rowItem[colOption.field] | date: "MMM dd, y" - }} -
- {{ - rowItem[colOption.field] | date: "HH:mm:ss" - }} - - - - - - - - - - - - - - - {{ rowItem[colOption.field] }} - - {{ - rowItem[colOption.field] - }} - - + /> + } + + @case ("notes") { + @if ( + rowItem["mediaCount"] > 0 || + rowItem["isMine"] + ) { + + + + } + {{ rowItem[colOption.field] }} + } + + @default { + {{ rowItem[colOption.field] }} + } + } + + } diff --git a/src/app/header/menu/menu.component.html b/src/app/header/menu/menu.component.html index 457b2c79..de989d1a 100644 --- a/src/app/header/menu/menu.component.html +++ b/src/app/header/menu/menu.component.html @@ -1,34 +1,35 @@
-
- - - - {{ item.name }} - - - - {{ item.name }} - - -
+ @if (item.tag) { + + {{ item.name }} + + } @else { + {{ item.name }} + } + + } +
+ }
-
- -
+ @if (countIcon > 0 || hadUpload) { +
+ +
+ }
diff --git a/src/app/insiden/event-list/event-card/image-drawer/image-drawer.component.html b/src/app/insiden/event-list/event-card/image-drawer/image-drawer.component.html index 428d428c..a3422291 100644 --- a/src/app/insiden/event-list/event-card/image-drawer/image-drawer.component.html +++ b/src/app/insiden/event-list/event-card/image-drawer/image-drawer.component.html @@ -1,4 +1,7 @@ - +@if (loading) { +

Add Images

- - {{ colOption.header }} - + @for (colOption of dataTableOptions.columns; track colOption) { + {{ colOption.header }} + } @@ -31,84 +31,93 @@ dTableRow [ngClass]="{ 'table-row-selected': rowItem.$checked }" > - - - - - - 🏃‍♂️ {{ rowItem["runNumber"] }} - - - - - {{ rowItem[colOption.field] }} - + @for (colOption of dataTableOptions.columns; track colOption) { + + @switch (colOption.fieldType) { + @case ("status") { + + @if (rowItem["runNumber"]) { + + 🏃‍♂️ {{ rowItem["runNumber"] }} + + } + } - - - - {{ rowItem[colOption.field] | date : "MMM dd, y" }} -
- {{ rowItem[colOption.field] | date : "HH:mm:ss" }} - - - - - - - - - - - - - - - {{ rowItem[colOption.field] }} - - {{ - rowItem[colOption.field] - }} - - + {{ rowItem[colOption.field] }} + + + @if (rowItem.canDelete) { + + } + } + + @case ("datetime") { + {{ + rowItem[colOption.field] | date: "MMM dd, y" + }} +
+ {{ + rowItem[colOption.field] | date: "HH:mm:ss" + }} + } + + @case ("vehicle") { + + } + + @case ("spottingType") { + + } + + @case ("notes") { + @if ( + rowItem["mediaCount"] > 0 || + rowItem["isMine"] + ) { + + + + } + {{ rowItem[colOption.field] }} + } + + @default { + {{ rowItem[colOption.field] }} + } + } + + } From 35cae62ac1b3e0a0e57b1dc1d01515ce053a6d2a Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Wed, 3 Apr 2024 10:33:02 +0800 Subject: [PATCH 3/6] dev: Use new angular syntax for select elements, part 2 Signed-off-by: Kwong Tung Nan --- .../insiden/calendar/calendar.component.html | 92 ++++---- .../event-card/event-card.component.html | 91 ++++---- .../event-list/event-list.component.html | 92 ++++---- src/app/situasi/situasi.component.html | 203 +++++++++--------- 4 files changed, 246 insertions(+), 232 deletions(-) diff --git a/src/app/insiden/calendar/calendar.component.html b/src/app/insiden/calendar/calendar.component.html index 75380ee7..cc68c5cd 100644 --- a/src/app/insiden/calendar/calendar.component.html +++ b/src/app/insiden/calendar/calendar.component.html @@ -5,39 +5,39 @@ (nzPanelChange)="panelChange($event)" >
    - - + +
  • - - - + @for ( + item of monthEvents[ + (date | date: "yyyy-MM-dd") ?? "" + ] | keyvalue; + track item + ) { + @if (!item.value.isLongTerm) { + + } + }
  • - + @if (item.value.isLongTerm) { - + /> + }
    • @@ -67,24 +66,25 @@
- - - + + + @for ( + item of yearEvents[(month | date: "yyyy-MM") ?? ""] + | keyvalue; + track item + ) { + + } diff --git a/src/app/insiden/event-list/event-card/event-card.component.html b/src/app/insiden/event-list/event-card/event-card.component.html index 66147f58..af634745 100644 --- a/src/app/insiden/event-list/event-card/event-card.component.html +++ b/src/app/insiden/event-list/event-card/event-card.component.html @@ -19,32 +19,34 @@ displayData.stations.length > 0 " > - - + + @for (line of displayData.lines; track line) { + {{ line.displayName }} - - + } + + @if (displayData.vehicles.length > 0) { | - - {{ vehicle.identificationNo }} - - + @for ( + vehicle of displayData.vehicles; + track vehicle.identificationNo + ) { + + {{ vehicle.identificationNo }} + + } + } | - - {{ station.displayName }} - + @for ( + station of displayData.stations; + track station.displayName + ) { + + {{ station.displayName }} + + }
@@ -70,26 +72,27 @@ displayData.endDatetime ? false : loadingTemplate " > - - - {{ event.datetime | date: "YYYY-MM-dd HH:mm:ss" }} - - - - - - Source - - -
-
- + @for (event of displayData.chronologies; track event) { + + + {{ + event.datetime | date: "YYYY-MM-dd HH:mm:ss" + }} + + @if (event.sourceUrl) { + - + + Source + + } +
+
+ + } -
- Duration: {{ displayData.duration }} -
+ @if (displayData.duration) { +
Duration: {{ displayData.duration }}
+ }

-->
- Details + @if (displayData.hasDetails) { + Details + }
diff --git a/src/app/insiden/event-list/event-list.component.html b/src/app/insiden/event-list/event-list.component.html index 24118478..e1d33298 100644 --- a/src/app/insiden/event-list/event-list.component.html +++ b/src/app/insiden/event-list/event-list.component.html @@ -1,46 +1,56 @@ -

- {{ selectedDate | date : "MMM dd, yyyy (EEE)" }} -

-

- {{ selectedDate | date : "MMM yyyy" }} +

+ @switch (calendarMode) { + @case ("month") { + {{ selectedDate | date: "MMM dd, yyyy (EEE)" }} + } + + @case ("year") { + {{ selectedDate | date: "MMM yyyy" }} + } + }

- - - - - - -
-

Long term incidents

- - - - - - - - - -
+ @if (data.shortTerm.length > 0) { + + @for (cardData of data.shortTerm; track cardData) { + + + + } + + } - + @if (data.longTerm.length > 0) { +
+

Long term incidents

+ + + + @for (cardData of data.longTerm; track cardData) { + + + + } + + + +
+ } @else if (dataLength === 0 && !showLoading) { + + } diff --git a/src/app/situasi/situasi.component.html b/src/app/situasi/situasi.component.html index 9c7a9b8a..6722ea96 100644 --- a/src/app/situasi/situasi.component.html +++ b/src/app/situasi/situasi.component.html @@ -71,26 +71,25 @@
    • @@ -166,67 +164,72 @@ {{ item.displayText }} - - + @for (asset of menuAssets; track asset) { + + @if (item.displayText !== + asset.displayName) { +
  • + + {{ asset.displayName }} + +
    • + } +     + } + + } --> + }     From 2af3db5136601ac5c04f5cd9fa1617550878cb55 Mon Sep 17 00:00:00 2001 From: Kwong Tung Nan Date: Tue, 9 Apr 2024 11:27:20 +0800 Subject: [PATCH 4/6] dev: Use new angular syntax for select elements, part 3 Signed-off-by: Kwong Tung Nan --- .../action-list/action-list.component.html | 68 ++-- .../@ui/image-grid/image-grid.component.html | 60 +-- ...tting-line-calendar-heatmap.component.html | 4 +- ...ng-vehicle-calendar-heatmap.component.html | 4 +- .../form-upload/form-upload.component.html | 38 +- .../image-preview-button.component.html | 13 +- .../vehicle-status-history.component.html | 111 +++--- .../vehicle-table-cell-display.component.html | 13 +- .../verification-code-card.component.html | 41 +- src/app/app.component.html | 10 +- src/app/compliance/gdpr/gdpr.component.html | 59 +-- src/app/gallery/gallery.component.html | 44 +- src/app/header/header.component.html | 93 +++-- .../login-dropdown.component.html | 48 +-- .../insiden/calendar/calendar.component.html | 31 +- .../event-card/event-card.component.html | 176 ++++---- .../image-drawer/image-drawer.component.html | 2 +- src/app/profile/profile.component.html | 15 +- src/app/profile/user/user.component.html | 248 ++++++------ src/app/situasi/situasi.component.html | 375 +++++++++--------- .../vehicle-details.component.html | 7 +- .../situasi/vehicles/vehicles.component.html | 16 +- .../inline-timeline.component.html | 79 ++-- .../spotting-table.component.html | 170 ++++---- 24 files changed, 872 insertions(+), 853 deletions(-) diff --git a/src/app/@ui/action-list/action-list.component.html b/src/app/@ui/action-list/action-list.component.html index 0a7ec4d3..ae437143 100644 --- a/src/app/@ui/action-list/action-list.component.html +++ b/src/app/@ui/action-list/action-list.component.html @@ -1,38 +1,38 @@ - - - - - {{ hist.value["id"] }} - - - - {{ hist.value["vehicle"]["name"] }} - - - - - - - - - + @for ( + hist of sessionHistoryService.historyStore | async | keyvalue; + track hist.value + ) { + + @if (filter.includes(hist.value["historyType"])) { + + + + {{ hist.value["id"] }} + + - + {{ hist.value["vehicle"]["name"] }} + + + + + + + + + } + + } diff --git a/src/app/@ui/image-grid/image-grid.component.html b/src/app/@ui/image-grid/image-grid.component.html index 4f83f868..47d0c6ae 100644 --- a/src/app/@ui/image-grid/image-grid.component.html +++ b/src/app/@ui/image-grid/image-grid.component.html @@ -6,34 +6,38 @@ #gridContainer class="main-container {{ fillLastRow ? 'fill-last-row' : '' }}" > - - -
    - -     + class="child-container" + [id]="i" + > + @if (loading) { + + } +
    + @if (!displayImage[i]) { + + } + + }
    diff --git a/src/app/@ui/spotting-line-calendar-heatmap/spotting-line-calendar-heatmap.component.html b/src/app/@ui/spotting-line-calendar-heatmap/spotting-line-calendar-heatmap.component.html index d5e5c401..423c8829 100644 --- a/src/app/@ui/spotting-line-calendar-heatmap/spotting-line-calendar-heatmap.component.html +++ b/src/app/@ui/spotting-line-calendar-heatmap/spotting-line-calendar-heatmap.component.html @@ -1,2 +1,4 @@ - +@if (loading) { +
    -
    -
    - -
    +@if (applyPadding) { +
    +
    + +
    +} diff --git a/src/app/compliance/gdpr/gdpr.component.html b/src/app/compliance/gdpr/gdpr.component.html index be5b7bd6..3dc97979 100644 --- a/src/app/compliance/gdpr/gdpr.component.html +++ b/src/app/compliance/gdpr/gdpr.component.html @@ -2,30 +2,35 @@

    GDPR

    -
    -

    {{ elem.title }}

    - - - - {{ child.title }} {{ child.adhered ? "✅" : "❌" }} - - -
    -
    -
    -
    -
    -     - -     -
    +@for (elem of details; track elem) { +
    +

    {{ elem.title }}

    + @for (child of elem.children; track child) { + + + + {{ child.title }} {{ child.adhered ? "✅" : "❌" }} + + +
    + @if (!(child.notes === "" || child.notes === undefined)) { +
    +
    +
    +
    + } +     + +     + } +
    +} diff --git a/src/app/gallery/gallery.component.html b/src/app/gallery/gallery.component.html index 34a03917..ec0cd06b 100644 --- a/src/app/gallery/gallery.component.html +++ b/src/app/gallery/gallery.component.html @@ -1,24 +1,26 @@

    Gallery

    - -
    -

    {{ imgDate.key | date }}

    +@if (loading) { + +} +@for (imgDate of imageDateMaps | keyvalue: compareFn; track imgDate) {
    - -
    + inViewport + [inViewportOptions]="{ rootMargin: '200px 0px' }" + (inViewportAction)="onIntersection($event)" + [id]="imgDate.key" + class="date-image-container" + #dateImageContainer + > +

    {{ imgDate.key | date }}

    + @if (imgDate.value.displayImages) { + + } @else { +
    + } + +} diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index ec042186..c36e0c1c 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -12,36 +12,34 @@ }" >
    -
    - - - + + - - + + + + - - - -
    + + +
    + }
    @@ -49,20 +47,20 @@
    - - - + @if (userAvatar) { + + } @else { + + }
    - + @if (environment.sentry.environment == "staging") { + + } diff --git a/src/app/header/login-dropdown/login-dropdown.component.html b/src/app/header/login-dropdown/login-dropdown.component.html index 86f3ded6..c8377051 100644 --- a/src/app/header/login-dropdown/login-dropdown.component.html +++ b/src/app/header/login-dropdown/login-dropdown.component.html @@ -1,13 +1,15 @@ - - -
    -     + @if (authService.userData | async) { + + +
    +     + }     {{ @@ -19,32 +21,26 @@ - + +
    + /> Follow System Theme
    - - + @if (authService.userData | async) { + + } @else if ((authService.userData | async) == null) { + + }
    diff --git a/src/app/insiden/calendar/calendar.component.html b/src/app/insiden/calendar/calendar.component.html index cc68c5cd..953304e8 100644 --- a/src/app/insiden/calendar/calendar.component.html +++ b/src/app/insiden/calendar/calendar.component.html @@ -5,8 +5,8 @@ (nzPanelChange)="panelChange($event)" >
      - - + @switch (date | date: "yyyy-MM-dd") { + @case (date | date: "yyyy-MM-dd") {
    • @for ( item of monthEvents[ @@ -30,13 +30,12 @@ }
    • - + @for ( + item of monthEvents[ + (date | date: "yyyy-MM-dd") ?? "" + ] | keyvalue; + track item + ) { @if (item.value.isLongTerm) { } - + }
      • -       -       + } + }
    - - + @switch (month | date: "yyyy-MM") { + @case (month | date: "yyyy-MM") { @for ( item of yearEvents[(month | date: "yyyy-MM") ?? ""] | keyvalue; @@ -85,8 +84,8 @@ }" /> } - - + } + } diff --git a/src/app/insiden/event-list/event-card/event-card.component.html b/src/app/insiden/event-list/event-card/event-card.component.html index af634745..b2e68607 100644 --- a/src/app/insiden/event-list/event-card/event-card.component.html +++ b/src/app/insiden/event-list/event-card/event-card.component.html @@ -12,43 +12,43 @@ [nzTitle]="cardTitleTemplate" [nzActions]="[actionImages]" > -
    - - @for (line of displayData.lines; track line) { - - {{ line.displayName }} - - } - - @if (displayData.vehicles.length > 0) { - | - @for ( - vehicle of displayData.vehicles; - track vehicle.identificationNo - ) { - - {{ vehicle.identificationNo }} + @if ( + displayData.lines.length > 0 || + displayData.vehicles.length > 0 || + displayData.stations.length > 0 + ) { +
    + @for (line of displayData.lines; track line) { + + {{ line.displayName }} } - } - - | - @for ( - station of displayData.stations; - track station.displayName - ) { - - {{ station.displayName }} - + @if (displayData.vehicles.length > 0) { + | + @for ( + vehicle of displayData.vehicles; + track vehicle.identificationNo + ) { + + {{ vehicle.identificationNo }} + + } } - -
    + @if (displayData.stations.length > 0) { + + | + @for ( + station of displayData.stations; + track station.displayName + ) { + + {{ station.displayName }} + + } + + } +
    + }
    -
    - - @for (event of displayData.chronologies; track event) { - - - {{ - event.datetime | date: "YYYY-MM-dd HH:mm:ss" - }} - - @if (event.sourceUrl) { - - - - Source - - } -
    -
    - + @if (displayData.chronologies.length > 0) { +
    + + @for (event of displayData.chronologies; track event) { + + + {{ + event.datetime + | date: "YYYY-MM-dd HH:mm:ss" + }} + + @if (event.sourceUrl) { + - + + Source + + } +
    +
    +     + } +     + @if (displayData.duration) { +
    Duration: {{ displayData.duration }}
    } - - @if (displayData.duration) { -
    Duration: {{ displayData.duration }}
    - } -
    +
    + }
    - - + @if (displayData.inaccurate) { + + } + @if (displayData.longTerm) { + + } {{ displayData.title }} diff --git a/src/app/insiden/event-list/event-card/image-drawer/image-drawer.component.html b/src/app/insiden/event-list/event-card/image-drawer/image-drawer.component.html index a3422291..8440ed6c 100644 --- a/src/app/insiden/event-list/event-card/image-drawer/image-drawer.component.html +++ b/src/app/insiden/event-list/event-card/image-drawer/image-drawer.component.html @@ -1,5 +1,5 @@ @if (loading) { -