Merge pull request #2161 from BEXIS2/rc

Rc

Author: DavidBlaa

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Helpers/CitationsHelper.cs

@@ -112,14 +112,18 @@ public static CitationDataModel GetCitationDataModel(long datasetVersionId)
                             {
                                 if (!String.IsNullOrEmpty(pub.Doi))
                                     model.URL = pub.Doi;
+                                else if (!String.IsNullOrEmpty(pub.ExternalLink))
+                                    model.URL = pub.ExternalLink;
+
                             }
-                            else
+
+                            if (String.IsNullOrEmpty(model.URL))
                             {
-                                if(useTags)
+                                if (useTags)
                                     model.URL = HttpContext.Current.Request.Url.GetLeftPart(UriPartial.Authority) + $"/ddm/data/Showdata/{datasetVersion.Dataset.Id}?tag={model.Version}";
 
                                 model.URL = HttpContext.Current.Request.Url.GetLeftPart(UriPartial.Authority) + $"/ddm/data/Showdata/{datasetVersion.Dataset.Id}?version={model.Version}";
-
+                            
                             }
                         }
                     }

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Models/CitationModels.cs

@@ -1,4 +1,5 @@
 using BExIS.App.Bootstrap.Attributes;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Xml.Serialization;
@@ -51,6 +52,7 @@ public class CitationDataModel
         public string Year { get; set; }
 
         [XmlElement("doi")]
+        [Obsolete]
         public string DOI { get; set; }
 
         [XmlElement("url")]

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Views/Data/_Citation_Text.cshtml

@@ -1,5 +1,41 @@
 @model BExIS.Modules.Ddm.UI.Models.CitationDataModel
 
-<div>@String.Join("; ", Model.Authors) (@(Model.Year)): @(Model.Title). Version @(Model.Version). @(Model.Publisher). @(Model.EntityType). @(Model.URL)</div>
+<div id="citation-container"><b>Citation:</b><div id="citation-title">@String.Join("; ", Model.Authors) (@(Model.Year)): <b>@(Model.Title)</b>. Version @(Model.Version). @(Model.Publisher). @(Model.EntityType). @(Model.URL)  <span id="citation-copy" class="bx bx-copy" onclick="copyDivContentToClipboard('citation-title')"></span></div>
+   
+</div>
 
-@*{Nachname Ersteller}, {Initialen Ersteller}. ({Jahr}). {Titel des Datensatzes} [Datensatz]. {Herausgeber/Organisation}. Abgerufen am {Datum des Zugriffs}, von https://doi.org/{DOI} oder {URL}*@
+@*{Nachname Ersteller}, {Initialen Ersteller}. ({Jahr}). {Titel des Datensatzes} [Datensatz]. {Herausgeber/Organisation}. Abgerufen am {Datum des Zugriffs}, von https://doi.org/{DOI} oder {URL}*@
+
+<script>
+        function copyDivContentToClipboard(divId) {
+            const div = document.getElementById(divId);
+            // You can copy text or HTML content, change as needed
+            const content = div.innerText; // Use innerHTML if you want to copy HTML formatting
+
+            navigator.clipboard.writeText(content)
+                .then(() => {
+                    alert('Citation copied to clipboard!');
+                })
+                .catch(err => {
+                    alert('Error copying citation: ' + err);
+                });
+        }
+
+</script>
+
+<style>
+    #citation-container {
+        display: flex;
+        flex: auto;
+        gap: 10px;
+    }
+
+    #citation-copy {
+        cursor: pointer;
+    }
+
+    #citation-copy:hover {
+        color: var(--bexis2-gray-3);
+    }
+
+</style>

Console/Workspace

@@ -25,7 +25,7 @@ BEGIN TRANSACTION;
 update datatypes
 	set 
 	name = 'Text',
-	description = 'A unicode string'
+	description = 'A special data type for very long sequences of character.'
 	where id = (select id systemtype from datatypes where systemtype = 'String'  and name =	'text' 
 		order by id
 		limit 1);
@@ -37,7 +37,7 @@ update datatypes
 update datatypes
 	set 
 	name = 'String',
-	description = 'A unicode string'
+	description = 'A sequence of characters, such as letters, numbers, or symbols (e.g., IDs).'
 	where id = (select id systemtype from datatypes where systemtype = 'String'  and name =	'string' 
 		order by id
 		limit 1);
@@ -65,7 +65,7 @@ select id from datatypes where SystemType like 'Int%';
 update datatypes
 set 
 name = 'Integer',
-description = 'An 64 bit integer number'
+description = 'A data type for whole numbers. In this case, it corresponds to Int64, a 64-bit integer that can represent large values.'
 where id = (select id systemtype from datatypes where systemtype = 'Int64' 
 order by id
 limit 1);
@@ -89,7 +89,7 @@ select id from datatypes where SystemType = 'Double';
 update datatypes
 set 
 name = 'Floating Point Number',
-description = 'A precise real number with a restricted range'
+description = 'A floating-point number with double precision (for decimal values, e.g., 3.14159).'
 where id = (select id systemtype from datatypes where systemtype = 'Double' 
 order by id
 limit 1);
@@ -112,23 +112,23 @@ select * from datatypes where systemtype = 'DateTime';
 update datatypes
 set 
 name = 'Date and Time',
-description = 'A date with / or time'
+description = 'A data type for storing both a calendar date and a time.'
 where id = (select id systemtype from datatypes where systemtype = 'DateTime' and name = 'datetime' 
 order by id
 limit 1);
 
 update datatypes
 set 
 name = 'Date',
-description = 'A date'
+description = 'A data type for storing a calendar date without time.'
 where id = (select id systemtype from datatypes where systemtype = 'DateTime' and name = 'date' 
 order by id
 limit 1);
 
 update datatypes
 set 
 name = 'Time',
-description = 'A time'
+description = 'A data type for storing a time of day without a date.'
 where id = (select id systemtype from datatypes where systemtype = 'DateTime' and name = 'time' 
 order by id
 limit 1);
@@ -150,7 +150,7 @@ where datatyperef in (select id from datatypes where SystemType = 'DateTime');
 update datatypes
 set 
 name = 'Boolean',
-description = 'A boolean value'
+description = 'A logical data type with only two possible values: true or false; 0 or 1.'
 where id = (select id systemtype from datatypes where systemtype = 'Boolean' 
 order by id
 limit 1);