From 95b183b1bb7ce9bd8442c526bc6b7c2a3e7140bb Mon Sep 17 00:00:00 2001
From: Rainer Killinger <killinger@hrz.uni-frankfurt.de>
Date: Wed, 16 Jun 2021 16:59:24 +0200
Subject: [PATCH] refactor: replace amDateFormat with new pipes

---
 .../modules/data/elements/origin-in-list.html |  4 +--
 .../date-series/date-series-list-item.html    | 12 ++++-----
 .../place/special/mensa/place-mensa.html      |  4 +--
 .../types/semester/semester-list-item.html    |  5 +---
 src/app/modules/news/item/news-item.html      |  2 +-
 src/app/modules/news/news.module.ts           |  1 +
 src/app/modules/news/page/news-item.html      | 25 +++++++++++++++++++
 7 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 src/app/modules/news/page/news-item.html

diff --git a/src/app/modules/data/elements/origin-in-list.html b/src/app/modules/data/elements/origin-in-list.html
index 6c406b4d..a16b9e3f 100644
--- a/src/app/modules/data/elements/origin-in-list.html
+++ b/src/app/modules/data/elements/origin-in-list.html
@@ -1,7 +1,7 @@
 <div *ngIf="origin.type === 'user'">
-  <p>{{ origin.created | amDateFormat: 'll' }}</p>
+  <p>{{origin.created | dateFormat}}</p>
 </div>
 
 <div *ngIf="origin.type === 'remote'">
-  <p>{{ origin.indexed | amDateFormat: 'll' }}</p>
+  <p>{{origin.indexed | dateFormat}}</p>
 </div>
diff --git a/src/app/modules/data/types/date-series/date-series-list-item.html b/src/app/modules/data/types/date-series/date-series-list-item.html
index 7360d13f..2514889d 100644
--- a/src/app/modules/data/types/date-series/date-series-list-item.html
+++ b/src/app/modules/data/types/date-series/date-series-list-item.html
@@ -7,13 +7,11 @@
           <ion-icon name="calendar"></ion-icon>
           <span>
             {{ item.repeatFrequency | amDuration }},
-            {{ item.dates[0] | amDateFormat: 'dddd' }}
-            <span
-              >({{ item.dates[0] | amDateFormat: 'll' }} -
-              {{
-                item.dates[item.dates.length - 1] | amDateFormat: 'll'
-              }})</span
-            >
+            {{ item.dates[0] | dateFormat: 'weekday:long' }}
+            <span>
+              ({{ item.dates[0] | dateFormat }} -
+              {{ item.dates[item.dates.length - 1] | dateFormat }})
+            </span>
           </span>
         </p>
         <ion-note *ngIf="item.event.type === 'academic event'">{{
diff --git a/src/app/modules/data/types/place/special/mensa/place-mensa.html b/src/app/modules/data/types/place/special/mensa/place-mensa.html
index 018b50b5..021293d4 100644
--- a/src/app/modules/data/types/place/special/mensa/place-mensa.html
+++ b/src/app/modules/data/types/place/special/mensa/place-mensa.html
@@ -2,8 +2,8 @@
   <div *ngIf="dishes | async as dishes; else loading">
     <ion-segment [(ngModel)]="selectedDay" mode="md">
       <ion-segment-button *ngFor="let day of dishes | keyvalue" [value]="day.key">
-        <ion-label class="ion-hide-sm-down">{{day.key | amLocal | amDateFormat:'dddd, l'}}</ion-label>
-        <ion-label class="ion-hide-sm-up">{{day.key | amLocal | amDateFormat:'dd, l'}}</ion-label>
+        <ion-label class="ion-hide-sm-down">{{day.key | dateFormat:'weekday:long,month:numeric,day:numeric'}}</ion-label>
+        <ion-label class="ion-hide-sm-up">{{day.key | dateFormat:'weekday:short,month:numeric,day:numeric' }}</ion-label>
       </ion-segment-button>
     </ion-segment>
     <div [ngSwitch]="selectedDay">
diff --git a/src/app/modules/data/types/semester/semester-list-item.html b/src/app/modules/data/types/semester/semester-list-item.html
index eb2c0d52..37338075 100644
--- a/src/app/modules/data/types/semester/semester-list-item.html
+++ b/src/app/modules/data/types/semester/semester-list-item.html
@@ -5,10 +5,7 @@
         <h2 class="name">{{ 'name' | thingTranslate: item }}</h2>
         <p>
           <ion-icon name="calendar"></ion-icon>
-          <span
-            >{{ item.startDate | amDateFormat: 'll' }} -
-            {{ item.endDate | amDateFormat: 'll' }}</span
-          >
+          <span>{{item.startDate | dateFormat}} - {{item.endDate | dateFormat}}</span>
         </p>
         <ion-note>{{ 'type' | thingTranslate: item }}</ion-note>
       </div>
diff --git a/src/app/modules/news/item/news-item.html b/src/app/modules/news/item/news-item.html
index 6ae5544f..5b5947ab 100644
--- a/src/app/modules/news/item/news-item.html
+++ b/src/app/modules/news/item/news-item.html
@@ -23,7 +23,7 @@
   </ng-template>
   <ion-card-header>
     <ion-card-subtitle *ngIf="item.datePublished">{{
-      item.datePublished | amDateFormat: 'LLL'
+      item.datePublished | amCalendar | sentencecase
     }}</ion-card-subtitle>
     <ion-card-title>
       <span *ngIf="item.sameAs; else titleNoUrl"
diff --git a/src/app/modules/news/news.module.ts b/src/app/modules/news/news.module.ts
index d32be81b..ea67a27e 100644
--- a/src/app/modules/news/news.module.ts
+++ b/src/app/modules/news/news.module.ts
@@ -43,6 +43,7 @@ const newsRoutes: Routes = [{path: 'news', component: NewsPageComponent}];
   ],
   imports: [
     IonicModule.forRoot(),
+    ThingTranslateModule.forChild(),
     TranslateModule.forChild(),
     RouterModule.forChild(newsRoutes),
     CommonModule,
diff --git a/src/app/modules/news/page/news-item.html b/src/app/modules/news/page/news-item.html
new file mode 100644
index 00000000..43231384
--- /dev/null
+++ b/src/app/modules/news/page/news-item.html
@@ -0,0 +1,25 @@
+<ion-card>
+<span *ngIf="item.url; else imageNoUrl">
+  <a href="{{item.url}}">
+    <ion-thumbnail><ion-img src="{{item.image}}" (ionError)="$event.target.nextSibling.style.display='block'" alt=""></ion-img>
+      <ion-icon name="newspaper-outline"></ion-icon>
+    </ion-thumbnail>
+  </a>
+</span>
+  <ng-template #imageNoUrl>
+    <ion-thumbnail>
+      <ion-img src="{{item.image}}" (ionError)="$event.target.nextSibling.style.display='block'" alt=""></ion-img>
+      <ion-icon name="newspaper-outline"></ion-icon>
+    </ion-thumbnail>
+  </ng-template>
+  <ion-card-header>
+    <ion-card-subtitle *ngIf="item.datePublished">{{item.datePublished | amCalendar | sentencecase}}</ion-card-subtitle>
+    <ion-card-title>
+      <span *ngIf="item.url; else titleNoUrl"><a  href="{{item.url}}"><span class="text">{{item.name}}</span><span class="icon"><ion-icon name="open-outline"></ion-icon></span></a></span>
+      <ng-template #titleNoUrl>{{item.name}}</ng-template>
+    </ion-card-title>
+  </ion-card-header>
+  <ion-card-content>
+    {{item.messageBody}}
+  </ion-card-content>
+</ion-card>