From 8f39806669cea2891321b1b30d1d465272f5c442 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 14 Mar 2025 17:30:34 +0100 Subject: [PATCH 01/24] Update progetto Interactive WASM/Server x MON (8) --- .../Components/DetailMSE.razor.cs | 9 +- .../Components/DetailViewMSE.razor | 2 +- .../Components/DetailViewMSE.razor.cs | 26 +- .../Components/DetailViewMSE.razor.css | 35 +- .../Components/DetailViewMSE.razor.less | 42 +- .../Components/DetailViewMSE.razor.min.css | 2 +- MP-MON/MP-MON.Client/MP-MON.Client.csproj | 7 +- MP-MON/MP-MON/Components/App.razor | 2 +- .../Components/Pages/ForceReload.razor.cs | 6 +- MP-MON/MP-MON/Components/Pages/Index.razor | 1 + MP-MON/MP-MON/Components/Pages/Index.razor.cs | 23 +- MP-MON/MP-MON/Components/_Imports.razor | 5 +- MP-MON/MP-MON/MP-MON.csproj | 3 + MP-MON/MP-MON/Program.cs | 6 +- MP-MON/MP-MON/appsettings.Development.json | 3 + MP-MON/MP-MON/appsettings.Production.json | 11 + MP-MON/MP-MON/appsettings.Staging.json | 11 + MP-MON/MP-MON/logs/.placeholder | 1 + MP-MON8.sln | 12 + MP-MON8/Components/Compo/DetailMSE.razor.cs | 2 +- .../Components/Compo/DetailViewMSE.razor.cs | 4 +- MP-MON8/Components/Pages/Index.razor.cs | 2 +- MP-MON8/Components/_Imports.razor | 2 +- MP-MON8/MP-MON8.csproj | 2 +- MP-MON8/Resources/ChangeLog.html | 2 +- MP-MON8/Resources/VersNum.txt | 2 +- MP-MON8/Resources/manifest.xml | 2 +- {MP.Data => MP.Core}/Conf/IobTags.cs | 2 +- .../Conf/RecipeBlockConfig.cs | 2 +- {MP.Data => MP.Core}/Conf/RecipeConfig.cs | 2 +- {MP.Data => MP.Core}/Conf/TagData.cs | 2 +- {MP.Data => MP.Core}/DTO/DossierFluxLogDTO.cs | 5 +- {MP.Data => MP.Core}/DTO/FluxLogDTO.cs | 2 +- {MP.Data => MP.Core}/DTO/InveSessDTO.cs | 2 +- MP.Core/DTO/MappaStatoExplDTO.cs | 353 +++++++++++++ {MP.Data => MP.Core}/DTO/ObjItemDTO.cs | 2 +- {MP.Data => MP.Core}/DTO/OperatoreDTO.cs | 2 +- {MP.Data => MP.Core}/DTO/ParetoFluxLogDTO.cs | 2 +- {MP.Data => MP.Core}/DTO/StatDedupDTO.cs | 4 +- {MP.Data => MP.Core}/DTO/UriDTO.cs | 2 +- MP.Core/MP.Core.csproj | 19 + MP.Core/Objects/Enums.cs | 500 ++++++++++++++++++ MP.Core/Objects/IOB_data.cs | 25 + MP.Core/Objects/InputComandoMapo.cs | 103 ++++ MP.Core/Objects/StCheckOverride.cs | 23 + MP.Core/Utils.cs | 193 +++++++ MP.Data/Controllers/MpLandController.cs | 4 +- MP.Data/Controllers/MpMongoController.cs | 2 +- MP.Data/Controllers/MpSpecController.cs | 3 +- MP.Data/Controllers/MpStatsController.cs | 2 +- MP.Data/Controllers/MpTabController.cs | 4 +- MP.Data/Controllers/MpVocController.cs | 2 +- MP.Data/DbModels/TaskExecModel.cs | 2 +- MP.Data/DbModels/TaskListModel.cs | 4 +- MP.Data/DbModels/TaskResultModel.cs | 2 +- MP.Data/MP.Data.csproj | 24 +- MP.Data/MgModels/RecipeModel.cs | 2 +- MP.Data/MoonPro_FluxContext.cs | 1 + MP.Data/Services/ListSelectDataSrv.cs | 2 +- MP.Data/Services/OrderDataSrv.cs | 2 +- MP.Data/Services/StatusData.cs | 2 +- MP.Data/Services/TabDataService.cs | 3 +- MP.Data/Services/TranslateSrv.cs | 2 +- MP.Data/Translate/DbDto.cs | 53 ++ MP.Data/Utils.cs | 155 +----- 65 files changed, 1493 insertions(+), 248 deletions(-) create mode 100644 MP-MON/MP-MON/appsettings.Production.json create mode 100644 MP-MON/MP-MON/appsettings.Staging.json create mode 100644 MP-MON/MP-MON/logs/.placeholder rename {MP.Data => MP.Core}/Conf/IobTags.cs (94%) rename {MP.Data => MP.Core}/Conf/RecipeBlockConfig.cs (97%) rename {MP.Data => MP.Core}/Conf/RecipeConfig.cs (97%) rename {MP.Data => MP.Core}/Conf/TagData.cs (97%) rename {MP.Data => MP.Core}/DTO/DossierFluxLogDTO.cs (88%) rename {MP.Data => MP.Core}/DTO/FluxLogDTO.cs (93%) rename {MP.Data => MP.Core}/DTO/InveSessDTO.cs (93%) create mode 100644 MP.Core/DTO/MappaStatoExplDTO.cs rename {MP.Data => MP.Core}/DTO/ObjItemDTO.cs (99%) rename {MP.Data => MP.Core}/DTO/OperatoreDTO.cs (93%) rename {MP.Data => MP.Core}/DTO/ParetoFluxLogDTO.cs (89%) rename {MP.Data => MP.Core}/DTO/StatDedupDTO.cs (96%) rename {MP.Data => MP.Core}/DTO/UriDTO.cs (90%) create mode 100644 MP.Core/MP.Core.csproj create mode 100644 MP.Core/Objects/Enums.cs create mode 100644 MP.Core/Objects/IOB_data.cs create mode 100644 MP.Core/Objects/InputComandoMapo.cs create mode 100644 MP.Core/Objects/StCheckOverride.cs create mode 100644 MP.Core/Utils.cs create mode 100644 MP.Data/Translate/DbDto.cs diff --git a/MP-MON/MP-MON.Client/Components/DetailMSE.razor.cs b/MP-MON/MP-MON.Client/Components/DetailMSE.razor.cs index b8a5c19d..05f35add 100644 --- a/MP-MON/MP-MON.Client/Components/DetailMSE.razor.cs +++ b/MP-MON/MP-MON.Client/Components/DetailMSE.razor.cs @@ -1,7 +1,6 @@ using Microsoft.AspNetCore.Components; -using Microsoft.Extensions.FileSystemGlobbing; -using MP.Data.Conf; -using MP.Data.DbModels; +using MP.Core.Conf; +using MP.Core.DTO; namespace MP.MON.Client.Components { @@ -13,7 +12,7 @@ namespace MP.MON.Client.Components public string cssOverlayOff { get; set; } = ""; [Parameter] - public MappaStatoExpl? CurrRecord { get; set; } = null; + public MappaStatoExplDTO? CurrRecord { get; set; } = null; [Parameter] public List? currTagConf { get; set; } = null; @@ -226,7 +225,7 @@ namespace MP.MON.Client.Components /// /// Valore precedente x calcolo variazione /// - private MappaStatoExpl? OldRecord { get; set; } = null; + private MappaStatoExplDTO? OldRecord { get; set; } = null; #endregion Private Properties diff --git a/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor b/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor index 9d1581aa..812dc924 100644 --- a/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor +++ b/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor @@ -138,7 +138,7 @@ else }
- @CurrRecord.LastUpdate + @($"{CurrRecord.LastUpdate:yyyy.MM.dd HH:mm:ss}")
diff --git a/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.cs b/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.cs index 78b51a07..bf73cd2f 100644 --- a/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.cs +++ b/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; -using MP.Data.Conf; -using MP.Data.DbModels; +using MP.Core.DTO; +using MP.Core.Conf; namespace MP.MON.Client.Components { @@ -9,7 +9,7 @@ namespace MP.MON.Client.Components #region Public Properties [Parameter] - public MappaStatoExpl? CurrRecord { get; set; } = null; + public MappaStatoExplDTO? CurrRecord { get; set; } = null; [Parameter] public List? currTagConf { get; set; } = null; @@ -32,6 +32,12 @@ namespace MP.MON.Client.Components [Parameter] public string showArt { get; set; } = ""; + protected override void OnParametersSet() + { + //base.OnParametersSet(); + //Console.WriteLine($"{DateTime.Now} | {CurrRecord.IdxMacchina} params received!"); + } + #endregion Public Properties #region Protected Fields @@ -110,24 +116,27 @@ namespace MP.MON.Client.Components /// protected string textCss(string currText) { - string answ = "text-nowrap2 text-truncate w-100"; + string answ = "text-truncate"; + //string answ = "text-truncate w-100"; if (currText.Length > maxChar4Scroll) { + answ = "text-reduced"; + //answ = "scroll-left"; // calcolo delta... a-b-c con 5-10-oltre int delta = currText.Length - maxChar4Scroll; if (delta < 5) { - answ = " scroll-left-a"; + answ += "-a"; } else if (delta < 10) { - answ = " scroll-left-b"; + answ += "-b"; } else { - answ = " scroll-left-c"; + answ += "-c"; } - } + } return answ; } @@ -262,7 +271,6 @@ namespace MP.MON.Client.Components if (resto == 1) { answ = $"text-danger"; - //answ += " opacity-100"; } } return answ; diff --git a/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.css b/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.css index ba6fdff1..851a6c4e 100644 --- a/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.css +++ b/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.css @@ -1,9 +1,31 @@ -/* gestione scroll testo A: 100% */ +/* Testo ridotto se troppo lungo... */ +.text-reduced, +.text-reduced-a, +.text-reduced-b, +.text-reduced-c { + height: 1.1rem; + line-height: 0.9em; + /*overflow: hidden;*/ + /*position: relative;*/ + /*width: 100%;*/ + /*white-space: nowrap;*/ + overflow-wrap: anywhere; +} +.text-reduced-a { + font-size: 0.95rem; +} +.text-reduced-b { + font-size: 0.9rem; +} +.text-reduced-c { + font-size: 0.85rem; +} +/* gestione scroll testo A: 100% */ .scroll-left, .scroll-left-a, .scroll-left-b, .scroll-left-c { - height: 1.5em; + height: 1.25em; overflow: hidden; position: relative; width: 100%; @@ -13,12 +35,11 @@ .scroll-left-a span, .scroll-left-b span, .scroll-left-c span { - /*display: inline-block;*/ position: absolute; width: 100%; height: 100%; margin: 0; - line-height: 1.5em; + line-height: 1.25em; /* Starting position */ -moz-transform: translateX(0%); -webkit-transform: translateX(0%); @@ -39,7 +60,7 @@ 30% { transform: translateX(0%); } - 90% { + 100% { transform: translateX(-90%); } } @@ -58,7 +79,7 @@ 30% { transform: translateX(0%); } - 90% { + 100% { transform: translateX(-120%); } } @@ -77,7 +98,7 @@ 30% { transform: translateX(0%); } - 90% { + 100% { transform: translateX(-150%); } } \ No newline at end of file diff --git a/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.less b/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.less index 9c566dcd..ac8016e8 100644 --- a/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.less +++ b/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.less @@ -1,7 +1,34 @@ +/* Testo ridotto se troppo lungo... */ +.text-reduced { + height: 1.1rem; + line-height: 0.9em; + /*overflow: hidden;*/ + /*position: relative;*/ + /*width: 100%;*/ + /*white-space: nowrap;*/ + overflow-wrap: anywhere; +} + +.text-reduced-a { + &:extend(.text-reduced); + font-size: 0.95rem; +} + +.text-reduced-b { + &:extend(.text-reduced); + font-size: 0.9rem; +} + +.text-reduced-c { + &:extend(.text-reduced); + font-size: 0.85rem; +} + + /* gestione scroll testo A: 100% */ .scroll-left { - height: 1.5em; + height: 1.25em; overflow: hidden; position: relative; width: 100%; @@ -9,19 +36,16 @@ } .scroll-left span { - /*display: inline-block;*/ position: absolute; width: 100%; height: 100%; margin: 0; - line-height: 1.5em; + line-height: 1.25em; /* Starting position */ -moz-transform: translateX(0%); -webkit-transform: translateX(0%); transform: translateX(0%); } - - /* gestione scroll testo A: 90% */ .scroll-left-a { &:extend(.scroll-left); @@ -44,11 +68,10 @@ transform: translateX(0%); } - 90% { + 100% { transform: translateX(-90%); } } - /* gestione scroll testo B: 100% */ .scroll-left-b { &:extend(.scroll-left); @@ -71,11 +94,10 @@ transform: translateX(0%); } - 90% { + 100% { transform: translateX(-120%); } } - /* gestione scroll testo C: 150% */ .scroll-left-c { &:extend(.scroll-left); @@ -98,7 +120,7 @@ transform: translateX(0%); } - 90% { + 100% { transform: translateX(-150%); } } diff --git a/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.min.css b/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.min.css index b570075d..a1523833 100644 --- a/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.min.css +++ b/MP-MON/MP-MON.Client/Components/DetailViewMSE.razor.min.css @@ -1 +1 @@ -.scroll-left,.scroll-left-a,.scroll-left-b,.scroll-left-c{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left span,.scroll-left-a span,.scroll-left-b span,.scroll-left-c span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(0%);-webkit-transform:translateX(0%);transform:translateX(0%);}.scroll-left-a span{-moz-animation:scroll-left-a 10s ease infinite;-webkit-animation:scroll-left-a 10s ease infinite;animation:scroll-left-a 10s ease infinite;}@keyframes scroll-left-a{0%{transform:translateX(0%);}30%{transform:translateX(0%);}90%{transform:translateX(-90%);}}.scroll-left-b span{-moz-animation:scroll-left-b 10s ease infinite;-webkit-animation:scroll-left-b 10s ease infinite;animation:scroll-left-b 10s ease infinite;}@keyframes scroll-left-b{0%{transform:translateX(0%);}30%{transform:translateX(0%);}90%{transform:translateX(-120%);}}.scroll-left-c span{-moz-animation:scroll-left-c 10s ease infinite;-webkit-animation:scroll-left-c 10s ease infinite;animation:scroll-left-c 10s ease infinite;}@keyframes scroll-left-c{0%{transform:translateX(0%);}30%{transform:translateX(0%);}90%{transform:translateX(-150%);}} \ No newline at end of file +.text-reduced,.text-reduced-a,.text-reduced-b,.text-reduced-c{height:1.1rem;line-height:.9em;overflow-wrap:anywhere;}.text-reduced-a{font-size:.95rem;}.text-reduced-b{font-size:.9rem;}.text-reduced-c{font-size:.85rem;}.scroll-left,.scroll-left-a,.scroll-left-b,.scroll-left-c{height:1.25em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left span,.scroll-left-a span,.scroll-left-b span,.scroll-left-c span{position:absolute;width:100%;height:100%;margin:0;line-height:1.25em;-moz-transform:translateX(0%);-webkit-transform:translateX(0%);transform:translateX(0%);}.scroll-left-a span{-moz-animation:scroll-left-a 10s ease infinite;-webkit-animation:scroll-left-a 10s ease infinite;animation:scroll-left-a 10s ease infinite;}@keyframes scroll-left-a{0%{transform:translateX(0%);}30%{transform:translateX(0%);}100%{transform:translateX(-90%);}}.scroll-left-b span{-moz-animation:scroll-left-b 10s ease infinite;-webkit-animation:scroll-left-b 10s ease infinite;animation:scroll-left-b 10s ease infinite;}@keyframes scroll-left-b{0%{transform:translateX(0%);}30%{transform:translateX(0%);}100%{transform:translateX(-120%);}}.scroll-left-c span{-moz-animation:scroll-left-c 10s ease infinite;-webkit-animation:scroll-left-c 10s ease infinite;animation:scroll-left-c 10s ease infinite;}@keyframes scroll-left-c{0%{transform:translateX(0%);}30%{transform:translateX(0%);}100%{transform:translateX(-150%);}} \ No newline at end of file diff --git a/MP-MON/MP-MON.Client/MP-MON.Client.csproj b/MP-MON/MP-MON.Client/MP-MON.Client.csproj index 6ade8940..0d6b0559 100644 --- a/MP-MON/MP-MON.Client/MP-MON.Client.csproj +++ b/MP-MON/MP-MON.Client/MP-MON.Client.csproj @@ -8,8 +8,6 @@ Default MP.MON.Client $(AssemblyName.Replace(' ', '_')) - true - true @@ -22,11 +20,12 @@ - + + - + diff --git a/MP-MON/MP-MON/Components/App.razor b/MP-MON/MP-MON/Components/App.razor index 860bfa6f..c1396742 100644 --- a/MP-MON/MP-MON/Components/App.razor +++ b/MP-MON/MP-MON/Components/App.razor @@ -15,7 +15,7 @@ - + diff --git a/MP-MON/MP-MON/Components/Pages/ForceReload.razor.cs b/MP-MON/MP-MON/Components/Pages/ForceReload.razor.cs index c9b26181..94229fbc 100644 --- a/MP-MON/MP-MON/Components/Pages/ForceReload.razor.cs +++ b/MP-MON/MP-MON/Components/Pages/ForceReload.razor.cs @@ -13,6 +13,9 @@ namespace MP.MON.Components.Pages [Inject] protected NavigationManager NavMan { get; set; } = null!; + [Inject] + protected IConfiguration config { get; set; } = null!; + #endregion Protected Properties #region Protected Methods @@ -21,7 +24,8 @@ namespace MP.MON.Components.Pages { await MMDataService.FlushCache(); await Task.Delay(100); - NavMan.NavigateTo("/", true); + string baseUrl = config.GetValue("ServerConf:BaseAppPath") ?? ""; + NavMan.NavigateTo(baseUrl, true); } #endregion Protected Methods diff --git a/MP-MON/MP-MON/Components/Pages/Index.razor b/MP-MON/MP-MON/Components/Pages/Index.razor index d81209a1..f52fd397 100644 --- a/MP-MON/MP-MON/Components/Pages/Index.razor +++ b/MP-MON/MP-MON/Components/Pages/Index.razor @@ -1,6 +1,7 @@ @page "/" @attribute [StreamRendering(false)] @rendermode InteractiveServer +@* @rendermode InteractiveAuto *@ MP MON diff --git a/MP-MON/MP-MON/Components/Pages/Index.razor.cs b/MP-MON/MP-MON/Components/Pages/Index.razor.cs index 2057292b..38edbe6b 100644 --- a/MP-MON/MP-MON/Components/Pages/Index.razor.cs +++ b/MP-MON/MP-MON/Components/Pages/Index.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using MP.Data; -using MP.Data.Conf; +using MP.Core.Conf; using MP.Data.DbModels; using MP.Data.Services; using MP.MON; @@ -8,6 +8,8 @@ using Newtonsoft.Json; using NLog; using System; using static Org.BouncyCastle.Math.EC.ECCurve; +using MP.Core.DTO; +using MP.Data.Translate; namespace MP.MON.Components.Pages { @@ -205,12 +207,19 @@ namespace MP.MON.Components.Pages /// /// Indice MSE richiesto /// - protected MappaStatoExpl? MseById(int mseIdx) + protected MappaStatoExplDTO? MseById(int mseIdx) { - MappaStatoExpl? answ = null; - if (ListMSE != null && ListMSE.Count > mseIdx) + MappaStatoExplDTO? answ = null; + try { - answ = ListMSE[mseIdx]; + if (ListMSE != null && ListMSE.Count > mseIdx) + { + answ = DbDto.Mse2DTO(ListMSE[mseIdx]); + } + } + catch (Exception exc) + { + Log.Error($"Eccezione in recupero MSE: richiesto idx {mseIdx} | trovati {listMacchine.Count}{Environment.NewLine}{exc}"); } return answ; } @@ -221,9 +230,9 @@ namespace MP.MON.Components.Pages MMDataService.dataPipe.EA_NewMessage += DataPipe_EA_NewMessage; MMDataService.blinkPipe.EA_NewMessage += BlinkPipe_EA_NewMessage; Random rnd = new Random(); - cssOverlayOff = config.GetValue("ServerConf:cssOverlayOff"); + cssOverlayOff = config.GetValue("ServerConf:cssOverlayOff") ?? ""; maxChar4Scroll = config.GetValue("ServerConf:maxChar4Scroll"); - await Task.Delay(rnd.Next(200, 300)); + await Task.Delay(rnd.Next(400, 600)); StartTimer(); } diff --git a/MP-MON/MP-MON/Components/_Imports.razor b/MP-MON/MP-MON/Components/_Imports.razor index 29cdad20..bc90b348 100644 --- a/MP-MON/MP-MON/Components/_Imports.razor +++ b/MP-MON/MP-MON/Components/_Imports.razor @@ -6,8 +6,11 @@ @using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop +@using MP.Core +@using MP.Core.Conf +@using MP.Core.DTO +@using MP.Core.Objects @using MP.Data -@using MP.Data.Conf @using MP.Data.Controllers @using MP.Data.DbModels @using MP.Data.DTO diff --git a/MP-MON/MP-MON/MP-MON.csproj b/MP-MON/MP-MON/MP-MON.csproj index 7651efb5..965aeef5 100644 --- a/MP-MON/MP-MON/MP-MON.csproj +++ b/MP-MON/MP-MON/MP-MON.csproj @@ -14,6 +14,9 @@ + + Always + diff --git a/MP-MON/MP-MON/Program.cs b/MP-MON/MP-MON/Program.cs index 725f60f7..960ac3aa 100644 --- a/MP-MON/MP-MON/Program.cs +++ b/MP-MON/MP-MON/Program.cs @@ -1,6 +1,8 @@ -//using MP_MON.Client.Component; +using MP.MON.Client.Components; using MP.Data.Services; using MP.MON.Components; +using MP.MON.Components.Layout; +using MP.MON.Components.Pages; using NLog; using NLog.Web; using StackExchange.Redis; @@ -47,7 +49,7 @@ else app.UseHsts(); } -string basePath = configuration["ServerConf:BaseAppPath"]; +string basePath = configuration.GetValue("ServerConf:BaseAppPath") ?? "/"; app.UsePathBase(basePath); logger.Info($"Base application path: {basePath}"); diff --git a/MP-MON/MP-MON/appsettings.Development.json b/MP-MON/MP-MON/appsettings.Development.json index 0c208ae9..f9541c9a 100644 --- a/MP-MON/MP-MON/appsettings.Development.json +++ b/MP-MON/MP-MON/appsettings.Development.json @@ -3,6 +3,9 @@ "LogLevel": { "Default": "Information", "Microsoft.AspNetCore": "Warning" + }, + "ServerConf": { + "BaseAppPath": "/MP/MON8/" } } } diff --git a/MP-MON/MP-MON/appsettings.Production.json b/MP-MON/MP-MON/appsettings.Production.json new file mode 100644 index 00000000..f9541c9a --- /dev/null +++ b/MP-MON/MP-MON/appsettings.Production.json @@ -0,0 +1,11 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + }, + "ServerConf": { + "BaseAppPath": "/MP/MON8/" + } + } +} diff --git a/MP-MON/MP-MON/appsettings.Staging.json b/MP-MON/MP-MON/appsettings.Staging.json new file mode 100644 index 00000000..f9541c9a --- /dev/null +++ b/MP-MON/MP-MON/appsettings.Staging.json @@ -0,0 +1,11 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + }, + "ServerConf": { + "BaseAppPath": "/MP/MON8/" + } + } +} diff --git a/MP-MON/MP-MON/logs/.placeholder b/MP-MON/MP-MON/logs/.placeholder new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/MP-MON/MP-MON/logs/.placeholder @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/MP-MON8.sln b/MP-MON8.sln index 7f0de99b..023e4658 100644 --- a/MP-MON8.sln +++ b/MP-MON8.sln @@ -11,6 +11,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-MON", "MP-MON\MP-MON\MP- EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-MON.Client", "MP-MON\MP-MON.Client\MP-MON.Client.csproj", "{162B91FA-4BFD-4270-966A-C5E8B5DC1346}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{4F652F76-AC46-444D-B808-40102F2F05C0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{3447D4AF-13C2-47BB-8C5F-74299A46D063}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,6 +37,14 @@ Global {162B91FA-4BFD-4270-966A-C5E8B5DC1346}.Debug|Any CPU.Build.0 = Debug|Any CPU {162B91FA-4BFD-4270-966A-C5E8B5DC1346}.Release|Any CPU.ActiveCfg = Release|Any CPU {162B91FA-4BFD-4270-966A-C5E8B5DC1346}.Release|Any CPU.Build.0 = Release|Any CPU + {4F652F76-AC46-444D-B808-40102F2F05C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F652F76-AC46-444D-B808-40102F2F05C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F652F76-AC46-444D-B808-40102F2F05C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F652F76-AC46-444D-B808-40102F2F05C0}.Release|Any CPU.Build.0 = Release|Any CPU + {3447D4AF-13C2-47BB-8C5F-74299A46D063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3447D4AF-13C2-47BB-8C5F-74299A46D063}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3447D4AF-13C2-47BB-8C5F-74299A46D063}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3447D4AF-13C2-47BB-8C5F-74299A46D063}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MP-MON8/Components/Compo/DetailMSE.razor.cs b/MP-MON8/Components/Compo/DetailMSE.razor.cs index ac18f5cc..13c58f36 100644 --- a/MP-MON8/Components/Compo/DetailMSE.razor.cs +++ b/MP-MON8/Components/Compo/DetailMSE.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.Extensions.FileSystemGlobbing; -using MP.Data.Conf; +using MP.Core.Conf; using MP.Data.DbModels; using NLog; diff --git a/MP-MON8/Components/Compo/DetailViewMSE.razor.cs b/MP-MON8/Components/Compo/DetailViewMSE.razor.cs index 0e68af53..ab5e54fa 100644 --- a/MP-MON8/Components/Compo/DetailViewMSE.razor.cs +++ b/MP-MON8/Components/Compo/DetailViewMSE.razor.cs @@ -1,8 +1,6 @@ using Microsoft.AspNetCore.Components; -using MP.Data.Conf; +using MP.Core.Conf; using MP.Data.DbModels; -using Org.BouncyCastle.Asn1; -using static Org.BouncyCastle.Math.EC.ECCurve; namespace MP.MON8.Components.Compo { diff --git a/MP-MON8/Components/Pages/Index.razor.cs b/MP-MON8/Components/Pages/Index.razor.cs index a6820275..348ed0a1 100644 --- a/MP-MON8/Components/Pages/Index.razor.cs +++ b/MP-MON8/Components/Pages/Index.razor.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Components; using MP.Data; -using MP.Data.Conf; +using MP.Core.Conf; using MP.Data.DbModels; using MP.Data.Services; using Newtonsoft.Json; diff --git a/MP-MON8/Components/_Imports.razor b/MP-MON8/Components/_Imports.razor index b29d92df..fc4a3d8c 100644 --- a/MP-MON8/Components/_Imports.razor +++ b/MP-MON8/Components/_Imports.razor @@ -7,7 +7,7 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop @using MP.Data -@using MP.Data.Conf +@using MP.Core.Conf @using MP.Data.Controllers @using MP.Data.DbModels @using MP.Data.DTO diff --git a/MP-MON8/MP-MON8.csproj b/MP-MON8/MP-MON8.csproj index 13366d30..fe0c77fa 100644 --- a/MP-MON8/MP-MON8.csproj +++ b/MP-MON8/MP-MON8.csproj @@ -6,7 +6,7 @@ enable MP.MON8 $(AssemblyName.Replace(' ', '_')) - 6.16.2503.1411 + 6.16.2503.1417 MAPO MES Realtime Monitor diff --git a/MP-MON8/Resources/ChangeLog.html b/MP-MON8/Resources/ChangeLog.html index 609ae79f..e1f83d47 100644 --- a/MP-MON8/Resources/ChangeLog.html +++ b/MP-MON8/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MON MAPO -

Versione: 6.16.2503.1411

+

Versione: 6.16.2503.1417


Note di rilascio: