From b9eb646229de5a65dc1fc2af7015827a374305bf Mon Sep 17 00:00:00 2001 From: Andrey Shabarshov Date: Sat, 15 Jul 2023 12:08:09 +0100 Subject: [PATCH] DEEP-32 Training page: export to CSV added --- DeepTrace/Controllers/DownloadController.cs | 11 ++--- DeepTrace/DeepTrace.csproj | 4 -- DeepTrace/Pages/DataSources.razor | 4 -- DeepTrace/Pages/Training.razor | 45 ++++++++++++++++++++- 4 files changed, 47 insertions(+), 17 deletions(-) diff --git a/DeepTrace/Controllers/DownloadController.cs b/DeepTrace/Controllers/DownloadController.cs index bd36fa4..323f406 100644 --- a/DeepTrace/Controllers/DownloadController.cs +++ b/DeepTrace/Controllers/DownloadController.cs @@ -24,6 +24,7 @@ namespace DeepTrace.Controllers var current = previousIntervals.First(); var headers = string.Join(",", current.Data.Select((x, i) => $"Q{i + 1}min,Q{i + 1}max,Q{i + 1}avg,Q{i + 1}mean")); + headers += string.Join(",",",Name"); var writer = new StringBuilder(); @@ -41,16 +42,10 @@ namespace DeepTrace.Controllers var avg = queryData.Data.Average(x => x.Value); var mean = queryData.Data.Sum(x => x.Value) / queryData.Data.Count; - if (i == currentInterval.Data.Count - 1) - { - data += min + "," + max + "," + avg + "," + mean; - } - else - { - data += min + "," + max + "," + avg + "," + mean + ","; - } + data += min + "," + max + "," + avg + "," + mean + ","; } + data += currentInterval.Name; writer.AppendLine(data); } return new(Encoding.UTF8.GetBytes(writer.ToString()),"text/csv") diff --git a/DeepTrace/DeepTrace.csproj b/DeepTrace/DeepTrace.csproj index 4c9c1ba..eec8e4b 100644 --- a/DeepTrace/DeepTrace.csproj +++ b/DeepTrace/DeepTrace.csproj @@ -18,8 +18,4 @@ - - - - diff --git a/DeepTrace/Pages/DataSources.razor b/DeepTrace/Pages/DataSources.razor index 9959a36..812e4b6 100644 --- a/DeepTrace/Pages/DataSources.razor +++ b/DeepTrace/Pages/DataSources.razor @@ -92,10 +92,6 @@ @**@ - -

Remove thus button!

- Train -
diff --git a/DeepTrace/Pages/Training.razor b/DeepTrace/Pages/Training.razor index 29991ec..762c372 100644 --- a/DeepTrace/Pages/Training.razor +++ b/DeepTrace/Pages/Training.razor @@ -67,7 +67,17 @@ Train - + From To @@ -80,6 +90,14 @@ @context.Name + + @context.From + @context.To + + + + + @@ -100,6 +118,9 @@ private bool IsChartHidden => DisplayData == null; private bool IsChartShown => !IsChartHidden; + private bool fixed_header = true; + private bool canCancelEdit = true; + private string _nameBackUp = ""; private class ModelForm { @@ -338,6 +359,28 @@ await InvokeAsync(StateHasChanged); } + private void BackupInterval(object element) + { + if(element is IntervalDefinition interval) + { + _nameBackUp = interval.Name; + } + + } + + private void ResetItemToOriginalValues(object element) + { + if (element is IntervalDefinition interval) + { + interval.Name = _nameBackUp; + } + } + + private void ItemHasBeenCommitted(object element) + { + Task.Run(async ()=>ModelService.Store(_modelForm!.CurrentModel)); + } + private async Task HandleRefresh() { var previousIntervals = _modelForm!.CurrentModel.IntervalDefinitionList;