From 83d9a4a8b8fe5b8687c72a717b3a2964524006e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jovan=20Kruni=C4=87?= <jovan.krunic@gmail.com>
Date: Wed, 8 Jun 2022 10:46:23 +0000
Subject: [PATCH] fix: adjust hebis catalog templates

---
 .../daia-availability/daia-availability.html  |  2 +-
 src/app/modules/hebis/hebis.module.ts         |  2 ++
 .../hebis/types/book/book-detail-content.html | 29 ++++++++++------
 .../hebis-article/hebis-article-content.html  | 34 +++++++++++++------
 .../periodical/periodical-detail-content.html | 24 ++++++-------
 5 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/src/app/modules/hebis/daia-availability/daia-availability.html b/src/app/modules/hebis/daia-availability/daia-availability.html
index 1717f141..fdda0882 100644
--- a/src/app/modules/hebis/daia-availability/daia-availability.html
+++ b/src/app/modules/hebis/daia-availability/daia-availability.html
@@ -39,7 +39,7 @@
           <ion-col size="3">{{
             'hebisSearch.daia.comment' | translate
           }}</ion-col>
-          <ion-col size="9">{{ holding.about }}</ion-col>
+          <ion-col size="9" [innerHTML]="holding.about"></ion-col>
         </ion-row>
         <ion-row
           *ngIf="holding.available && holding.available.service === 'loan'"
diff --git a/src/app/modules/hebis/hebis.module.ts b/src/app/modules/hebis/hebis.module.ts
index 8170ff72..0d88d08e 100644
--- a/src/app/modules/hebis/hebis.module.ts
+++ b/src/app/modules/hebis/hebis.module.ts
@@ -42,6 +42,7 @@ import {HebisArticleListItemComponent} from './types/hebis-article/hebis-article
 import {HebisArticleContentComponent} from './types/hebis-article/hebis-article-content.component';
 import {DataListComponent} from '../data/list/data-list.component';
 import {DaiaAvailabilityComponent} from './daia-availability/daia-availability.component';
+import {UtilModule} from '../../util/util.module';
 
 /**
  * Module for handling data
@@ -78,6 +79,7 @@ import {DaiaAvailabilityComponent} from './daia-availability/daia-availability.c
     StorageModule,
     TranslateModule.forChild(),
     ThingTranslateModule.forChild(),
+    UtilModule,
   ],
   providers: [HebisDataProvider, DaiaDataProvider, StAppsWebHttpClient],
   exports: [
diff --git a/src/app/modules/hebis/types/book/book-detail-content.html b/src/app/modules/hebis/types/book/book-detail-content.html
index 2fcb5f18..8a973e62 100644
--- a/src/app/modules/hebis/types/book/book-detail-content.html
+++ b/src/app/modules/hebis/types/book/book-detail-content.html
@@ -1,36 +1,43 @@
 <ion-card *ngIf="item.sameAs">
   <ion-card-header>{{
-    'hebisSearch.detail.title' | translate
+    'hebisSearch.detail.title' | translate | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <a [href]="item.sameAs" target="_blank">{{
-      'name' | thingTranslate: item | titlecase
+      'name' | thingTranslate: item
     }}</a>
   </ion-card-content>
 </ion-card>
 
 <stapps-simple-card
   *ngIf="!item.sameAs"
-  [title]="'name' | propertyNameTranslate: item | titlecase"
+  [title]="'name' | propertyNameTranslate: item | sentencecase"
   [content]="'name' | thingTranslate: item"
 >
 </stapps-simple-card>
 
+<stapps-simple-card
+  *ngIf="item.edition"
+  [title]="'edition' | propertyNameTranslate: item | sentencecase"
+  [content]="'edition' | thingTranslate: item"
+>
+</stapps-simple-card>
+
 <stapps-simple-card
   *ngIf="item.description"
-  [title]="'hebisSearch.detail.description' | translate"
+  [title]="'hebisSearch.detail.description' | translate | sentencecase"
   [content]="item.description"
 ></stapps-simple-card>
 
 <stapps-simple-card
   *ngIf="item.sourceOrganization"
-  [title]="'sourceOrganization' | propertyNameTranslate: item | titlecase"
+  [title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
   [content]="item.sourceOrganization"
 ></stapps-simple-card>
 
 <ion-card *ngIf="item.authors && item.authors.length > 0">
   <ion-card-header>{{
-    'authors' | propertyNameTranslate: item | titlecase
+    'authors' | propertyNameTranslate: item | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <ion-label *ngFor="let author of item.authors">{{
@@ -41,25 +48,25 @@
 
 <stapps-simple-card
   *ngIf="item.ISBNs"
-  [title]="'ISBNs' | propertyNameTranslate: item | titlecase"
+  [title]="'ISBNs' | propertyNameTranslate: item | sentencecase"
   [content]="item.ISBNs"
 >
 </stapps-simple-card>
 <stapps-simple-card
   *ngIf="item.firstPublished && !item.lastPublished"
-  [title]="'hebisSearch.detail.firstPublished' | translate"
+  [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
   [content]="item.firstPublished"
 >
 </stapps-simple-card>
 <stapps-simple-card
   *ngIf="item.firstPublished && item.lastPublished"
-  [title]="'hebisSearch.detail.firstPublished' | translate"
+  [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
   [content]="[item.firstPublished, item.lastPublished] | join: ' - '"
 >
 </stapps-simple-card>
 <ion-card *ngIf="item.publications">
   <ion-card-header>{{
-    'publications' | propertyNameTranslate: item | titlecase
+    'publications' | propertyNameTranslate: item | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <p *ngFor="let publication of item.publications">
@@ -71,7 +78,7 @@
 </ion-card>
 <ion-card *ngIf="item.categories">
   <ion-card-header>{{
-    'categories' | propertyNameTranslate: item | titlecase
+    'categories' | propertyNameTranslate: item | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <ion-chip [attr.color]="'primary'">
diff --git a/src/app/modules/hebis/types/hebis-article/hebis-article-content.html b/src/app/modules/hebis/types/hebis-article/hebis-article-content.html
index 26611b37..4e0f8fec 100644
--- a/src/app/modules/hebis/types/hebis-article/hebis-article-content.html
+++ b/src/app/modules/hebis/types/hebis-article/hebis-article-content.html
@@ -1,36 +1,36 @@
 <ion-card *ngIf="item.sameAs">
   <ion-card-header>{{
-    'hebisSearch.detail.title' | translate
+    'hebisSearch.detail.title' | translate | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <a [href]="item.sameAs" target="_blank">{{
-      'name' | thingTranslate: item | titlecase
+      'name' | thingTranslate: item
     }}</a>
   </ion-card-content>
 </ion-card>
 
 <stapps-simple-card
   *ngIf="!item.sameAs"
-  [title]="'name' | propertyNameTranslate: item | titlecase"
+  [title]="'name' | propertyNameTranslate: item | sentencecase"
   [content]="'name' | thingTranslate: item"
 >
 </stapps-simple-card>
 
 <stapps-simple-card
   *ngIf="item.description"
-  [title]="'hebisSearch.detail.description' | translate"
+  [title]="'hebisSearch.detail.description' | translate | sentencecase"
   [content]="item.description"
 ></stapps-simple-card>
 
 <stapps-simple-card
   *ngIf="item.sourceOrganization"
-  [title]="'sourceOrganization' | propertyNameTranslate: item | titlecase"
+  [title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
   [content]="item.sourceOrganization"
 ></stapps-simple-card>
 
 <ion-card *ngIf="item.authors && item.authors.length > 0">
   <ion-card-header>{{
-    'authors' | propertyNameTranslate: item | titlecase
+    'authors' | propertyNameTranslate: item | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <ion-label *ngFor="let author of item.authors">{{
@@ -41,19 +41,21 @@
 
 <stapps-simple-card
   *ngIf="item.firstPublished && !item.lastPublished"
-  [title]="'hebisSearch.detail.firstPublished' | translate"
+  [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
   [content]="item.firstPublished"
 >
 </stapps-simple-card>
+
 <stapps-simple-card
   *ngIf="item.firstPublished && item.lastPublished"
-  [title]="'hebisSearch.detail.firstPublished' | translate"
+  [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
   [content]="[item.firstPublished, item.lastPublished] | join: ' - '"
 >
 </stapps-simple-card>
+
 <ion-card *ngIf="item.publications">
   <ion-card-header>{{
-    'publications' | propertyNameTranslate: item | titlecase
+    'publications' | propertyNameTranslate: item | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <p *ngFor="let publication of item.publications">
@@ -63,9 +65,21 @@
     </p>
   </ion-card-content>
 </ion-card>
+
+<stapps-simple-card
+  *ngIf="item.reference"
+  [title]="'reference' | propertyNameTranslate: item | sentencecase"
+  [content]="item.reference"
+></stapps-simple-card>
+
+<stapps-simple-card
+  *ngIf="item.isPartOf"
+  [title]="'isPartOf' | propertyNameTranslate: item | sentencecase"
+  [content]="item.isPartOf.name"
+></stapps-simple-card>
 <ion-card *ngIf="item.categories">
   <ion-card-header>{{
-    'categories' | propertyNameTranslate: item | titlecase
+    'categories' | propertyNameTranslate: item | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <ion-chip [attr.color]="'primary'">
diff --git a/src/app/modules/hebis/types/periodical/periodical-detail-content.html b/src/app/modules/hebis/types/periodical/periodical-detail-content.html
index dd2f57b5..93826c11 100644
--- a/src/app/modules/hebis/types/periodical/periodical-detail-content.html
+++ b/src/app/modules/hebis/types/periodical/periodical-detail-content.html
@@ -1,36 +1,36 @@
 <ion-card *ngIf="item.sameAs">
   <ion-card-header>{{
-    'hebisSearch.detail.title' | translate
+    'hebisSearch.detail.title' | translate | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <a [href]="item.sameAs" target="_blank">{{
-      'name' | thingTranslate: item | titlecase
+      'name' | thingTranslate: item
     }}</a>
   </ion-card-content>
 </ion-card>
 
 <stapps-simple-card
   *ngIf="!item.sameAs"
-  [title]="'name' | propertyNameTranslate: item | titlecase"
+  [title]="'name' | propertyNameTranslate: item | sentencecase"
   [content]="'name' | thingTranslate: item"
 >
 </stapps-simple-card>
 
 <stapps-simple-card
   *ngIf="item.description"
-  [title]="'hebisSearch.detail.description' | translate"
+  [title]="'hebisSearch.detail.description' | translate | sentencecase"
   [content]="item.description"
 ></stapps-simple-card>
 
 <stapps-simple-card
   *ngIf="item.sourceOrganization"
-  [title]="'sourceOrganization' | propertyNameTranslate: item | titlecase"
+  [title]="'sourceOrganization' | propertyNameTranslate: item | sentencecase"
   [content]="item.sourceOrganization"
 ></stapps-simple-card>
 
 <ion-card *ngIf="item.authors && item.authors.length > 0">
   <ion-card-header>{{
-    'authors' | propertyNameTranslate: item | titlecase
+    'authors' | propertyNameTranslate: item | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <ion-label *ngFor="let author of item.authors">{{
@@ -41,19 +41,19 @@
 
 <stapps-simple-card
   *ngIf="item.firstPublished && !item.lastPublished"
-  [title]="'hebisSearch.detail.firstPublished' | translate"
-  [content]="item.firstPublished"
+  [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
+  [content]="item.firstPublished + '-'"
 >
 </stapps-simple-card>
 <stapps-simple-card
   *ngIf="item.firstPublished && item.lastPublished"
-  [title]="'hebisSearch.detail.firstPublished' | translate"
+  [title]="'hebisSearch.detail.firstPublished' | translate | sentencecase"
   [content]="[item.firstPublished, item.lastPublished] | join: ' - '"
 >
 </stapps-simple-card>
 <ion-card *ngIf="item.publications">
   <ion-card-header>{{
-    'publications' | propertyNameTranslate: item | titlecase
+    'publications' | propertyNameTranslate: item | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <p *ngFor="let publication of item.publications">
@@ -65,7 +65,7 @@
 </ion-card>
 <ion-card *ngIf="item.categories">
   <ion-card-header>{{
-    'categories' | propertyNameTranslate: item | titlecase
+    'categories' | propertyNameTranslate: item | sentencecase
   }}</ion-card-header>
   <ion-card-content>
     <ion-chip [attr.color]="'primary'">
@@ -76,7 +76,7 @@
 </ion-card>
 <stapps-simple-card
   *ngIf="item.ISSNs"
-  [title]="'hebisSearch.detail.issn' | translate"
+  [title]="'ISSNs' | propertyNameTranslate: item | sentencecase"
   [content]="item.ISSNs | join: ', '"
 >
 </stapps-simple-card>