From 50ab31885417383663ec053010ab105bf760f7f2 Mon Sep 17 00:00:00 2001
From: frankporras <francisco.porras-bernardez@geosphere.at>
Date: Wed, 4 Sep 2024 13:46:09 +0200
Subject: [PATCH] - Icon and link for licenses added - Listing of authors in
 list of publications corrected - Coverage section improved - Contributor
 section moved down

---
 src/components/vs-result/vs-result.ts         | 10 +++
 src/components/vs-result/vs-result.vue        | 29 ++++++--
 src/models/dataset.ts                         | 18 +++--
 .../dataset-detail.component.ts               |  2 +-
 .../dataset-detail.component.vue              | 67 +++++++++++++++----
 5 files changed, 103 insertions(+), 23 deletions(-)

diff --git a/src/components/vs-result/vs-result.ts b/src/components/vs-result/vs-result.ts
index d731acc..39f6514 100644
--- a/src/components/vs-result/vs-result.ts
+++ b/src/components/vs-result/vs-result.ts
@@ -14,6 +14,16 @@ export default class VsResult extends Vue {
         return this.datasets;
     }
 
+    public simplifyAuthor(author:string): string {
+        
+        if (author.endsWith(" ")) { 
+            return author.substring(0, author.indexOf(","));
+        } else {
+            let firstNameInitial:string = author.charAt(author.indexOf(",") + 2);
+            return author.substring(0, author.indexOf(",") + 2) + firstNameInitial;
+        }
+    }
+
     public getDomainWithoutSubdomain(): string {
         const urlParts = new URL(window.location.href).hostname.split(".");
 
diff --git a/src/components/vs-result/vs-result.vue b/src/components/vs-result/vs-result.vue
index 20c7479..5387123 100644
--- a/src/components/vs-result/vs-result.vue
+++ b/src/components/vs-result/vs-result.vue
@@ -6,13 +6,34 @@
                     <a target="_blank" v-bind:href="'https://doi.org/' + document.identifier[0]">
                         {{ "https://doi.org/" + document.identifier[0] + " &#10148;" }} </a
                     >&nbsp;
-                    <span v-if="document.author && document.author.length > 0" class="disabled">{{ document.author[0] }}</span>
+
+
+                    <!-- Display authors conditionally -->
+                    <span v-if="document.author && document.author.length > 0">
+                        <!-- For one author, just display the author's name -->
+                        <span v-if="document.author.length === 1" class="disabled">
+                        {{ simplifyAuthor(document.author[0]) }}
+                        </span>
+                        <!-- For 2-3 authors, display them all -->
+                        <span v-if="document.author.length > 1 && document.author.length < 3">
+                            <span v-for="(author, index) in document.author" :key="index" class="disabled">
+                                {{ simplifyAuthor(author) }}<span v-if="index < document.author.length - 1" class="disabled">; </span>
+                            </span>
+                        </span>
+                        <!-- For 4 or more authors, display the first three and add "et al." -->
+                        <span v-if="document.author.length >= 3" class="disabled">
+                            <span v-for="(author, index) in document.author.slice(0, 2)" :key="index" class="disabled">
+                                {{ simplifyAuthor(author) }}<span v-if="index < 1" class="disabled">; </span>
+                            </span>
+                            et al.
+                        </span>
+                    </span>
                 </p>
 
                 <h4>
-                    <router-link class="ng-binding" v-bind:to="{ name: 'dataset', params: { datasetId: document.id } }">{{
-                        document.title_output
-                    }}</router-link>
+                    <router-link class="ng-binding" v-bind:to="{ name: 'dataset', params: { datasetId: document.id } }">
+                        {{ document.title_output }}
+                    </router-link>
                 </h4>
 
                 <p class="clamped clamped-2">
diff --git a/src/models/dataset.ts b/src/models/dataset.ts
index 9e38775..e4f054e 100644
--- a/src/models/dataset.ts
+++ b/src/models/dataset.ts
@@ -274,7 +274,7 @@ export class DbDataset {
             if (this.coverage.elevation_absolut != null) {
                 elevation += "\n- Elevation Absolut: " + this.coverage.elevation_absolut + " m";
             }
-            if (elevation != "") geoLocation += elevation;
+            // if (elevation != "") geoLocation += ("\n---" + elevation);
 
             let depth = "";
             if (this.coverage.depth_max != null && this.coverage.depth_min != null) {
@@ -283,16 +283,16 @@ export class DbDataset {
             if (this.coverage.elevation_absolut != null) {
                 depth += "\n- Depth Absolut: " + this.coverage.depth_absolut + " m";
             }
-            if (depth != "") geoLocation += depth;
+            // if (depth != "") geoLocation += depth;
 
             let time = "";
             if (this.coverage.time_max != null && this.coverage.time_min != null) {
-                time += "\n* Time Min.: " + this.coverage.time_min + "\n* Time Max.: " + this.coverage.time_max;
+                time += "\n- Time Min.: " + this.coverage.time_min + "\n- Time Max.: " + this.coverage.time_max;
             }
             if (this.coverage.time_absolut != null) {
-                time += "\n* Time Absolut: " + this.coverage.time_absolut;
+                time += "\n- Time Absolut: " + this.coverage.time_absolut;
             }
-            if (time != "") geoLocation += time;
+            // if (time != "") geoLocation += time;
 
             // let elevation = "";
             // if (this.coverage.elevation_max != null && this.coverage.elevation_min != null) {
@@ -321,7 +321,13 @@ export class DbDataset {
             // }
             // if (time != "") geoLocation += time;
 
-            return geoLocation;
+            if (elevation != "" || depth != "" || time != "" ) {
+                return geoLocation + "\n ---" + elevation + depth + time;
+            } else {
+                return geoLocation + elevation + depth + time;
+            }
+
+            // return geoLocation;
         } else {
             return "";
         }
diff --git a/src/views/dataset-detail.component/dataset-detail.component.ts b/src/views/dataset-detail.component/dataset-detail.component.ts
index 0a04e1a..5185e93 100644
--- a/src/views/dataset-detail.component/dataset-detail.component.ts
+++ b/src/views/dataset-detail.component/dataset-detail.component.ts
@@ -177,7 +177,7 @@ export default class DatasetDetailComponent extends Vue {
             .join(", ");
         citation += " (" + dayjs(this.dataset.server_date_published).format("YYYY") + "): ";
         citation += this.dataset.MainTitle?.value;
-        citation += "." + this.dataset.creating_corporation + ", ";
+        citation += ". " + this.dataset.creating_corporation + ", ";
         citation += this.dataset.publisher_name;
         citation += ", Wien";
         return citation;
diff --git a/src/views/dataset-detail.component/dataset-detail.component.vue b/src/views/dataset-detail.component/dataset-detail.component.vue
index 9818861..66068d4 100644
--- a/src/views/dataset-detail.component/dataset-detail.component.vue
+++ b/src/views/dataset-detail.component/dataset-detail.component.vue
@@ -186,15 +186,7 @@
                             <!-- <data-metrics-badge v-bind:doi="dataset.identifier.value" display="small"></data-metrics-badge> -->
                         </div>
                     </div>
-                    <div class="card">
-                        <div class="column">
-                            <h3 class="label uppercase">Beitragende/Contributor</h3>
-                            <p v-if="dataset.hasContributors()">
-                                {{ dataset.contributors.map((u) => u.full_name).join(", ") }}
-                            </p>
-                            <p v-else>-</p>
-                        </div>
-                    </div>
+
                     <!-- <div class="card">
                         <div class="column">
                             <h3 class="label uppercase">Schlüsselwörter/Keywords</h3>
@@ -263,7 +255,12 @@
                             <p v-if="dataset.hasLicenses()">
                                 <label v-for="license in dataset.licenses" v-bind:key="license.id">
                                     <span class="normal label">
-                                        {{ license.name }}
+                                        <a v-if="license.name=='CC-BY-4.0'" target="_blank" class="link-label" v-bind:href="'https://creativecommons.org/licenses/by/4.0/'"
+                                            ><i class="fa-brands fa-creative-commons"></i>&nbsp;{{ license.name }}</a
+                                        >
+                                        <a v-else target="_blank" class="link-label" v-bind:href="'https://creativecommons.org/licenses/by-sa/4.0/'"
+                                            ><i class="fa-brands fa-creative-commons"></i>&nbsp;{{ license.name }}</a
+                                        >
                                     </span>
                                     <span v-if="openAccessLicences.includes(license.name)" class="normal label uppercase"
                                         ><i class="fas fa-lock-open"></i> Open Access</span
@@ -315,11 +312,57 @@
                             <p v-else>-</p>
                         </div>
                     </div>
+
+                    <div class="card">
+                        <div class="column">
+                            <h3 class="label uppercase">Beitragende/Contributor</h3>
+                            <p v-if="dataset.hasContributors()">
+                                {{ dataset.contributors.map((u) => u.full_name).join(", ") }}
+                            </p>
+                            <p v-else>-</p>
+                        </div>
+                    </div>
+
                 </div>
             </div>
         </div>
 
         <div class="container-fluid" style="padding-top: 3.8em">
+            <!-- <div class="columns is-mobile partner-logos"> -->
+            <div class="columns">
+                <div class="column col-sm">
+                    <div class="card mx-auto" style="width: 18rem; box-shadow: none; border: 0rem">
+                        <div class="card-body">
+                            <!-- <h5 class="card-title">About TETHYS</h5> -->
+                            <a target="_blank" href="https://www.re3data.org/repository/r3d100013400">
+                                <img src="@/assets/site/img/re3-data-logo-mono.jpg" alt="re3 data logo" />
+                            </a>
+                        </div>
+                    </div>
+                </div>
+                <div class="column col-sm">
+                    <div class="card mx-auto" style="width: 28rem; box-shadow: none; border: 0rem">
+                        <div class="card-body">
+                            <a target="_blank" href="http://www.geosphere.at/">
+                                <img src="@/assets/site/img/geosphere-austria-logo.jpg" alt="logo geosphere austria" />
+                            </a>
+                        </div>
+                    </div>
+                </div>
+                <div class="column col-sm">
+                    <div class="card mx-auto" style="width: 18rem; box-shadow: none; border: 0rem">
+                        <div class="card-body">
+                            <a target="_blank" href="https://www.base-search.net/Search/Results?q=coll:fttethysrdr&refid=dctablede">
+                                <img src="@/assets/site/img/base_logo.png" alt="logo base" />
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+        <!-- <div class="container-fluid" style="padding-top: 3.8em">
             <div class="columns is-mobile partner-logos">
                 <div class="column col-sm text-center">
                     <a target="_blank" href="https://www.re3data.org/repository/r3d100013400"
@@ -329,7 +372,6 @@
                 <div class="column col-sm text-center">
                     <a target="_blank" href="http://www.geosphere.at/">
                         <img src="@/assets/site/img/geosphere-austria-logo.jpg" class="pb-3" alt="logo geosphere austria" />
-                        <!-- <img src="@/assets/site/img/gbaLogoRGB_web.png" alt="GeoSphere Austria logo" /> -->
                     </a>
                 </div>
                 <div class="column col-sm text-center">
@@ -338,7 +380,8 @@
                     </a>
                 </div>
             </div>
-        </div>
+        </div> -->
+        
     </section>
 </template>