From e32c695cf2cc5edcec04c4a52f6e7e3958878530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20P?= <nicolo.paraciani@cnr.it>
Date: Wed, 4 Dec 2024 09:07:03 +0100
Subject: [PATCH] Fix biblio citations

---
 webgis/js/components/Finding.js           | 6 +++---
 webgis/js/components/NotConservedSheet.js | 6 +++---
 webgis/js/components/SiteSheet.js         | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/webgis/js/components/Finding.js b/webgis/js/components/Finding.js
index 6498535..2c7f056 100644
--- a/webgis/js/components/Finding.js
+++ b/webgis/js/components/Finding.js
@@ -90,9 +90,9 @@ export class Finding {
                     <span class="is-clickable is-capitalized has-text-link"
                         data-action="click->biblio#open"
                         id="cit-${biblio.id}">
-                        ${biblio.citation.toLowerCase()},
-                    </span> ${biblio.pages};
-                `;
+                        ${biblio.citation.toLowerCase()}</span>`;
+
+                citations += biblio.pages?.length ? `, ${biblio.pages};` : ';';
 
                 this.biblioElements.push(`
                     <div class="p-2 mt-2" id="ref-${biblio.id}">
diff --git a/webgis/js/components/NotConservedSheet.js b/webgis/js/components/NotConservedSheet.js
index 74715f4..3bd4e08 100644
--- a/webgis/js/components/NotConservedSheet.js
+++ b/webgis/js/components/NotConservedSheet.js
@@ -60,10 +60,10 @@ export class NotConservedSheet {
                     <span class="is-clickable is-capitalized has-text-link"
                         data-action="click->biblio#open"
                         id="cit-${record.id}">
-                        ${record.citation.toLowerCase()},
-                    </span> ${record.pages};
-                `;
+                        ${record.citation.toLowerCase().trim()}</span>`;
 
+                citations += record.pages?.length ? `, ${record.pages};` : ';';
+                
                 this.biblioElements.push(`
                     <div class="p-2 mt-2" id="ref-${record.id}">
                         <p class="p-3">${record.reference}</p>
diff --git a/webgis/js/components/SiteSheet.js b/webgis/js/components/SiteSheet.js
index 5c8456b..9ed4f4a 100644
--- a/webgis/js/components/SiteSheet.js
+++ b/webgis/js/components/SiteSheet.js
@@ -102,9 +102,9 @@ export class SiteSheet {
                     <span class="is-clickable is-capitalized has-text-link"
                         data-action="click->biblio#open"
                         id="cit-${record.id}">
-                        ${record.citation.toLowerCase().trim()},
-                    </span> ${record.pages};
-                `;
+                        ${record.citation.toLowerCase().trim()}</span>`;
+
+                citations += record.pages?.length ? `, ${record.pages};` : ';';
 
                 this.biblioElements.push(`
                     <div class="p-2 mt-2" id="ref-${record.id}">
@@ -124,4 +124,4 @@ export class SiteSheet {
             return ref.match(regex);
         });
     }
-}
\ No newline at end of file
+}