Merge pull request #174 from richardjanssen/develop

Add rotterdam icon, change time pipe
richardjanssen · Mar 1, 2024 · fb10922 · fb10922
2 parents 657bece + 795015f
commit fb10922
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/src/app/core/pipes/pct-time.pipe.ts b/src/app/core/pipes/pct-time.pipe.ts
@@ -12,9 +12,14 @@ export class PctTimePipe implements PipeTransform {
     transform(date: Date): string {
         const pipe = new DatePipe('en-US');
         if (new Date(date).valueOf() > this._constants.pctStartDate.valueOf()) {
-            // Has started hike
+            // Has started hike, Pacific Daylight Saving Time
             return `${pipe.transform(date, 'HH:mm', 'PDT')} PDT`;
         }
-        return `${pipe.transform(date, 'HH:mm', 'CEST')} CEST`;
+        // Central European Daylight saving Time
+        if (new Date(date).valueOf() > new Date(2024, 2, 30).valueOf()) {
+            return `${pipe.transform(date, 'HH:mm', '+0200')} CEST`;
+        }
+        // Central European Time
+        return `${pipe.transform(date, 'HH:mm', '+0100')} CET`;
     }
 }
diff --git a/src/app/core/types/highlight.type.ts b/src/app/core/types/highlight.type.ts
@@ -57,5 +57,6 @@ export enum PointHighlightType {
     twentyFiveHundred = 'twentyFiveHundred',
     threeThousand = 'threeThousand',
     thirtyFiveHundred = 'thirtyFiveHundred',
-    fourThousand = 'fourThousand'
+    fourThousand = 'fourThousand',
+    rotterdam = 'rotterdam'
 }
diff --git a/...ghts-chain/point-highlight/point-highlight-summary/point-highlight-summary.component.html b/...ghts-chain/point-highlight/point-highlight-summary/point-highlight-summary.component.html
@@ -24,6 +24,7 @@
             <icon *ngSwitchCase="pointHighlightType.threeThousand" name="party"></icon>
             <icon *ngSwitchCase="pointHighlightType.thirtyFiveHundred" name="party"></icon>
             <icon *ngSwitchCase="pointHighlightType.fourThousand" name="party"></icon>
+            <icon *ngSwitchCase="pointHighlightType.rotterdam" name="rotterdam"></icon>
             <icon *ngSwitchDefault name="icon-dots"></icon>
         </ng-container>
     </div>

diff --git a/src/assets/icons/rotterdam.svg b/src/assets/icons/rotterdam.svg