Merge branch 'rc' of https://github.com/BEXIS2/Core into rc

Author: geofranzi

BExIS++.sln

@@ -1606,8 +1606,8 @@ Global
 		{37402CAB-EB81-4D08-8791-8653949C0FEB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
 		SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}
+		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
 	EndGlobalSection
 	GlobalSection(SubversionScc) = preSolution
 		Svn-Managed = True

Components/IO/BExIS.Io.Transform.Output/OutputDataStructureManager.cs

@@ -5,11 +5,18 @@
 using BExIS.Dlm.Services.DataStructure;
 using BExIS.Dlm.Services.Meanings;
 using BExIS.IO.DataType.DisplayPattern;
+using DocumentFormat.OpenXml.Drawing.Charts;
+using DocumentFormat.OpenXml.Math;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.IO;
 using System.Linq;
+using System.Text;
+using System.Web.Configuration;
+using Vaiona.Utils.Cfg;
+using DataTable = System.Data.DataTable;
 
 namespace BExIS.IO.Transform.Output
 {
@@ -426,16 +433,36 @@ public static string GetDataStructureAsJson(long id)
             return JsonConvert.SerializeObject(new DataStructureDataTable(id));
         }
 
-        //public static string GetVariableListAsJson(long id)
-        //{
-        //    return JsonConvert.SerializeObject(new DataStructureDataList(id), Newtonsoft.Json.Formatting.Indented);
-        //}
 
         public static DataStructureDataList GetVariableList(long id)
         {
             return new DataStructureDataList(id);
         }
 
+        public static string GenerateDataStructureAsText(long datastructureId)
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+
+            using (var dataStructureManager = new DataStructureManager())
+            {
+                StructuredDataStructure dataStructure = new StructuredDataStructure();
+                dataStructure = dataStructureManager.StructuredDataStructureRepo.Get(datastructureId);
+
+                if (dataStructure != null)
+                {
+                    stringBuilder.AppendLine(String.Join(",", dataStructure.Variables.Select(v => v.Label)));
+                    stringBuilder.AppendLine(String.Join(",", dataStructure.Variables.Select(v => v.Unit?.Name)));
+                    stringBuilder.AppendLine(String.Join(",", dataStructure.Variables.Select(v => v.Description)));
+                    stringBuilder.AppendLine(String.Join(",", dataStructure.Variables.Select(v => v.DataType?.Name)));
+                    stringBuilder.AppendLine(String.Join(",", dataStructure.Variables.Select(v => v.IsValueOptional? "optional" : "mandatory")));
+                    stringBuilder.AppendLine(String.Join(",", dataStructure.Variables.Select(v => v.IsKey?"primary key":"")));
+                }
+            }
+
+            return stringBuilder.ToString();
+        }
+
+
         public static string GenerateDataStructure(long datasetId)
         {
             string path = "";

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package-lock.json

@@ -51,7 +51,7 @@
 	"type": "module",
 	"dependencies": {
 		"@bexis2/bexis2-core-ui": "0.4.58",
-		"@bexis2/bexis2-rpm-ui": "0.2.13",
+		"@bexis2/bexis2-rpm-ui": "0.2.14",
 		"@floating-ui/dom": "1.6.8",
 		"@fortawesome/free-solid-svg-icons": "6.6.0",
 		"@sveltejs/adapter-static": "3.0.2",

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

@@ -47,7 +47,7 @@ public class DatasetOutController : ApiController
         /// </summary>
         [BExISApiAuthorize]
         [HttpGet]
-        [Route("")]
+        [GetRoute("")]
         [ResponseType(typeof(ApiSimpleDatasetModel))]
         public IEnumerable<ApiSimpleDatasetModel> Get()
         {

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/API/DatasetOutController.cs

@@ -274,15 +274,24 @@ public ActionResult GenerateZip(long id, long versionid, string format,bool with
                         DataStructure dataStructure = dataStructureManager.StructuredDataStructureRepo.Get(dataStructureId);
 
                         string dataStructurePath = "";
-                        dataStructurePath = storeGeneratedFilePathToContentDiscriptor(id, datasetVersion,
-                            "datastructure", ".json");
+                        dataStructurePath = storeGeneratedFilePathToContentDiscriptor(id, datasetVersion,"datastructure", ".json");
                         string datastructureFilePath = AsciiWriter.CreateFile(dataStructurePath);
 
+                        // generate json
                         string json = OutputDataStructureManager.GetDataStructureAsJson(dataStructureId);
-
                         AsciiWriter.AllTextToFile(datastructureFilePath, json);
 
+                        // generate txt
+                        dataStructurePath = storeGeneratedFilePathToContentDiscriptor(id, datasetVersion,"datastructure", ".csv");
+                        datastructureFilePath = AsciiWriter.CreateFile(dataStructurePath);
+
+                        string txt =  OutputDataStructureManager.GenerateDataStructureAsText(dataStructureId);
+
+                        AsciiWriter.AllTextToFile(datastructureFilePath, txt);
+
+                        // generate html
                         generateDataStructureHtml(datasetVersion);
+
                     }
 
                     #endregion
@@ -342,7 +351,7 @@ public ActionResult GenerateZip(long id, long versionid, string format,bool with
                         {
                             string path = Path.Combine(AppConfiguration.DataPath, filteredFilePath);
                             string ext = Path.GetExtension(filteredFilePath).ToLower();
-                            string name = IOHelper.GetFileName(FileType.PrimaryData, id, datasetVersionNumber, dataStructureId)+"filtered"+ ext;
+                            string name = IOHelper.GetFileName(FileType.PrimaryData, id, datasetVersionNumber, dataStructureId)+"_filtered"+ ext;
 
                             archive.AddFileToArchive(filteredFilePath, name);
                         }
@@ -573,8 +582,7 @@ private void generateDataStructureHtml(DatasetVersion dsv)
             byte[] content = Encoding.ASCII.GetBytes(view.ToString());
 
             string dynamicPathOfMD = "";
-            dynamicPathOfMD = storeGeneratedFilePathToContentDiscriptor(dsv.Dataset.Id, dsv,
-                "datastructure", ".html");
+            dynamicPathOfMD = storeGeneratedFilePathToContentDiscriptor(dsv.Dataset.Id, dsv,"datastructure", ".html");
             string metadataFilePath = AsciiWriter.CreateFile(dynamicPathOfMD);
 
             AsciiWriter.AllTextToFile(metadataFilePath, view.ToString());

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/ExportController.cs

@@ -1,6 +1,6 @@
 {
   "name": "@bexis2/bexis2-rpm-ui",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "private": false,
   "scripts": {
     "dev": "vite dev",

Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/package-lock.json

@@ -25,6 +25,7 @@
 			enforcePrimaryKey="true"
 			changeablePrimaryKey="true"
 			updateDescriptionByTemplate="false"
+			showDarwinCoreValidation="true"
 			>
 				%sveltekit.body%
 		</div>

Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/package.json

@@ -206,6 +206,15 @@ export const getConstraints = async () => {
 	}
 };
 
+export const getDWCList = async () => {
+	try {
+		const response = await Api.get('/rpm/DataStructure/getDWCRequirements');
+		return response.data;
+	} catch (error) {
+		console.error(error);
+	}
+};
+
 // go to a internal action
 export const goTo = async (url: string) => {
 	window.open(host + url, '_self').focus();