From 0b8beea0e3c9a9193e63d8710714dcb1ed3016ed Mon Sep 17 00:00:00 2001 From: Brano5 Date: Mon, 10 Jul 2023 09:43:36 +0200 Subject: [PATCH 01/10] Create draft PR for #112 From 5cd1866a79b174da0fcaec406a57812d005629c5 Mon Sep 17 00:00:00 2001 From: Branko Zachemsky Date: Mon, 10 Jul 2023 15:26:47 +0200 Subject: [PATCH 02/10] Visualization for custom export --- .../AxoDataExchange/DataExchangeView.razor | 75 +++++++++++++++++++ .../AxoDataExchange/DataExchangeViewModel.cs | 26 +++++++ 2 files changed, 101 insertions(+) diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor index ea7e70923..86bd522df 100644 --- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor @@ -1,6 +1,7 @@ @namespace AXOpen.Data @using AXOpen.Data; @using AXSharp.Abstractions.Dialogs.AlertDialog; +@using AXSharp.Connector; @using CommunityToolkit.Mvvm.ComponentModel; @using CommunityToolkit.Mvvm.Messaging; @using Microsoft.AspNetCore.Components.Forms; @@ -374,6 +375,7 @@ else }
+
@@ -407,4 +409,77 @@ else + + } \ No newline at end of file diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs index 2ad11dedc..e6e6847f2 100644 --- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs @@ -326,5 +326,31 @@ public void ImportData(string path) public int Page { get; set; } = 0; public string CreateItemId { get; set; } public bool IsBusy { get; set; } + + public eExportMode Export; + public int FirstNumber = 50; + public int SecondNumber = 100; + public eFileType FileType; + public char Separator = ';'; + + public enum eExportMode + { + First, + Last, + Exact + } + + public enum eFileType + { + csv, + txt, + excel + } + + public IEnumerable GetValueTags(ITwinObject obj) + { + var prototype = Activator.CreateInstance(obj.GetType(), new object[] { ConnectorAdapterBuilder.Build().CreateDummy().GetConnector(new object[] { }), "_data", "_data" }) as ITwinObject; + return prototype.RetrievePrimitives(); + } } } From 9bc83e7a68275cd3d65c7616a9c8be54d8e99b85 Mon Sep 17 00:00:00 2001 From: Branko Zachemsky Date: Thu, 13 Jul 2023 15:21:19 +0200 Subject: [PATCH 03/10] WIP Added option to customize export in DataExchangeView. Implement CSV, TXT exporter and importer. --- .../AxoDataExchange/DataExchangeView.razor | 38 +-- .../AxoDataExchange/DataExchangeViewModel.cs | 62 ++-- .../DataExchange/AxoDataExchange.cs | 62 +++- .../DataExchange/IAxoDataExchange.cs | 2 +- .../AxoDataFragmentExchange.cs | 6 +- .../ExportImport/BaseDataExporter.cs | 269 ++++++++++++++++++ .../ExportImport/CSVDataExporter.cs | 228 +-------------- .../AXOpen.Data/ExportImport/FragmentData.cs | 20 ++ .../AXOpen.Data/ExportImport/IDataExporter.cs | 2 +- .../ExportImport/TXTDataExporter.cs | 47 +++ .../AXOpen.Data/ExportImport/eExportMode.cs | 15 + .../src/AXOpen.Data/ExportImport/eFileType.cs | 14 + 12 files changed, 495 insertions(+), 270 deletions(-) create mode 100644 src/data/src/AXOpen.Data/ExportImport/BaseDataExporter.cs create mode 100644 src/data/src/AXOpen.Data/ExportImport/FragmentData.cs create mode 100644 src/data/src/AXOpen.Data/ExportImport/TXTDataExporter.cs create mode 100644 src/data/src/AXOpen.Data/ExportImport/eExportMode.cs create mode 100644 src/data/src/AXOpen.Data/ExportImport/eFileType.cs diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor index 86bd522df..3e5e5989c 100644 --- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor @@ -392,7 +392,11 @@ else
- + +
+
+ Separator +
@@ -419,22 +423,23 @@ else
@{bool firstIteration = true;} - @foreach (var db in Vm.DataExchange.RefUIData.GetChildren()) + @foreach (var fragment in Vm.DataExchange.RefUIData.GetChildren().DefaultIfEmpty(Vm.DataExchange.RefUIData)) {

-

-
+
    - @foreach (var item in Vm.GetValueTags(db)) + @foreach (var item in Vm.GetValueTags(fragment)) {
  • - - + +
    • }
@@ -445,13 +450,13 @@ else }
- + - @if (Vm.Export == DataExchangeViewModel.eExportMode.Exact) + @if (Vm.ExportMode == eExportMode.Exact) {
From
@@ -465,12 +470,11 @@ else
records
- - - + +
- Separator + Separator
diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs index e6e6847f2..c1740788f 100644 --- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs @@ -18,6 +18,8 @@ using System.Numerics; using AXSharp.Abstractions.Dialogs.AlertDialog; using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.DataProtection.KeyManagement; +using Newtonsoft.Json.Linq; namespace AXOpen.Data { @@ -289,7 +291,7 @@ public void ExportData(string path) try { - DataExchange.ExportData(path); + DataExchange.ExportData(path, Fragments, ExportMode, FirstNumber, SecondNumber, ExportFileType, Separator); IsFileExported = true; @@ -305,7 +307,7 @@ public void ImportData(string path) { try { - DataExchange.ImportData(path); + DataExchange.ImportData(path, separator: Separator); this.UpdateObservableRecords(); @@ -327,30 +329,54 @@ public void ImportData(string path) public string CreateItemId { get; set; } public bool IsBusy { get; set; } - public eExportMode Export; - public int FirstNumber = 50; - public int SecondNumber = 100; - public eFileType FileType; - public char Separator = ';'; + public Dictionary Fragments { get; set; } = new(); + public eExportMode ExportMode { get; set; } = eExportMode.First; + public int FirstNumber { get; set; } = 50; + public int SecondNumber { get; set; } = 100; + public eFileType ExportFileType { get; set; } = eFileType.csv; + public char Separator { get; set; } = ';'; - public enum eExportMode + public IEnumerable GetValueTags(ITwinObject obj) + { + var prototype = Activator.CreateInstance(obj.GetType(), new object[] { ConnectorAdapterBuilder.Build().CreateDummy().GetConnector(new object[] { }), "_data", "_data" }) as ITwinObject; + return prototype.RetrievePrimitives(); + } + + public void ChangeFragmentDataValue(ChangeEventArgs __e, string fragmentDataKey, string fragmentKey) { - First, - Last, - Exact + if (!Fragments.ContainsKey(fragmentKey)) + { + Fragments.Add(fragmentKey, new FragmentData(true, new Dictionary())); + Fragments[fragmentKey].Data.Add(fragmentDataKey, (bool)__e.Value); + } + else + { + if (!Fragments[fragmentKey].Data.ContainsKey(fragmentDataKey)) + { + Fragments[fragmentKey].Data.Add(fragmentDataKey, (bool)__e.Value); + } + else + { + Fragments[fragmentKey].Data[fragmentDataKey] = (bool)__e.Value; + } + } } - public enum eFileType + public void ChangeFragmentsValue(ChangeEventArgs __e, string fragmentKey) { - csv, - txt, - excel + if (!Fragments.ContainsKey(fragmentKey)) + { + Fragments.Add(fragmentKey, new FragmentData((bool)__e.Value, new Dictionary())); + } + else + { + Fragments[fragmentKey].Exported = (bool)__e.Value; + } } - public IEnumerable GetValueTags(ITwinObject obj) + public bool GetFragmentExportedValue(string fragmentKey) { - var prototype = Activator.CreateInstance(obj.GetType(), new object[] { ConnectorAdapterBuilder.Build().CreateDummy().GetConnector(new object[] { }), "_data", "_data" }) as ITwinObject; - return prototype.RetrievePrimitives(); + return Fragments.GetValueOrDefault(fragmentKey, new FragmentData(true, new Dictionary())).Exported; } } } diff --git a/src/data/src/AXOpen.Data/DataExchange/AxoDataExchange.cs b/src/data/src/AXOpen.Data/DataExchange/AxoDataExchange.cs index c263720fa..07fd006b1 100644 --- a/src/data/src/AXOpen.Data/DataExchange/AxoDataExchange.cs +++ b/src/data/src/AXOpen.Data/DataExchange/AxoDataExchange.cs @@ -354,8 +354,22 @@ public async Task CreateCopyCurrentShadowsAsync(string recordId) } /// - public void ExportData(string path, char separator = ';') + public void ExportData(string path, Dictionary? fragments = null, eExportMode exportMode = eExportMode.First, int firstNumber = 50, int secondNumber = 100, eFileType exportFileType = eFileType.csv, char separator = ';') { + if (fragments == null) + fragments = new Dictionary(); + + IDataExporter dataExporter = null; + switch (exportFileType) + { + case eFileType.csv: + dataExporter = new CSVDataExporter(); + break; + case eFileType.txt: + dataExporter = new TXTDataExporter(); + break; + } + if (Path.GetExtension(path).Equals(".zip", StringComparison.OrdinalIgnoreCase)) { if (Directory.Exists(Path.GetDirectoryName(path) + "\\exportDataPrepare")) @@ -365,15 +379,17 @@ public async Task CreateCopyCurrentShadowsAsync(string recordId) File.Delete(path); - IDataExporter dataExporter = new CSVDataExporter(); - dataExporter.Export(DataRepository, Path.GetDirectoryName(path) + "\\exportDataPrepare\\" + this.ToString(), p => true, separator); + FragmentData a = fragments.GetValueOrDefault(RefUIData.ToString(), new FragmentData(true, new Dictionary())); + if (a.Exported) + dataExporter.Export(DataRepository, Path.GetDirectoryName(path) + "\\exportDataPrepare\\" + this.ToString(), p => true, a.Data, exportMode, firstNumber, secondNumber, separator); ZipFile.CreateFromDirectory(Path.GetDirectoryName(path) + "\\exportDataPrepare", path); } else { - IDataExporter dataExporter = new CSVDataExporter(); - dataExporter.Export(DataRepository, path, p => true, separator); + FragmentData a = fragments.GetValueOrDefault(RefUIData.ToString(), new FragmentData(true, new Dictionary())); + if(a.Exported) + dataExporter.Export(DataRepository, path, p => true, a.Data, exportMode, firstNumber, secondNumber, separator); } } @@ -389,7 +405,23 @@ public async Task CreateCopyCurrentShadowsAsync(string recordId) ZipFile.ExtractToDirectory(path, Path.GetDirectoryName(path) + "\\importDataPrepare"); - IDataExporter dataExporter = new CSVDataExporter(); + IDataExporter dataExporter = null; + + var files = Directory.GetFiles(Path.GetDirectoryName(path) + "\\importDataPrepare", this.ToString() + "*"); + + if (files == null || files.Length == 0) + return; + + switch (Path.GetExtension(files.First())) + { + case ".csv": + dataExporter = new CSVDataExporter(); + break; + case ".txt": + dataExporter = new TXTDataExporter(); + break; + } + dataExporter.Import(DataRepository, Path.GetDirectoryName(path) + "\\importDataPrepare\\" + this.ToString(), crudDataObject, separator); if (Directory.Exists(Path.GetDirectoryName(path))) @@ -397,7 +429,23 @@ public async Task CreateCopyCurrentShadowsAsync(string recordId) } else { - IDataExporter dataExporter = new CSVDataExporter(); + IDataExporter dataExporter = null; + + var files = Directory.GetFiles(Path.GetDirectoryName(path), this.ToString() + "*"); + + if (files == null || files.Length == 0) + return; + + switch (Path.GetExtension(files.First())) + { + case ".csv": + dataExporter = new CSVDataExporter(); + break; + case ".txt": + dataExporter = new TXTDataExporter(); + break; + } + dataExporter.Import(DataRepository, path, crudDataObject, separator); } } diff --git a/src/data/src/AXOpen.Data/DataExchange/IAxoDataExchange.cs b/src/data/src/AXOpen.Data/DataExchange/IAxoDataExchange.cs index 4f487511b..4c0b3d477 100644 --- a/src/data/src/AXOpen.Data/DataExchange/IAxoDataExchange.cs +++ b/src/data/src/AXOpen.Data/DataExchange/IAxoDataExchange.cs @@ -147,7 +147,7 @@ IEnumerable GetRecords(string identifier, int limit, int s /// /// Path to exported file. /// Separator for individual records. - void ExportData(string path, char separator = ';'); + void ExportData(string path, Dictionary fragments = null, eExportMode exportMode = eExportMode.First, int firstNumber = 50, int secondNumber = 100, eFileType exportFileType = eFileType.csv, char separator = ';'); /// /// Import data from file to the associated with this . diff --git a/src/data/src/AXOpen.Data/DataFragmentExchange/AxoDataFragmentExchange.cs b/src/data/src/AXOpen.Data/DataFragmentExchange/AxoDataFragmentExchange.cs index 00abf422b..33945c4b6 100644 --- a/src/data/src/AXOpen.Data/DataFragmentExchange/AxoDataFragmentExchange.cs +++ b/src/data/src/AXOpen.Data/DataFragmentExchange/AxoDataFragmentExchange.cs @@ -292,7 +292,7 @@ public IEnumerable GetRecords(string identifier) return this.GetDataSetPropertyInfo()?.Select(p => p.GetValue(this) as TS); } - public void ExportData(string path, char separator = ';') + public void ExportData(string path, Dictionary fragments = null, eExportMode exportMode = eExportMode.First, int firstNumber = 50, int secondNumber = 100, eFileType exportFileType = eFileType.csv, char separator = ';') { if (Path.GetExtension(path).Equals(".zip", StringComparison.OrdinalIgnoreCase)) { @@ -306,7 +306,7 @@ public IEnumerable GetRecords(string identifier) foreach (var fragment in DataFragments) { - fragment?.ExportData(Path.GetDirectoryName(path) + "\\exportDataPrepare\\" + fragment.ToString(), separator); + fragment?.ExportData(Path.GetDirectoryName(path) + "\\exportDataPrepare\\" + fragment.ToString(), fragments, exportMode, firstNumber, secondNumber, exportFileType, separator); } ZipFile.CreateFromDirectory(Path.GetDirectoryName(path) + "\\exportDataPrepare", path); } @@ -314,7 +314,7 @@ public IEnumerable GetRecords(string identifier) { foreach (var fragment in DataFragments) { - fragment?.ExportData(Path.GetDirectoryName(path) + "\\" + fragment.ToString(), separator); + fragment?.ExportData(Path.GetDirectoryName(path) + "\\" + fragment.ToString(), fragments, exportMode, firstNumber, secondNumber, exportFileType, separator); } } } diff --git a/src/data/src/AXOpen.Data/ExportImport/BaseDataExporter.cs b/src/data/src/AXOpen.Data/ExportImport/BaseDataExporter.cs new file mode 100644 index 000000000..01a7bbd33 --- /dev/null +++ b/src/data/src/AXOpen.Data/ExportImport/BaseDataExporter.cs @@ -0,0 +1,269 @@ +using AXOpen.Base.Data; +using AXSharp.Connector.ValueTypes.Online; +using AXSharp.Connector.ValueTypes; +using AXSharp.Connector; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; +namespace AXOpen.Data +{ + public class BaseDataExporter where TOnline : IAxoDataEntity + where TPlain : Pocos.AXOpen.Data.IAxoDataEntity, new() + { + public BaseDataExporter() + { + } + + public List BaseExport(IRepository repository, Expression> expression, Dictionary? fragmentData = null, eExportMode exportMode = eExportMode.First, int firstNumber = 50, int secondNumber = 100, char separator = ';') + { + if (fragmentData == null) + fragmentData = new Dictionary(); + + var prototype = Activator.CreateInstance(typeof(TOnline), new object[] { ConnectorAdapterBuilder.Build().CreateDummy().GetConnector(new object[] { }), "_data", "_data" }) as ITwinObject; + + IQueryable exportables = null; + switch (exportMode) + { + case eExportMode.First: + exportables = repository.Queryable.Where(expression).Take(firstNumber); + break; + case eExportMode.Last: + exportables = repository.Queryable.Where(expression).TakeLast(firstNumber); + break; + case eExportMode.Exact: + exportables = repository.Queryable.Where(expression).Skip(firstNumber - 1).Take(secondNumber - firstNumber + 1); + break; + } + + var itemExport = new StringBuilder(); + var export = new List(); + + // Create header + var valueTags = prototype.RetrievePrimitives(); + foreach (var valueTag in valueTags) + { + if (!fragmentData.GetValueOrDefault(valueTag.Symbol, true)) + continue; + itemExport.Append($"{valueTag.Symbol}{separator}"); + } + + export.Add(itemExport.ToString()); + itemExport.AppendLine(); + + itemExport.Clear(); + foreach (var valueTag in valueTags) + { + if (!fragmentData.GetValueOrDefault(valueTag.Symbol, true)) + continue; + itemExport.Append($"{valueTag.HumanReadable}{separator}"); + } + + export.Add(itemExport.ToString()); + itemExport.AppendLine(); + + + foreach (var document in exportables) + { + itemExport.Clear(); + ((dynamic)prototype).PlainToShadow(document); + var values = prototype.RetrievePrimitives(); + foreach (var @value in values) + { + if (!fragmentData.GetValueOrDefault(@value.Symbol, true)) + continue; + var val = (string)(((dynamic)@value).Shadow.ToString()); + if (val.Contains(separator)) + { + val = val.Replace(separator, '►'); + } + + itemExport.Append($"{val}{separator}"); + } + + export.Add(itemExport.ToString()); + + } + + return export; + } + + public void BaseImport(IRepository dataRepository, List imports, ITwinObject crudDataObject = null, char separator = ';') + { + var documents = imports.ToArray(); + var header = documents[0]; + + var headerItems = header.Split(separator); + var dictionary = new List(); + ITwinObject prototype; + + if (crudDataObject == null) + prototype = Activator.CreateInstance(typeof(TOnline), new object[] { ConnectorAdapterBuilder.Build().CreateDummy().GetConnector(new object[] { }), "_data", "_data" }) as ITwinObject; + else + prototype = crudDataObject; + + var valueTags = prototype.RetrievePrimitives(); + + // Get headered dictionary + foreach (var headerItem in headerItems) + { + dictionary.Add(new ImportItems() { Key = headerItem }); + } + + + // Load values + for (int i = 2; i < documents.Count(); i++) + { + var documentItems = documents[i].Split(separator); + for (int a = 0; a < documentItems.Count(); a++) + { + dictionary[a].Value = documentItems[a]; + } + UpdateDocument(dataRepository, dictionary, valueTags, prototype); + } + } + + private void UpdateDocument(IRepository dataRepository, List dictionary, IEnumerable valueTags, ITwinObject prototype) + { + string id = dictionary.FirstOrDefault(p => p.Key.Contains("DataEntityId")).Value; + var existing = dataRepository.Queryable.Where(p => p.DataEntityId == id).FirstOrDefault(); + if (existing != null) + { + ((dynamic)prototype).PlainToShadow(existing); + } + + ((dynamic)prototype).DataEntityId.Shadow = id; + + if (existing != null) ((dynamic)prototype).ChangeTracker.StartObservingChanges(); + // Swap values to shadow + foreach (var item in dictionary) + { + if (!string.IsNullOrEmpty(item.Key)) + { + var tag = valueTags.FirstOrDefault(p => p.Symbol == item.Key); + + if (tag == null) + { + continue; // not exist! + } + + OnlinerBase type = tag as OnlinerBase; + + if (type is OnlinerString || type is OnlinerWString) + { + ((dynamic)tag).Shadow = (CastValue(type, item.Value) as string)?.Replace('►', ';'); + } + else + { + ((dynamic)tag).Shadow = CastValue(type, item.Value); + } + } + } + + if (existing != null) ((dynamic)prototype).ChangeTracker.StopObservingChanges(); + + + if (existing != null) + { + ((dynamic)prototype).ChangeTracker.Import(existing); + + //((dynamic)existing).ShadowToPlain((dynamic)prototype); + existing = existing.ShadowToPlain1(prototype); + dataRepository.Update(existing.DataEntityId, existing); + } + else + { + TPlain newRecord = new TPlain(); + ((dynamic)prototype).ChangeTracker.Import(newRecord); + //((dynamic)newRecord).ShadowToPlain((dynamic)prototype); + newRecord = newRecord.ShadowToPlain1(prototype); + + Task.Delay(1000).Wait(); + + dataRepository.Create(newRecord.DataEntityId, newRecord); + } + } + + private class ImportItems + { + internal string Key { get; set; } + internal dynamic Value { get; set; } + } + + private dynamic CastValue(OnlinerBase type, string @value) + { + switch (type) + { + case OnlinerBool c: + return bool.Parse(@value); + case OnlinerByte c: + return byte.Parse(@value); + + case OnlinerDate c: + return DateTime.Parse(@value); + + case OnlinerDInt c: + return int.Parse(@value); + + case OnlinerDWord c: + return uint.Parse(@value); + + case OnlinerInt c: + return short.Parse(@value); + + case OnlinerLInt c: + return long.Parse(@value); + + case OnlinerLReal c: + return double.Parse(@value); + + case OnlinerLTime c: + return TimeSpan.Parse(@value); + + case OnlinerLWord c: + return ulong.Parse(@value); + + case OnlinerReal c: + return float.Parse(@value); + + case OnlinerSInt c: + return sbyte.Parse(@value); + + case OnlinerString c: + return @value; + + case OnlinerTime c: + return TimeSpan.Parse(@value); + + case OnlinerTimeOfDay c: + return TimeSpan.Parse(@value); + + case OnlinerDateTime c: + return DateTime.Parse(@value); + + case OnlinerUDInt c: + return uint.Parse(@value); + + case OnlinerUInt c: + return ushort.Parse(@value); + + case OnlinerULInt c: + return ulong.Parse(@value); + + case OnlinerUSInt c: + return byte.Parse(@value); + + case OnlinerWord c: + return ushort.Parse(@value); + + case OnlinerWString c: + return @value; + default: + throw new Exception($"Unknown type {type.GetType()}"); + + } + } + } +} diff --git a/src/data/src/AXOpen.Data/ExportImport/CSVDataExporter.cs b/src/data/src/AXOpen.Data/ExportImport/CSVDataExporter.cs index 76b01afc4..37fc57059 100644 --- a/src/data/src/AXOpen.Data/ExportImport/CSVDataExporter.cs +++ b/src/data/src/AXOpen.Data/ExportImport/CSVDataExporter.cs @@ -13,61 +13,16 @@ namespace AXOpen.Data { - public class CSVDataExporter : IDataExporter where TOnline : IAxoDataEntity + public class CSVDataExporter : BaseDataExporter, IDataExporter where TOnline : IAxoDataEntity where TPlain : Pocos.AXOpen.Data.IAxoDataEntity, new() { public CSVDataExporter() { } - public void Export(IRepository repository, string path, Expression> expression, char separator = ';') - { - var prototype = Activator.CreateInstance(typeof(TOnline), new object[] { ConnectorAdapterBuilder.Build().CreateDummy().GetConnector(new object[] { }), "_data", "_data" }) as ITwinObject; - - - var exportables = repository.Queryable.Where(expression); - var itemExport = new StringBuilder(); - var export = new List(); - - // Create header - var valueTags = prototype.RetrievePrimitives(); - foreach (var valueTag in valueTags) - { - itemExport.Append($"{valueTag.Symbol}{separator}"); - } - - export.Add(itemExport.ToString()); - itemExport.AppendLine(); - - itemExport.Clear(); - foreach (var valueTag in valueTags) - { - itemExport.Append($"{valueTag.HumanReadable}{separator}"); - } - - export.Add(itemExport.ToString()); - itemExport.AppendLine(); - - - foreach (var document in exportables) - { - itemExport.Clear(); - ((dynamic)prototype).PlainToShadow(document); - var values = prototype.RetrievePrimitives(); - foreach (var @value in values) - { - var val = (string)(((dynamic)@value).Shadow.ToString()); - if (val.Contains(separator)) - { - val = val.Replace(separator, '►'); - } - - itemExport.Append($"{val}{separator}"); - } - - export.Add(itemExport.ToString()); - - } + public void Export(IRepository repository, string path, Expression> expression, Dictionary fragmentData = null, eExportMode exportMode = eExportMode.First, int firstNumber = 50, int secondNumber = 100, char separator = ';') + { + var export = BaseExport(repository, expression, fragmentData, exportMode, firstNumber, secondNumber, separator); using (var sw = new StreamWriter(path + ".csv")) { @@ -86,180 +41,7 @@ public CSVDataExporter() imports.Add(item); } - var documents = imports.ToArray(); - var header = documents[0]; - - var headerItems = header.Split(separator); - var dictionary = new List(); - - ITwinObject prototype; - - if (crudDataObject == null) - prototype = Activator.CreateInstance(typeof(TOnline), new object[] { ConnectorAdapterBuilder.Build().CreateDummy().GetConnector(new object[] { }), "_data", "_data" }) as ITwinObject; - else - prototype = crudDataObject; - - var valueTags = prototype.RetrievePrimitives(); - - // Get headered dictionary - foreach (var headerItem in headerItems) - { - dictionary.Add(new ImportItems() { Key = headerItem }); - } - - - // Load values - for (int i = 2; i < documents.Count(); i++) - { - var documentItems = documents[i].Split(separator); - for (int a = 0; a < documentItems.Count(); a++) - { - dictionary[a].Value = documentItems[a]; - } - - UpdateDocument(dataRepository, dictionary, valueTags, prototype); - } - } - - private void UpdateDocument(IRepository dataRepository, List dictionary, IEnumerable valueTags, ITwinObject prototype) - { - string id = dictionary.FirstOrDefault(p => p.Key.Contains("DataEntityId")).Value; - var existing = dataRepository.Queryable.Where(p => p.DataEntityId == id).FirstOrDefault(); - if (existing != null) - { - ((dynamic)prototype).PlainToShadow(existing); - } - - ((dynamic)prototype).DataEntityId.Shadow = id; - - if (existing != null) ((dynamic)prototype).ChangeTracker.StartObservingChanges(); - // Swap values to shadow - foreach (var item in dictionary) - { - if (!string.IsNullOrEmpty(item.Key)) - { - var tag = valueTags.FirstOrDefault(p => p.Symbol == item.Key); - - if (tag == null) - { - continue; // not exist! - } - - OnlinerBase type = tag as OnlinerBase; - - if (type is OnlinerString || type is OnlinerWString) - { - ((dynamic)tag).Shadow = (CastValue(type, item.Value) as string)?.Replace('►', ';'); - } - else - { - ((dynamic)tag).Shadow = CastValue(type, item.Value); - } - } - } - - if (existing != null) ((dynamic)prototype).ChangeTracker.StopObservingChanges(); - - - if (existing != null) - { - ((dynamic)prototype).ChangeTracker.Import(existing); - - //((dynamic)existing).ShadowToPlain((dynamic)prototype); - existing = existing.ShadowToPlain1(prototype); - dataRepository.Update(existing.DataEntityId, existing); - } - else - { - TPlain newRecord = new TPlain(); - ((dynamic)prototype).ChangeTracker.Import(newRecord); - //((dynamic)newRecord).ShadowToPlain((dynamic)prototype); - newRecord = newRecord.ShadowToPlain1(prototype); - - Task.Delay(1000).Wait(); - - dataRepository.Create(newRecord.DataEntityId, newRecord); - } - } - - private class ImportItems - { - internal string Key { get; set; } - internal dynamic Value { get; set; } - } - - private dynamic CastValue(OnlinerBase type, string @value) - { - switch (type) - { - case OnlinerBool c: - return bool.Parse(@value); - case OnlinerByte c: - return byte.Parse(@value); - - case OnlinerDate c: - return DateTime.Parse(@value); - - case OnlinerDInt c: - return int.Parse(@value); - - case OnlinerDWord c: - return uint.Parse(@value); - - case OnlinerInt c: - return short.Parse(@value); - - case OnlinerLInt c: - return long.Parse(@value); - - case OnlinerLReal c: - return double.Parse(@value); - - case OnlinerLTime c: - return TimeSpan.Parse(@value); - - case OnlinerLWord c: - return ulong.Parse(@value); - - case OnlinerReal c: - return float.Parse(@value); - - case OnlinerSInt c: - return sbyte.Parse(@value); - - case OnlinerString c: - return @value; - - case OnlinerTime c: - return TimeSpan.Parse(@value); - - case OnlinerTimeOfDay c: - return TimeSpan.Parse(@value); - - case OnlinerDateTime c: - return DateTime.Parse(@value); - - case OnlinerUDInt c: - return uint.Parse(@value); - - case OnlinerUInt c: - return ushort.Parse(@value); - - case OnlinerULInt c: - return ulong.Parse(@value); - - case OnlinerUSInt c: - return byte.Parse(@value); - - case OnlinerWord c: - return ushort.Parse(@value); - - case OnlinerWString c: - return @value; - default: - throw new Exception($"Unknown type {type.GetType()}"); - - } + BaseImport(dataRepository, imports, crudDataObject, separator); } } } diff --git a/src/data/src/AXOpen.Data/ExportImport/FragmentData.cs b/src/data/src/AXOpen.Data/ExportImport/FragmentData.cs new file mode 100644 index 000000000..dbacf1d86 --- /dev/null +++ b/src/data/src/AXOpen.Data/ExportImport/FragmentData.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AXOpen.Data +{ + public class FragmentData + { + public bool Exported { get; set; } + public Dictionary Data { get; set; } + + public FragmentData(bool exported, Dictionary data) + { + Exported = exported; + Data = data; + } + } +} diff --git a/src/data/src/AXOpen.Data/ExportImport/IDataExporter.cs b/src/data/src/AXOpen.Data/ExportImport/IDataExporter.cs index 20d7db36c..16c79bd6c 100644 --- a/src/data/src/AXOpen.Data/ExportImport/IDataExporter.cs +++ b/src/data/src/AXOpen.Data/ExportImport/IDataExporter.cs @@ -19,7 +19,7 @@ public interface IDataExporter where TOnline : IAxoDataEntity /// Path to exported file. /// Expression of function for export rules. /// Separator for individual records. - void Export(IRepository repository, string path, Expression> expression, char separator = ';'); + void Export(IRepository repository, string path, Expression> expression, Dictionary fragmentData = null, eExportMode exportMode = eExportMode.First, int firstNumber = 50, int secondNumber = 100, char separator = ';'); /// /// Import data from file to the repository. diff --git a/src/data/src/AXOpen.Data/ExportImport/TXTDataExporter.cs b/src/data/src/AXOpen.Data/ExportImport/TXTDataExporter.cs new file mode 100644 index 000000000..ef0c2f737 --- /dev/null +++ b/src/data/src/AXOpen.Data/ExportImport/TXTDataExporter.cs @@ -0,0 +1,47 @@ +using AXOpen.Base.Data; +using AXSharp.Connector; +using AXSharp.Connector.ValueTypes; +using AXSharp.Connector.ValueTypes.Online; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + + +namespace AXOpen.Data +{ + public class TXTDataExporter : BaseDataExporter, IDataExporter where TOnline : IAxoDataEntity + where TPlain : Pocos.AXOpen.Data.IAxoDataEntity, new() + { + public TXTDataExporter() + { + } + + public void Export(IRepository repository, string path, Expression> expression, Dictionary fragmentData = null, eExportMode exportMode = eExportMode.First, int firstNumber = 50, int secondNumber = 100, char separator = ';') + { + var export = BaseExport(repository, expression, fragmentData, exportMode, firstNumber, secondNumber, separator); + + using (var sw = new StreamWriter(path + ".txt")) + { + foreach (var item in export) + { + sw.Write(item + "\r"); + } + } + } + + public void Import(IRepository dataRepository, string path, ITwinObject crudDataObject = null, char separator = ';') + { + var imports = new List(); + foreach (var item in File.ReadAllLines(path + ".txt")) + { + imports.Add(item); + } + + BaseImport(dataRepository, imports, crudDataObject, separator); + } + } +} diff --git a/src/data/src/AXOpen.Data/ExportImport/eExportMode.cs b/src/data/src/AXOpen.Data/ExportImport/eExportMode.cs new file mode 100644 index 000000000..79dea16c9 --- /dev/null +++ b/src/data/src/AXOpen.Data/ExportImport/eExportMode.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AXOpen.Data +{ + public enum eExportMode + { + First, + Last, + Exact + } +} diff --git a/src/data/src/AXOpen.Data/ExportImport/eFileType.cs b/src/data/src/AXOpen.Data/ExportImport/eFileType.cs new file mode 100644 index 000000000..6ddb23664 --- /dev/null +++ b/src/data/src/AXOpen.Data/ExportImport/eFileType.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AXOpen.Data +{ + public enum eFileType + { + csv, + txt + } +} From 84a6da9de868ef800f4b4f00cee4b4653ea19aeb Mon Sep 17 00:00:00 2001 From: Branko Zachemsky Date: Fri, 14 Jul 2023 14:43:59 +0200 Subject: [PATCH 04/10] WIP changes in custom export. Improved documentations --- docfx/articles/data/AxoDataExchange.md | 6 ++++ .../AxoDataExchange/DataExchangeView.razor | 29 ++++++++++++++----- .../AxoDataExchange/DataExchangeViewModel.cs | 16 ++++++++++ 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/docfx/articles/data/AxoDataExchange.md b/docfx/articles/data/AxoDataExchange.md index aef72c95b..cbb3ea9c9 100644 --- a/docfx/articles/data/AxoDataExchange.md +++ b/docfx/articles/data/AxoDataExchange.md @@ -115,6 +115,12 @@ With this option, buttons for export and import data will appear. After clicking ![Export](~/images/Export.png) +#### Custom export + +You have the option to customize the exported files according to your preferences. This includes selecting specific columns and rows, choosing the desired file type, and specifying the separator. It's important to note that if you don't select all columns for export, importing the files may not be done correctly. + +During the importing process, it is crucial to enter the same separator that was used during the export. If the default separator was used during the export, there is no need to make any changes. + For a better user experience, it is strongly recommended to clean the `Temp` directory when starting the application. The best way to do this is to add the following lines to the "Program.cs" file: ~~~ C# diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor index 3e5e5989c..d4aeb8506 100644 --- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor @@ -106,7 +106,7 @@ else { @item.DataEntityId - @foreach (ColumnData column in Columns) + @foreach (ColumnData column in Columns.ToList()) { if (column.Clickable) { @@ -375,7 +375,7 @@ else }
- +
@@ -426,12 +426,16 @@ else @foreach (var fragment in Vm.DataExchange.RefUIData.GetChildren().DefaultIfEmpty(Vm.DataExchange.RefUIData)) {
-

- -

+
+
+
+ +
+ +
+
    @@ -479,6 +483,15 @@ else
+ @if (!Vm.GetFragmentsExportedValue()) + { + + }
diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs index c1740788f..b22e96021 100644 --- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs @@ -378,5 +378,21 @@ public bool GetFragmentExportedValue(string fragmentKey) { return Fragments.GetValueOrDefault(fragmentKey, new FragmentData(true, new Dictionary())).Exported; } + + public bool GetFragmentsExportedValue() + { + foreach(var fragment in Fragments) + { + if(!fragment.Value.Exported) + return false; + + foreach (var fragmentData in fragment.Value.Data) + { + if (!fragmentData.Value) + return false; + } + } + return true; + } } } From 3dd9b73207ac0cf0108ce0f1a7e2f7d0f5292419 Mon Sep 17 00:00:00 2001 From: Branko Zachemsky Date: Tue, 18 Jul 2023 14:54:42 +0200 Subject: [PATCH 05/10] Added "tree structure" for custom export in DataExchange --- .../DataExchangeAccordionComponent.razor | 51 ++++++++++++ .../AxoDataExchange/DataExchangeView.razor | 83 +++++++++++-------- .../AxoDataExchange/DataExchangeView.razor.cs | 1 + .../AxoDataExchange/DataExchangeViewModel.cs | 57 +++++++------ .../DataExchange/AxoDataExchange.cs | 18 ++-- .../DataExchange/IAxoDataExchange.cs | 2 +- .../AxoDataFragmentExchange.cs | 6 +- .../ExportImport/BaseDataExporter.cs | 60 ++++++++++++-- .../ExportImport/CSVDataExporter.cs | 4 +- .../{FragmentData.cs => ExportData.cs} | 4 +- .../AXOpen.Data/ExportImport/IDataExporter.cs | 2 +- .../ExportImport/TXTDataExporter.cs | 4 +- 12 files changed, 202 insertions(+), 90 deletions(-) create mode 100644 src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeAccordionComponent.razor rename src/data/src/AXOpen.Data/ExportImport/{FragmentData.cs => ExportData.cs} (76%) diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeAccordionComponent.razor b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeAccordionComponent.razor new file mode 100644 index 000000000..4dee7ca3c --- /dev/null +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeAccordionComponent.razor @@ -0,0 +1,51 @@ +@using AXSharp.Connector; + +
+
+
+
+ +
+ +
+
+
+
+
    + @foreach (var item in Vm.GetValueTags(AccordionContent.GetType())) + { + @if (item is ITwinPrimitive) + { +
  • + + +
    • + } + else if (item is ITwinObject) + { + + } + } +
+
+
+
+ +@code { + [Parameter] + public ITwinElement AccordionContent { get; set; } + + [Parameter] + public DataExchangeViewModel Vm { get; set; } + + [Parameter] + public ITwinObject Fragment { get; set; } + + [Parameter] + public string? Parent { get; set; } = null; + + [Parameter] + public Guid ViewGuid { get; set; } +} \ No newline at end of file diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor index d4aeb8506..5c4199284 100644 --- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor @@ -422,14 +422,16 @@ else
- @{bool firstIteration = true;} + @{ + bool firstIteration = true; + } @foreach (var fragment in Vm.DataExchange.RefUIData.GetChildren().DefaultIfEmpty(Vm.DataExchange.RefUIData)) {
- +
- - @if (Vm.ExportMode == eExportMode.Exact) - { -
From
- -
To
- - } - else - { - - } -
records
-
-
- - -
-
- Separator - -
+
+
+ + + @if (Vm.ExportMode == eExportMode.Exact) + { +
From
+ +
To
+ + } + else + { + + } +
records
+
+
+
+
+ + +
+
+ Separator + +
+
@if (!Vm.GetFragmentsExportedValue()) { diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs index 562bc1925..685ff42bb 100644 --- a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs +++ b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeViewModel.cs @@ -53,11 +53,6 @@ public IBrowsableDataObject SelectedRecord set { - if (_selectedRecord == value) - { - return; - } - // CrudData.ChangeTracker.StopObservingChanges(); _selectedRecord = value; if (value != null) @@ -286,42 +281,47 @@ public async Task LoadFromPlc() //CreateItemId = null; } - public void ExportData(string path) + public Task ExportDataAsync(string path) { IsFileExported = false; - try + return Task.Run(() => { - DataExchange.ExportData(path, ExportSet.CustomExportData, ExportSet.ExportMode, ExportSet.FirstNumber, ExportSet.SecondNumber, ExportSet.ExportFileType, ExportSet.Separator); + try + { + DataExchange.ExportData(path, ExportSet.CustomExportData, ExportSet.ExportMode, ExportSet.FirstNumber, ExportSet.SecondNumber, ExportSet.ExportFileType, ExportSet.Separator); - IsFileExported = true; + IsFileExported = true; - AlertDialogService.AddAlertDialog("Success", "Exported!", "Data was successfully exported!", 10); - } - catch (Exception e) - { - AlertDialogService.AddAlertDialog("Danger", "Error!", e.Message, 10); - } + AlertDialogService.AddAlertDialog("Success", "Exported!", "Data was successfully exported!", 10); + } + catch (Exception e) + { + AlertDialogService.AddAlertDialog("Danger", "Error!", e.Message, 10); + } + }); } - public void ImportData(string path) + public Task ImportDataAsync(string path) { - try + return Task.Run(() => { - DataExchange.ImportData(path, separator: ExportSet.Separator); + try + { + DataExchange.ImportData(path, separator: ExportSet.Separator); - this.UpdateObservableRecords(); + this.UpdateObservableRecords(); - AlertDialogService.AddAlertDialog("Success", "Imported!", "Data was successfully imported!", 10); - } - catch (Exception e) - { - AlertDialogService.AddAlertDialog("Danger", "Error!", e.Message, 10); - } + AlertDialogService.AddAlertDialog("Success", "Imported!", "Data was successfully imported!", 10); + } + catch (Exception e) + { + AlertDialogService.AddAlertDialog("Danger", "Error!", e.Message, 10); + } + }); } public ObservableCollection Records { get; set; } = new ObservableCollection(); - public int Limit { get; set; } = 10; public string FilterById { get; set; } = ""; public eSearchMode SearchMode { get; set; } = eSearchMode.Exact; diff --git a/src/data/src/AXOpen.Data/ExportImport/BaseDataExporter.cs b/src/data/src/AXOpen.Data/ExportImport/BaseDataExporter.cs index 9cbe56894..6b8c0afa5 100644 --- a/src/data/src/AXOpen.Data/ExportImport/BaseDataExporter.cs +++ b/src/data/src/AXOpen.Data/ExportImport/BaseDataExporter.cs @@ -160,6 +160,10 @@ public BaseDataExporter() dictionary.Add(new ImportItems() { Key = headerItem }); } + if(!dictionary.Exists(p => p.Key.Contains("DataEntityId"))) + { + throw new Exception("DataEntityId is missing in the import file"); + } // Load values for (int i = 2; i < documents.Count(); i++)