Merge pull request #185 from bexis/dev_v3

Dev v3

Author: EleonoraPetzold

Components/IO/BExIS.IO.DataType.DisplayPattern/DataTypeDisplayPattern.cs

@@ -41,7 +41,8 @@ public class DataTypeDisplayPattern
             new DataTypeDisplayPattern() {Id=27,Systemtype = DataTypeCode.DateTime,   Name = "Minute",            ExcelPattern=@"mm",          DisplayPattern="mm",                StringPattern = "mm",              RegexPattern = null},
             new DataTypeDisplayPattern() {Id=28,Systemtype = DataTypeCode.DateTime,   Name = "Secound",            ExcelPattern=@"ss",          DisplayPattern="ss",                StringPattern = "ss",              RegexPattern = null},
             new DataTypeDisplayPattern() {Id=29,Systemtype = DataTypeCode.DateTime,   Name = "DateEu with time24",            ExcelPattern=@"dd\.MM\.yyyy HH:mm:ss",          DisplayPattern="dd.MM.yyyy HH:mm:ss",                StringPattern = "dd.MM.yyyy HH:mm:ss",              RegexPattern = null},
-            new DataTypeDisplayPattern() {Id=30,Systemtype = DataTypeCode.DateTime,   Name = "DateTimeIso without sec",            ExcelPattern=@"yyyy-MM-dd\Thh:mm",          DisplayPattern="yyyy-MM-ddThh:mm",                StringPattern = "yyyy-MM-ddTHH:mm",              RegexPattern = null}
+            new DataTypeDisplayPattern() {Id=30,Systemtype = DataTypeCode.DateTime,   Name = "DateTimeIso without sec",            ExcelPattern=@"yyyy-MM-dd\Thh:mm",          DisplayPattern="yyyy-MM-ddThh:mm",                StringPattern = "yyyy-MM-ddTHH:mm",              RegexPattern = null},
+            new DataTypeDisplayPattern() {Id=31,Systemtype = DataTypeCode.DateTime,   Name = "DateTimeIso withou T",            ExcelPattern=@"yyyy-MM-dd hh:mm:ss",          DisplayPattern="yyyyy-MM-dd hh:mm:ss",                StringPattern = "yyyy-MM-dd hh:mm:ss",              RegexPattern = null}
 
         };
 

Components/IO/BExIS.IO.Tests/IOUtilityTests.cs

@@ -34,6 +34,7 @@ public void OneTimeTearDown()
         {
         }
 
+        [TestCase("2026-12-24 05:05:50", "yyyy-MM-dd hh:mm:ss", "12/24/2026 5:05:50 AM", true, "en-US")]
         [TestCase("12:00 pm", "hh:mm tt", "1/1/0001 12:00:00 PM", true, "en-US")]
         [TestCase("12:00:00 pm", "hh:mm:ss tt", "1/1/0001 12:00:00 PM", true, "en-US")]
         [TestCase("2023-29-12", "yyyy-d-M", "12/29/2023 12:00:00 AM", true)]
@@ -118,6 +119,9 @@ public void ConvertStringToDateTimeWithpatternTest(string input, string pattern,
                 else result.ToString( new CultureInfo("en-US", false)).Should().BeNullOrEmpty();
             }
         }
+
+
+        [TestCase("2026-12-24 05:05:50", "yyyy-MM-dd hh:mm:ss", "12/24/2026 5:05:50 AM", true, "en-US")]
         [TestCase("12:00 pm", "hh:mm tt", "1/1/0001 12:00:00 PM", true, "en-US")]
         [TestCase("12:00:00 pm", "hh:mm:ss tt", "1/1/0001 12:00:00 PM", true, "en-US")]
         [TestCase("2023-29-12", "yyyy-d-M", "12/29/2023 12:00:00 AM", true)]

Components/Utils/BExIS.Utils/BExIS.Utils.csproj

@@ -407,10 +407,18 @@
       <Project>{0815d220-3625-4e23-bbbc-8152345637fe}</Project>
       <Name>Vaiona.Entities</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Vaiona\Vaiona.Utils\Vaiona.Utils.csproj">
+      <Project>{63FCACAA-9534-4FDD-A082-78DCC06BAF28}</Project>
+      <Name>Vaiona.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Vaiona\Vaiona.Web.Mvc.Modularity\Vaiona.Web.Mvc.Modularity.csproj">
       <Project>{705f8751-e58a-453e-a7fd-0c310fd3cae8}</Project>
       <Name>Vaiona.Web.Mvc.Modularity</Name>
     </ProjectReference>
+    <ProjectReference Include="..\BExIS.Utils.Config\BExIS.Utils.Config.csproj">
+      <Project>{6EAD7D02-02F7-42FF-85E4-90BB892D3846}</Project>
+      <Name>BExIS.Utils.Config</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

Components/Utils/BExIS.Utils/WebHelpers/HtmlNavigationExtensions.cs

@@ -1,6 +1,7 @@
 using BExIS.Security.Entities.Subjects;
 using BExIS.Security.Services.Authorization;
 using BExIS.Security.Services.Objects;
+using BExIS.Utils.Config;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -31,6 +32,8 @@ public static MvcHtmlString LaunchBar(this HtmlHelper htmlHelper)
 
             foreach (var launchBarItem in lunchBarRoot.Elements())
             {
+
+
                 if (launchBarItem.HasElements)
                 {
                     sb.Append($"<li class='dropdown'><a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>{launchBarItem.Attribute("title").Value}<span class='caret'></span></a><ul class='dropdown-menu'>");
@@ -47,12 +50,21 @@ public static MvcHtmlString LaunchBar(this HtmlHelper htmlHelper)
                         if (!string.IsNullOrWhiteSpace(child.Attribute("action").Value))
                             sb.Append(@"/").Append(child.Attribute("action").Value.ToLower());
 
-                        if (child.Attribute("argument") != null &&  !string.IsNullOrWhiteSpace(child.Attribute("argument").Value))
+                        if (child.Attribute("argument") != null && !string.IsNullOrWhiteSpace(child.Attribute("argument").Value))
                             sb.Append(@"/").Append(child.Attribute("argument").Value.ToLower());
 
                         sb.Append("' target=\"_blank\" >").Append(child.Attribute("title").Value).Append("</a></li>");
                     }
 
+                    if (launchBarItem.HasAttributes && launchBarItem.Attribute("id").Value.Equals("help"))
+                    {
+                        var help_list = GeneralSettings.GetValueByKey("help") as List<Vaiona.Utils.Cfg.Entry>;
+                        foreach (var help in help_list)
+                        {
+                            sb.Append($"<li><a href='{help.Value}' target=\"_blank\" >{help.Description}</a></li>");
+                        }
+                    }
+
                     sb.Append($"</ul></li>");
                 }
                 else
@@ -72,6 +84,7 @@ public static MvcHtmlString LaunchBar(this HtmlHelper htmlHelper)
 
                     sb.Append("'>").Append(launchBarItem.Attribute("title").Value).Append("</a></li>");
                 }
+                
             }
 
             return new MvcHtmlString(sb.ToString());

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Content/bexis-metadata.css

@@ -50,7 +50,7 @@ Green 05  #eff7f6
 
 .optionContainer {
     float: right;
-    /*margin-top: -28px;*/
+    margin-top: -28px;
 }
 
     .optionContainer table,

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Dcm.Settings.json

@@ -1,72 +1,66 @@
 {
-  "id": "dcm",
-  "name": "Dataset Creation",
   "description": "...",
   "entries": [
-
     {
+      "description": "This number of cells determines whether an upload of structured data should be executed directly or async.",
       "key": "celllimit",
       "title": "Number of cells for direct upload instead of async",
-      "value": 2000,
-      "description": "This number of cells determines whether an upload of structured data should be executed directly or async.",
       "type": "Int32",
-      "options": []
+      "value": 2000
     },
     {
-      "key": "fileuploadDescription",
-      "title": "File upload description",
-      "value": "required",
       "description": "If it is activated, adding a description per file is possible.",
-      "type": "String",
+      "key": "fileuploadDescription",
       "options": [
         "none",
         "active",
         "required"
-      ]
+      ],
+      "title": "File upload description",
+      "type": "String",
+      "value": "required"
     },
     {
+      "description": "Allow multiple files to be uploaded at the same time.",
       "key": "allowMultiFileupload",
       "title": "Multiple file upload",
-      "value": true,
-      "description": "Allow multiple files to be uploaded at the same time.",
       "type": "Boolean",
-      "options": []
+      "value": true
     },
     {
-      "key": "attachmentDescription",
-      "title": "Attachment description",
-      "value": "active",
       "description": "If it is activated, adding a description per file is possible.",
-      "type": "String",
+      "key": "attachmentDescription",
       "options": [
         "none",
         "active",
         "required"
-      ]
+      ],
+      "title": "Attachment description",
+      "type": "String",
+      "value": "active"
     },
     {
+      "description": "Allow multiple files to be uploaded at the same time.",
       "key": "allowMultiAttachmentUpload",
       "title": "Multiple attachment upload",
-      "value": false,
-      "description": "Allow multiple files to be uploaded at the same time.",
       "type": "Boolean",
-      "options": []
+      "value": true
     },
     {
+      "description": "Enables the loading of an external metadata form when editing entities",
       "key": "useExternalMetadataForm",
       "title": "Use external metadata form",
-      "value": false,
-      "description": "Enables the loading of an external metadata form when editing entities",
       "type": "Boolean",
-      "options": []
+      "value": false
     },
     {
+      "description": "Define the origin from where the external metadata form should be loaded",
       "key": "externalMetadataFormUrl",
       "title": "External metadata form destination url",
-      "value": "",
-      "description": "Define the origin from where the external metadata form should be loaded",
       "type": "String",
-      "options": []
+      "value": ""
     }
-  ]
+  ],
+  "id": "dcm",
+  "name": "Dataset Creation"
 }

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Views/Dashboard/_myDatasetsViewHeader.cshtml

@@ -13,8 +13,8 @@
 {
 
     <ul class="nav nav-tabs">
-        <li class="active"><a href="#" id="own">Own</a></li>
-        <li><a href="#" id="edit">Edit</a></li>
+        <li class="active"><a href="#" id="own">PI/Contact</a></li>
+        <li><a href="#" id="edit">Own/Edit</a></li>
         <li><a href="#" id="download">Download</a></li>
     </ul>
 }