From 92adb9dd2db18027dcc327433027e28c81ecbd4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jovan=20Kruni=C4=87?= <jovan.krunic@gmail.com>
Date: Fri, 25 Nov 2022 19:05:29 +0100
Subject: [PATCH] fix: add location info to dates from timetable

Close #344
---
 .../date-series-detail-content.html           | 32 ++++++++++++++++---
 .../schedule/page/grid/schedule-card.html     |  2 +-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/app/modules/data/types/date-series/date-series-detail-content.html b/src/app/modules/data/types/date-series/date-series-detail-content.html
index 44b0b0e6..0d19ae40 100644
--- a/src/app/modules/data/types/date-series/date-series-detail-content.html
+++ b/src/app/modules/data/types/date-series/date-series-detail-content.html
@@ -12,7 +12,16 @@
   ~  You should have received a copy of the GNU General Public License along with
   ~  this program. If not, see <https://www.gnu.org/licenses/>.
   -->
-
+<ion-card>
+  <ion-card-header>
+    {{ 'event' | propertyNameTranslate: item | titlecase }}
+  </ion-card-header>
+  <ion-card-content>
+    <a [routerLink]="['/data-detail', item.event.uid]">{{
+      'name' | thingTranslate: item.event
+    }}</a>
+  </ion-card-content>
+</ion-card>
 <ion-card *ngIf="item.inPlace">
   <ion-card-header>
     {{ 'inPlace' | propertyNameTranslate: item | titlecase }}
@@ -29,16 +38,29 @@
   </ion-card-content>
 </ion-card>
 <stapps-simple-card
-  [title]="'Duration'"
+  title="{{ 'duration' | propertyNameTranslate: item | titlecase }}"
   [content]="[item.duration | amDuration: 'minutes']"
 ></stapps-simple-card>
 <stapps-simple-card
-  [title]="'Time'"
-  [content]="[item.dates[0] | amDateFormat]"
+  *ngIf="item.dates.length > 1; else single_event"
+  title="{{ 'dates' | propertyNameTranslate: item | titlecase }}"
+  content="{{ 'data.chips.add_events.popover.AT' | translate | titlecase }} {{
+    item.dates[0] | amDateFormat: 'HH:mm ddd'
+  }} {{ 'data.chips.add_events.popover.UNTIL' | translate }} {{
+    item.dates[item.dates.length - 1] | amDateFormat: 'll'
+  }}"
 ></stapps-simple-card>
+<ng-template #single_event>
+  <stapps-simple-card
+    title="{{ 'dates' | propertyNameTranslate: item | titlecase }}"
+    content="{{ 'data.chips.add_events.popover.AT' | translate | titlecase }} {{
+      item.dates[item.dates.length - 1] | amDateFormat: 'll, HH:mm'
+    }}"
+  ></stapps-simple-card>
+</ng-template>
 <stapps-simple-card
   *ngIf="item.performers"
-  [title]="'performers' | propertyNameTranslate: item | titlecase"
+  [title]="'performers' | propertyNameTranslate: item.performers | titlecase"
   [content]="item.performers"
 ></stapps-simple-card>
 <stapps-offers-detail
diff --git a/src/app/modules/schedule/page/grid/schedule-card.html b/src/app/modules/schedule/page/grid/schedule-card.html
index 2f4f4d2f..0fb0e8b1 100644
--- a/src/app/modules/schedule/page/grid/schedule-card.html
+++ b/src/app/modules/schedule/page/grid/schedule-card.html
@@ -17,7 +17,7 @@
 <ion-card
   [style.height.px]="height * scale"
   [style.marginTop.px]="noOffset ? 0 : (fromY - fromHour) * scale - 5 + 45"
-  [routerLink]="['/data-detail', scheduleEvent.dateSeries.event.uid]"
+  [routerLink]="['/data-detail', scheduleEvent.dateSeries.uid]"
   [class.defaultCard]="cardColor.isDefault"
   [class.blueCard]="cardColor.isBlue"
   [class.blackCard]="cardColor.isBlack"