Merge branch 'rc' of https://github.com/bexis2/core into rc

Author: sventhiel

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

@@ -42,7 +42,8 @@ public class DataTypeDisplayPattern
             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=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}
+            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},
+            new DataTypeDisplayPattern() {Id=32,Systemtype = DataTypeCode.DateTime,   Name = "DateTimeIso withou T and 24h",            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,7 +34,8 @@ 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("2024-05-17 16:00:54", "yyyy-MM-dd HH:mm:ss", "5/17/2024 4:00:54 PM", true, "en-US")]
+        [TestCase("2024-05-17 04:00:54", "yyyy-MM-dd hh:mm:ss", "5/17/2024 4:00:54 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.Data/Upload/UploadHelper.cs

@@ -467,11 +467,7 @@ public bool IsUnique(long datasetId, string ext, string filename, string filepat
                             // 2 [2][Javad] = 2Javad
                             foreach (List<string> l in tempList)
                             {
-                                string tempString = "";
-                                foreach (string s in l)
-                                {
-                                    tempString += s;
-                                }
+                                string tempString = String.Join("_", l);
                                 if (!String.IsNullOrEmpty(tempString)) primaryValuesAsOneString.Add(tempString);
                             }