Merge pull request #95 from SwimResults/develop

`Patch:` incidents: timeless; name extension; medal ceremony
SwimResults · Jun 2, 2024 · 8f1fdc9 · 8f1fdc9
2 parents 6870ce3 + df219f6
commit 8f1fdc9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/src/app/content/events/components/event-incident/event-incident.component.html b/src/app/content/events/components/event-incident/event-incident.component.html
@@ -5,8 +5,14 @@
     <div class="time-container" *ngIf="incident.type === 'DURATION'">
         <i>{{incident.getDurationString()}}</i>
     </div>
+    <div class="time-container" *ngIf="incident.type === 'TIMELESS'">
+        <i>&nbsp;</i>
+    </div>
     <div *ngIf="incident.type === 'EVENT'" class="dot"></div>
     <div class="content-container {{incident.type === 'DURATION' ? 'container-duration' : 'container-event'}}">
-        <span class="name">{{'EVENT.LIST.INCIDENT.' + incident.name.toUpperCase() | translate}}</span>
+        <span class="name">
+            <span>{{'EVENT.LIST.INCIDENT.' + incident.name.toUpperCase() | translate}}</span>
+            <span>{{incident.name_extension}}</span>
+        </span>
     </div>
 </ng-container>
diff --git a/src/app/core/model/meeting/incident.model.ts b/src/app/core/model/meeting/incident.model.ts
@@ -3,8 +3,9 @@ import {createDate} from "../../function/date.functions";
 export interface Incident {
     _id: string;
     meeting: string;
-    type: "EVENT" | "DURATION";
+    type: "EVENT" | "DURATION" | "TIMELESS";
     name: string;
+    name_extension: string;
     start: string;
     end: string;
     prev_event: number;
@@ -14,8 +15,9 @@ export interface Incident {
 export class IncidentImpl {
     _id: string;
     meeting: string;
-    type: "EVENT" | "DURATION";
+    type: "EVENT" | "DURATION" | "TIMELESS";
     name: string;
+    name_extension: string;
     start: string;
     end: string;
     prev_event: number;
@@ -26,6 +28,7 @@ export class IncidentImpl {
         this.meeting = data.meeting;
         this.type = data.type;
         this.name = data.name;
+        this.name_extension = data.name_extension;
         this.start = data.start;
         this.end = data.end;
         this.prev_event = data.prev_event;

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -24,7 +24,8 @@
                 "WARMUP": "Einschwimmen",
                 "JUDGES_MEETING": "Kampfrichtersitzung",
                 "TEAM_LEADER_MEETING": "Mannschaftsleitersitzung",
-                "BREAK": "Pause"
+                "BREAK": "Pause",
+                "CEREMONY": "Siegerehrung"
             }
         }
     },

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -42,7 +42,8 @@
                 "WARMUP": "Warm-up",
                 "JUDGES_MEETING": "Judges Meeting",
                 "TEAM_LEADER_MEETING": "Team Leader Meeting",
-                "BREAK": "Break"
+                "BREAK": "Break",
+                "CEREMONY": "Medal ceremony"
             }
         }
     },