From c1e7970eec1c51df95eab519967d6babd5561efe Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 25 Jul 2023 10:07:28 +0200 Subject: [PATCH] ok check dir e cmpFooter con versione --- SMGen/Components/CmpFooter.razor | 9 +++++ SMGen/Components/CmpFooter.razor.cs | 59 ++++++++++++++++++++++++++++ SMGen/Pages/SMIn2Event.razor | 25 ++++++++---- SMGen/Pages/SMIn2Event.razor.cs | 41 +++++++++++++++++-- SMGen/Pages/SMIn2Event.razor.css | 1 + SMGen/Pages/SMIn2Event.razor.less | 2 + SMGen/Pages/SMIn2Event.razor.min.css | 1 + SMGen/SMGen.csproj | 4 ++ SMGen/Shared/MainLayout.razor | 3 ++ SMGen/Shared/MainLayout.razor.css | 2 +- SMGen/Shared/NavMenu.razor | 14 +++---- SMGen/_Imports.razor | 1 + SMGen/appsettings.json | 3 ++ SMGen/compilerconfig.json | 4 ++ 14 files changed, 150 insertions(+), 19 deletions(-) create mode 100644 SMGen/Components/CmpFooter.razor create mode 100644 SMGen/Components/CmpFooter.razor.cs create mode 100644 SMGen/Pages/SMIn2Event.razor.css create mode 100644 SMGen/Pages/SMIn2Event.razor.less create mode 100644 SMGen/Pages/SMIn2Event.razor.min.css diff --git a/SMGen/Components/CmpFooter.razor b/SMGen/Components/CmpFooter.razor new file mode 100644 index 0000000..4f2b535 --- /dev/null +++ b/SMGen/Components/CmpFooter.razor @@ -0,0 +1,9 @@ +
+
+ SMGen @(DateTime.Today.Year) | v.@version +
+
+ @($"{DateTime.Now:HH:mm:ss}") | Egalware +
+
+ diff --git a/SMGen/Components/CmpFooter.razor.cs b/SMGen/Components/CmpFooter.razor.cs new file mode 100644 index 0000000..7eb4854 --- /dev/null +++ b/SMGen/Components/CmpFooter.razor.cs @@ -0,0 +1,59 @@ +using NLog; + +namespace SMGen.Components +{ + public partial class CmpFooter : IDisposable + { + #region Public Methods + + public void Dispose() + { + if (aTimer != null) + { + aTimer.Elapsed -= ElapsedTimer; + aTimer.Stop(); + aTimer.Dispose(); + } + } + + public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e) + { + var pUpd = Task.Run(async () => + { + await Task.Delay(1); + await InvokeAsync(() => StateHasChanged()); + }); + pUpd.Wait(); + } + + public void StartTimer() + { + int tOutPeriod = 5000; + //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod); + aTimer = new System.Timers.Timer(tOutPeriod); + aTimer.Elapsed += ElapsedTimer; + aTimer.Enabled = true; + aTimer.Start(); + } + + #endregion Public Methods + + #region Protected Methods + + protected override void OnInitialized() + { + var rawVers = typeof(Program).Assembly.GetName().Version; ; + version = rawVers != null ? rawVers : new Version("0.0.0.0"); + } + + #endregion Protected Methods + + #region Private Fields + + private System.Timers.Timer aTimer = null!; + private static Logger Log = LogManager.GetCurrentClassLogger(); + private Version version = null!; + + #endregion Private Fields + } +} \ No newline at end of file diff --git a/SMGen/Pages/SMIn2Event.razor b/SMGen/Pages/SMIn2Event.razor index 1369d65..8b3d057 100644 --- a/SMGen/Pages/SMIn2Event.razor +++ b/SMGen/Pages/SMIn2Event.razor @@ -14,13 +14,24 @@ Vista in preview si può poi inserire in prod se confermato

- +
+
+ +
+
+ @if (files2Read.Count > 0) + { + + } +
+
- -@sz_file2Read +
+ @foreach (var item in files2Read) + { + @item.Key +
+ } +
-@*@foreach (var item in bits) -{ - @item -}*@ diff --git a/SMGen/Pages/SMIn2Event.razor.cs b/SMGen/Pages/SMIn2Event.razor.cs index e8dfd12..30f0696 100644 --- a/SMGen/Pages/SMIn2Event.razor.cs +++ b/SMGen/Pages/SMIn2Event.razor.cs @@ -29,6 +29,14 @@ namespace SMGen.Pages [Inject] protected IWebHostEnvironment env { get; set; } = null!; + [Inject] + protected IConfiguration conf { get; set; } = null!; + + protected string procRootDir + { + get => conf.GetValue("ServerConf:ProcCsvRootPath"); + } + protected string sz_file2Write { get; set; } = "prova.csv"; //protected string sz_file2Read { get; set; } = "D:\\Repo\\Mapo-IOB\\StateMachine\\_DEFAULT\\60_STD_MACHINE.rul"; protected string sz_file2Read { get; set; } = ""; @@ -52,8 +60,6 @@ namespace SMGen.Pages List loadedFiles = new(); long maxFileSize = 1024 * 15; int maxAllowedFiles = 150; - bool isLoading; - isLoading = true; loadedFiles.Clear(); foreach (var file in e.GetMultipleFiles(maxAllowedFiles)) @@ -99,7 +105,6 @@ namespace SMGen.Pages } } - isLoading = false; } /// @@ -180,7 +185,11 @@ namespace SMGen.Pages case "$DO": b_rules_definition = false; - evaluate_transitions($"C:\\Temp\\Rules\\PROCESSED\\{item.Key.Split(".")[0]}.csv"); + var isOk = checkDirExist(procRootDir); + if (isOk) + { + evaluate_transitions($"{procRootDir}\\{item.Key.Split(".")[0]}.csv"); + } break; default: @@ -206,6 +215,30 @@ namespace SMGen.Pages } } + protected bool checkDirExist(string dir) + { + bool answ = false; + var dirEx = Directory.Exists(dir); + if (dirEx) + { + answ = true; + } + else + { + var dirCreate = Directory.CreateDirectory(dir); + if (dirCreate != null) + { + answ = true; + } + else + { + answ = false; + } + } + + return answ; + } + protected void evaluate_transitions(string sz_file2Write) { using (StreamWriter sw = new StreamWriter(sz_file2Write)) diff --git a/SMGen/Pages/SMIn2Event.razor.css b/SMGen/Pages/SMIn2Event.razor.css new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/SMGen/Pages/SMIn2Event.razor.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/SMGen/Pages/SMIn2Event.razor.less b/SMGen/Pages/SMIn2Event.razor.less new file mode 100644 index 0000000..46800d1 --- /dev/null +++ b/SMGen/Pages/SMIn2Event.razor.less @@ -0,0 +1,2 @@ +body { +} diff --git a/SMGen/Pages/SMIn2Event.razor.min.css b/SMGen/Pages/SMIn2Event.razor.min.css new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/SMGen/Pages/SMIn2Event.razor.min.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/SMGen/SMGen.csproj b/SMGen/SMGen.csproj index f3a17ea..1b8dea2 100644 --- a/SMGen/SMGen.csproj +++ b/SMGen/SMGen.csproj @@ -14,4 +14,8 @@ + + + + diff --git a/SMGen/Shared/MainLayout.razor b/SMGen/Shared/MainLayout.razor index e8b71b2..0c65a4c 100644 --- a/SMGen/Shared/MainLayout.razor +++ b/SMGen/Shared/MainLayout.razor @@ -17,3 +17,6 @@ +
+ +
diff --git a/SMGen/Shared/MainLayout.razor.css b/SMGen/Shared/MainLayout.razor.css index 551e4b2..605602c 100644 --- a/SMGen/Shared/MainLayout.razor.css +++ b/SMGen/Shared/MainLayout.razor.css @@ -9,7 +9,7 @@ main { } .sidebar { - background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); + background-image: linear-gradient(180deg, rgb(5, 39, 103) 20%, #3aa6ff 90%); } .top-row { diff --git a/SMGen/Shared/NavMenu.razor b/SMGen/Shared/NavMenu.razor index ea121b9..0b8b19d 100644 --- a/SMGen/Shared/NavMenu.razor +++ b/SMGen/Shared/NavMenu.razor @@ -1,6 +1,6 @@ -
+
- SMGen + SMGen @@ -10,27 +10,27 @@