diff --git a/.gitignore b/.gitignore index 8b7d6a7f..cc187963 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,20 @@ /VersGen/bin/* /VersGen/obj/* +#-------------------------------- +# Area MP-TAB3 +#-------------------------------- +/MP-TAB3/bin/* +/MP-TAB3/obj/* + +#-------------------------------- +# Area Generica +#-------------------------------- +/*/*/bin/* +/*/*/obj/* +/*/bin/* +/*/obj/* + # ---> VisualStudio ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. @@ -163,12 +177,18 @@ publish/ # NuGet Packages *.nupkg +# NuGet Symbol Packages +*.snupkg # The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* **/packages/* # except build/, which is used as an MSBuild target. !**/packages/build/ # Uncomment if necessary however generally it will be regenerated when needed #!**/packages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets # Windows Azure Build Output csx/ diff --git a/MP-TAB2/MP-TAB.Client/Components/CardTest.razor b/MP-TAB2/MP-TAB.Client/Components/CardTest.razor deleted file mode 100644 index 908afa56..00000000 --- a/MP-TAB2/MP-TAB.Client/Components/CardTest.razor +++ /dev/null @@ -1,62 +0,0 @@ -
-
-

- @if (DoPlaceholder) - { -
- -
- } - else - { - @Title - } -

-
-
- @if (DoPlaceholder) - { -
- - - - -
- } - else - { -

@ChildContent

- } -
- -
- -@code { - [Parameter] - public RenderFragment? ChildContent { get; set; } - - [Parameter] - public string? Title { get; set; } - - [Parameter] - public string CardCss { get; set; } = ""; - - [Parameter] - public bool DoPlaceholder { get; set; } = false; - - private void OnYes() - { - Console.WriteLine($"{Title} | 'Yes' button selected."); - } -} \ No newline at end of file diff --git a/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor b/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor deleted file mode 100644 index 7afcfbf8..00000000 --- a/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor +++ /dev/null @@ -1,233 +0,0 @@ -@if (RecMSE == null) -{ -
-
-
- - - - -
-
-
-} -else -{ - @if (FullMode) - { -
- @RecMSE.CodMacchina -
-
-
-
-
- Art -
-
- @RecMSE.CodArticolo -
-
-
-
- @($"PODL{RecMSE.IdxPOdl:00000000}") -
-
- @($"ODL{RecMSE.IdxOdl:00000000}") -
-
-
-
-
-
-
-

- @RecMSE.Nome -

-
-
-
-
- @RecMSE.DescrizioneStato -
-
- @(formatDurata(RecMSE.Durata)) -
-
-
-
-
-
- Confermati -
-
- Prodotti -
-
- Ordinati -
-
-
-
- @($"{RecMSE.PezziConf:N0}") -
-
- @($"{RecMSE.PezziProd:N0}") -
-
- @($"{RecMSE.NumPezzi:N0}") -
-
-
-
- -
-
-
-
-
-
-
- } - else - { - - } -} - -@code { - - [Parameter] - public MappaStatoExpl? RecMSE { get; set; } = null; - - - [Parameter] - public int keepAliveMin { get; set; } = 5; - - - [Parameter] - public bool FullMode { get; set; } = true; - - [Inject] - protected NavigationManager NavMan { get; set; } = null!; - - - protected int kaFactor = 60 / 2; - - protected override void OnInitialized() - { - // se configurata uso cartella virtuale... altrimenti cartella processo - imgBasePath = Environment.CurrentDirectory;// @"C:\Steamware\macchine"; - } - - private string imgBasePath = ""; - - protected ProdAdvDispl.ProdCounter CurrCount - { - get - { - ProdAdvDispl.ProdCounter answ = new ProdAdvDispl.ProdCounter() - { - numPzConf = (int)RecMSE.PezziConf, - numPzOrd= (int)RecMSE.NumPezzi, - numPzProd= (int)RecMSE.PezziProd - }; - return answ; - } - } - - protected async Task ShowDetail() - { - NavMan.NavigateTo($"machine-detail/?IdxMacc={RecMSE!.IdxMacchina}"); - } - - /// - /// url completo immagine - /// - /// - /// - public string ImgUrlMacc(string url) - { - string answ = ""; - if (string.IsNullOrEmpty(url.ToString())) - { - url = "Steamware.png"; - } - // verifico esistenza macchina SMALL... - answ = $"images/macchine/small/{url}"; - string fullPath = Path.Combine(imgBasePath, "wwwroot", answ); - if (!File.Exists(fullPath)) - { - // se non ci fosse cerco immagine fullsize - answ = $"images/macchine/{url}"; - fullPath = Path.Combine(imgBasePath, "wwwroot", answ); - } - // altrimenti metto default Steamware - if (!File.Exists(fullPath)) - { - answ = "images/macchine/Steamware.png"; - } - return answ; - } - - /// - /// formatta la durata in minuti in un modo "human readable" gg/ore/min - /// - /// minuti - /// - public static string formatDurata(double? minuti) - { - string answ = "??"; - if (minuti != null) - { - DateTime tempo = new DateTime(); - tempo = tempo.AddMinutes((double)minuti); - - if (minuti < 60) - { - answ = $"{tempo.Minute:00}:{tempo.Second:00}"; - } - else if (minuti < 1440) - { - answ = $"{tempo.Hour}h {tempo.Minute}m"; - } - else - { - answ = $"{tempo.DayOfYear}g {tempo.Hour}h"; - } - } - return answ; - } - - private string cssComStatus(string semaforo, DateTime? lastUpdateN) - { - DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1); - string answ = cssStatus(semaforo); - if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > (keepAliveMin * kaFactor)) - { - answ = $"{baseCss}Ro"; - // blink se secondo pari... - DateTime adesso = DateTime.Now; - int resto = 0; - Math.DivRem(adesso.Second, 2, out resto); - if (resto == 0) - { - answ += "_b"; - } - } - return answ; - } - - private string cssStatus(string codSemaforo) - { - // se vuoto --> mostra nero! - if (string.IsNullOrEmpty(codSemaforo)) - { - codSemaforo = "sNe"; - } - string codColore = codSemaforo.Substring(1, 2); - string answ = $"{baseCss}{codColore}"; - return answ; - } - protected string baseCss = "sem"; -} diff --git a/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor.css b/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor.css deleted file mode 100644 index c6e037aa..00000000 --- a/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor.css +++ /dev/null @@ -1,71 +0,0 @@ -/* Bordi */ -/*.rCAll { - border-radius: 10px; -} - -.rCTop { - border-radius: 10px 10px 0 0; -} - -.rCBot { - border-radius: 0 0 10px 10px; -}*/ -.mapBlock { - font-family: 'Open Sans Condensed', sans-serif; - color: #FFF; - background-image: linear-gradient(#111, #000); - min-width: 8em; -} -.labelTopDx { - padding: 0.1em 0.4em; - width: auto; - min-height: 0; - top: 0; - left: auto; - bottom: auto; - color: #FFFFFF; - background: #2200DE; - background: rgba(33, 0, 200, 0.7); - -webkit-border-top-right-radius: inherit; - border-top-right-radius: inherit; - -webkit-border-top-left-radius: inherit; - border-top-left-radius: inherit; - -webkit-border-bottom-left-radius: inherit; - border-bottom-left-radius: inherit; - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; -} -/* area semafori*/ -.sVe { - text-align: left; - background: #009036; - background: rgba(0, 255, 80, 0.6); - /*padding: 0px 4px 0px 4px;*/ - color: Yellow; -} -.sGi { - text-align: left; - background: #ffec00; - background: rgba(255, 220, 0, 0.6); - /*padding: 0px 4px 0px 4px;*/ -} -.sRo { - text-align: left; - background-color: #e2001a; - background: rgba(240, 0, 10, 0.6); - /*padding: 0px 4px 0px 4px;*/ -} -.sBl { - text-align: left; - background: #3690FF; - background: rgba(0, 80, 255, 0.6); - /*padding: 0px 4px 0px 4px;*/ - color: Yellow; -} -.sGr { - text-align: left; - background-color: #bcbcbc; - background: rgba(180, 180, 180, 0.6); - /*padding: 0px 4px 0px 4px;*/ -} -/*end semafori */ \ No newline at end of file diff --git a/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor.less b/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor.less deleted file mode 100644 index 439b5756..00000000 --- a/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor.less +++ /dev/null @@ -1,78 +0,0 @@ -/* Bordi */ -/*.rCAll { - border-radius: 10px; -} - -.rCTop { - border-radius: 10px 10px 0 0; -} - -.rCBot { - border-radius: 0 0 10px 10px; -}*/ - -.mapBlock { - font-family: 'Open Sans Condensed', sans-serif; - color: #FFF; - background-image: linear-gradient(#111, #000); - min-width: 8em; -} - -.labelTopDx { - padding: 0.1em 0.4em; - width: auto; - min-height: 0; - top: 0; - left: auto; - bottom: auto; - color: #FFFFFF; - background: #2200DE; - background: rgba(33,0,200,.7); - -webkit-border-top-right-radius: inherit; - border-top-right-radius: inherit; - -webkit-border-top-left-radius: inherit; - border-top-left-radius: inherit; - -webkit-border-bottom-left-radius: inherit; - border-bottom-left-radius: inherit; - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; -} - -/* area semafori*/ -.sVe { - text-align: left; - background: #009036; - background: rgba(0,255,80,.6); - /*padding: 0px 4px 0px 4px;*/ - color: Yellow; -} - -.sGi { - text-align: left; - background: #ffec00; - background: rgba(255,220,0,.6); - /*padding: 0px 4px 0px 4px;*/ -} - -.sRo { - text-align: left; - background-color: #e2001a; - background: rgba(240,0,10,.6); - /*padding: 0px 4px 0px 4px;*/ -} - -.sBl { - text-align: left; - background: #3690FF; - background: rgba(0,80,255,.6); - /*padding: 0px 4px 0px 4px;*/ - color: Yellow; -} - -.sGr { - text-align: left; - background-color: #bcbcbc; - background: rgba(180,180,180,.6); - /*padding: 0px 4px 0px 4px;*/ -} -/*end semafori */ diff --git a/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor.min.css b/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor.min.css deleted file mode 100644 index 82b3cba0..00000000 --- a/MP-TAB2/MP-TAB.Client/Components/MachineBlock.razor.min.css +++ /dev/null @@ -1 +0,0 @@ -.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,0,200,.7);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.sVe{text-align:left;background:#009036;background:rgba(0,255,80,.6);color:#ff0;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#ff0;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);} \ No newline at end of file diff --git a/MP-TAB2/MP-TAB.Client/Components/ProdAdvDispl.razor b/MP-TAB2/MP-TAB.Client/Components/ProdAdvDispl.razor deleted file mode 100644 index fd61c443..00000000 --- a/MP-TAB2/MP-TAB.Client/Components/ProdAdvDispl.razor +++ /dev/null @@ -1,121 +0,0 @@ -
-
- @($"{NumGreen}%") -
-
- @($"{NumYellow}%") -
-
- @($"{NumGray}%") -
-
- @($"{NumBlue}%") -
-
- - -@code { - /// - /// Conteggio dati produzione da mostrare - /// - [Parameter] - public ProdCounter CountData { get; set; } = null!; - - /// - /// Numero pezzi CONFERMATI - /// - protected int NumPzConf { get; set; } = 0; - - /// - /// Numero pezzi ORDINATI - /// - protected int NumPzOrd { get; set; } = 0; - - /// - /// Numero pezzi PRODOTTI - /// - protected int NumPzProd { get; set; } = 0; - - - /// - /// Numero pezzi per display BLU - /// - protected int NumBlue { get; set; } = 0; - - /// - /// Numero pezzi per display GRIGIO - /// - protected int NumGray { get; set; } = 40; - - /// - /// Numero pezzi per display VERDE - /// - protected int NumGreen { get; set; } = 20; - - /// - /// Numero pezzi per display GIALLO - /// - protected int NumYellow { get; set; } = 30; - - protected override void OnParametersSet() - { - decimal denom = CountData.numPzProd > CountData.numPzOrd ? (decimal)CountData.numPzProd / 100 : (decimal)CountData.numPzOrd / 100; - denom = denom == 0 ? 1 : denom; - // calcolo se sono nel caso prod < ordinati o se sono andato OVER - if (CountData.numPzProd < CountData.numPzOrd) - { - nGreen = (int)Math.Floor((decimal)CountData.numPzConf / denom); - nYellow = (int)Math.Floor((decimal)(CountData.numPzProd - CountData.numPzConf) / denom); - nGray = 100 - (nGreen + nYellow); - nBlue = 0; - } - else - { - // devo verificare SE ne ho confermati meno che ordinati o meno... - if (CountData.numPzConf < CountData.numPzOrd) - { - nGreen = (int)Math.Floor((decimal)CountData.numPzConf / denom); - } - else - { - nGreen = (int)Math.Floor((decimal)CountData.numPzOrd / denom); - } - nBlue = 100 - nGreen; - nYellow = 0; - nGray = 0; - } - // disegno! - NumGreen = nGreen; - NumYellow = nYellow; - NumGray = nGray; - NumBlue = nBlue; - // base.OnParametersSet(); - } - - protected int nBlue = 0; - protected int nGray = 0; - protected int nGreen = 0; - protected int nYellow = 0; - - /// - /// Classe gesitone conteggi produzione - /// - public class ProdCounter - { - - /// - /// NUmero pezzi CONFERMATI - /// - public int numPzConf { get; set; } = 0; - - /// - /// Numero pezzi ORDINATI - /// - public int numPzOrd { get; set; } = 0; - - /// - /// Numero pezzi PRODOTTI - /// - public int numPzProd { get; set; } = 0; - } -} diff --git a/MP-TAB2/MP-TAB.Client/Components/SlideMenu.razor b/MP-TAB2/MP-TAB.Client/Components/SlideMenu.razor deleted file mode 100644 index ff37af10..00000000 --- a/MP-TAB2/MP-TAB.Client/Components/SlideMenu.razor +++ /dev/null @@ -1,46 +0,0 @@ - -
-
-
-
- -
-
-
- EgalWare -
-
- Main Menu -
-
-
- -
-
-
-
- LINK DIRETTI -
-
-
-
- - @foreach (var item in MenuItems) - { - @item.Testo - } -
-
-
- -
-
-
- -@code { - - [Parameter] - public List MenuItems { get; set; } = new List(); -} diff --git a/MP-TAB2/MP-TAB.Client/Components/TcHistoryFilter.razor b/MP-TAB2/MP-TAB.Client/Components/TcHistoryFilter.razor deleted file mode 100644 index 76ae335a..00000000 --- a/MP-TAB2/MP-TAB.Client/Components/TcHistoryFilter.razor +++ /dev/null @@ -1,218 +0,0 @@ -@using MP.Data.Services; -@using NLog; -@using System.Net.Http -@using System.Net.Http.Json -@inject HttpClient Http -@inject SharedMemService MServ -@inject IConfiguration config - -
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
- -@code { - - [Parameter] - public int MatrOpr { get; set; } = 102; - [Parameter] - public string Title { get; set; } = "TC History"; - [Parameter] - public int SearchMinChar { get; set; } - [Parameter] - public EventCallback E_CodArt { get; set; } - [Parameter] - public EventCallback E_IdxMacc { get; set; } - - protected string BaseAddr = ""; - - protected override async Task OnInitializedAsync() - { - BaseAddr = config.GetValue("OptConf:BaseAddr") ?? ""; - await ReloadAllData(); - } - - - protected async Task ReloadAllData() - { - await ReloadArticoli(); - await ReloadMacchine(); - } - - protected async Task ReloadArticoli() - { - await GetArticoli(); - FiltArticoli(); - } - - protected async Task ReportArt() - { - await E_CodArt.InvokeAsync(CodArtSel); - } - protected async Task ReportMacc() - { - await E_IdxMacc.InvokeAsync(IdxMaccSel); - } - - protected async Task GetArticoli() - { - if (!ListArtDisabled) - { - Log.Debug("GetArticoli"); - string ApiUrl = $"{BaseAddr}api/ListSelect/GetDictArticoli?SearchArt={SearchVal}"; - var rawData = await Http.GetFromJsonAsync>(ApiUrl); - if (rawData != null) - { - ListArticoliAll = rawData; - } - } - } - protected void FiltArticoli() - { - bool done = false; - if (!ListArtDisabled) - { - if (ListArticoliAll != null) - { - TotalCount = ListArticoliAll.Count; - ListArticoli = ListArticoliAll.Take(Num2Displ).ToDictionary(x => x.Key, x => x.Value); - DisplayCount = ListArticoli.Count; - done = true; - } - } - if (!done) - { - TotalCount = 0; - ListArticoli = new Dictionary(); - DisplayCount = 0; - } - } - protected async Task ReloadMacchine() - { - if (ListMacchineAll == null || ListMacchineAll.Count == 0) - { - Log.Debug("START ReloadMacchine"); - string ApiUrl = $"{BaseAddr}api/ListSelect/GetDictMacc?MatrOpr={MatrOpr}"; - var rawData = await Http.GetFromJsonAsync>(ApiUrl); - if (rawData != null) - { - ListMacchineAll = rawData; - } - Log.Debug("END ReloadMacchine"); - } - } - - protected bool ListArtDisabled - { - get => string.IsNullOrEmpty(SearchVal) || SearchVal.Length < SearchMinChar; - } - - protected string SearchVal - { - get => searchVal; - set - { - if (searchVal != value) - { - searchVal = value; - } - } - } - - protected string CodArtSel - { - get => codArtSel; - set - { - if (codArtSel != value) - { - codArtSel = value; - } - } - } - - - - protected int Num2Displ - { - get => num2Displ; - set - { - if (num2Displ != value) - { - num2Displ = value; - FiltArticoli(); - } - } - } - - protected string IdxMaccSel { get; set; } = ""; - protected Dictionary ListMacchineAll - { - get => MServ.DictMacchine; - set => MServ.DictMacchine = value; - } - - protected Dictionary ListArticoliAll { get; set; } = new Dictionary(); - protected Dictionary? ListArticoli { get; set; } = null; - protected int TotalCount { get; set; } = 0; - protected int DisplayCount { get; set; } = 0; - - - private string searchVal { get; set; } = ""; - private string codArtSel { get; set; } = ""; - private int num2Displ { get; set; } = 20; - private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); -} diff --git a/MP-TAB2/MP-TAB.Client/MP-TAB.Client.csproj b/MP-TAB2/MP-TAB.Client/MP-TAB.Client.csproj deleted file mode 100644 index 008e6d63..00000000 --- a/MP-TAB2/MP-TAB.Client/MP-TAB.Client.csproj +++ /dev/null @@ -1,52 +0,0 @@ - - - - net8.0 - enable - enable - true - Default - MP-TAB.Client - $(AssemblyName.Replace(' ', '_')) - false - - - - - - - - - - - - - - - <_ContentIncludedByDefault Remove="compilerconfig.json" /> - - - - - - - - - - - - - - - - - - - Always - - - Always - - - - diff --git a/MP-TAB2/MP-TAB.Client/Pages/CardDemoList.razor b/MP-TAB2/MP-TAB.Client/Pages/CardDemoList.razor deleted file mode 100644 index 3bc7a173..00000000 --- a/MP-TAB2/MP-TAB.Client/Pages/CardDemoList.razor +++ /dev/null @@ -1,46 +0,0 @@ -@attribute [RenderModeAuto] - -@if (CardTitles == null || CardTitles.Count == 0) -{ -
-
- waiting on browser -
- @for (int i = 0; i < 9; i++) - { -
- - -
- } -
-} -else -{ - -
-
- loaded on browser -
- @foreach (var item in CardTitles) - { -
- -
- Demo content page for @item -
-
- This is an example Blazor component! -
-
-
- } -
-} - -@code { - - [Parameter] - public List? CardTitles { get; set; } - -} diff --git a/MP-TAB2/MP-TAB.Client/Pages/Counter.razor b/MP-TAB2/MP-TAB.Client/Pages/Counter.razor deleted file mode 100644 index d5ae8371..00000000 --- a/MP-TAB2/MP-TAB.Client/Pages/Counter.razor +++ /dev/null @@ -1,19 +0,0 @@ -@* @attribute [RenderModeAuto] *@ -@attribute [RenderModeServer] - -Counter - -

Counter

- -

Current count: @currentCount

- - - -@code { - private int currentCount = 0; - - private void IncrementCount() - { - currentCount++; - } -} diff --git a/MP-TAB2/MP-TAB.Client/Pages/MachineDetail.razor b/MP-TAB2/MP-TAB.Client/Pages/MachineDetail.razor deleted file mode 100644 index c3f6779b..00000000 --- a/MP-TAB2/MP-TAB.Client/Pages/MachineDetail.razor +++ /dev/null @@ -1,35 +0,0 @@ -@attribute [RenderModeAuto] - -@using MP.Data.Services; -@inject MessageService MsgServ - -

Machine Detail

-

@IdxMacc

-@if (CurrMSE == null) -{ - -} -else -{ - -} - -@code { - - [Parameter] - [SupplyParameterFromQuery] - public string? IdxMacc { get; set; } - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - // recupero MSE macchina.... - if (!string.IsNullOrEmpty(IdxMacc)) - { - CurrMSE = await MsgServ.GetMachineMse(IdxMacc); - } - //await InvokeAsync(StateHasChanged); - // return base.OnAfterRenderAsync(firstRender); - } - protected MappaStatoExpl? CurrMSE { get; set; } = null; - -} diff --git a/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor b/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor deleted file mode 100644 index 0a286b54..00000000 --- a/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor +++ /dev/null @@ -1,42 +0,0 @@ -@attribute [RenderModeAuto] - -@using MP.Data.Services; -@using MP.Data; - -@inject MessageService MsgServ - -
- @if (ListMSE == null || ListMSE.Count == 0) - { - @for (int i = 0; i < 10; i++) - { -
- -
- } - } - else - { - @foreach (var item in ListMSE) - { -
- -
- } - } -
- -@code { - - [Parameter] - public List? ListMSE { get; set; } = null; - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (ListMSE != null) - { - // salvo in LocalStorage... - await MsgServ.SaveMse(ListMSE); - } - } -} diff --git a/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor.css b/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor.css deleted file mode 100644 index f69d8193..00000000 --- a/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor.css +++ /dev/null @@ -1,39 +0,0 @@ -body .bloccoMacc { - font-family: 'Open Sans Condensed', sans-serif; -} -/* <= 425px */ -@media all and (max-width: 425px) { - .bloccoMacc { - font-size: 0.6em; - } -} -/* > 425px con 2 blocchi */ -@media all and (min-width: 425px) { - .bloccoMacc { - font-size: 0.8em; - } -} -/* > 600px con 2 colonne */ -@media all and (min-width: 600px) { - .bloccoMacc { - font-size: 1.2em; - } -} -/* > 800px */ -@media all and (min-width: 800px) { - .bloccoMacc { - font-size: 1em; - } -} -/* > 1024px */ -@media all and (min-width: 1024px) { - .bloccoMacc { - font-size: 1.1em; - } -} -/* > 1440px */ -@media all and (min-width: 1600px) { - .bloccoMacc { - font-size: 1.2em; - } -} \ No newline at end of file diff --git a/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor.less b/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor.less deleted file mode 100644 index 3d37e099..00000000 --- a/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor.less +++ /dev/null @@ -1,41 +0,0 @@ -body /* gestione area mappa stato e pagine dettaglio macchina */ -.bloccoMacc { - font-family: 'Open Sans Condensed', sans-serif; -} - -/* <= 425px */ -@media all and (max-width: 425px) { - .bloccoMacc { - font-size: 0.6em; - } -} -/* > 425px con 2 blocchi */ -@media all and (min-width: 425px) { - .bloccoMacc { - font-size: 0.8em; - } -} -/* > 600px con 2 colonne */ -@media all and (min-width: 600px) { - .bloccoMacc { - font-size: 1.2em; - } -} -/* > 800px */ -@media all and (min-width: 800px) { - .bloccoMacc { - font-size: 1em; - } -} -/* > 1024px */ -@media all and (min-width: 1024px) { - .bloccoMacc { - font-size: 1.1em; - } -} -/* > 1440px */ -@media all and (min-width: 1600px) { - .bloccoMacc { - font-size: 1.2em; - } -} diff --git a/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor.min.css b/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor.min.css deleted file mode 100644 index 11be311d..00000000 --- a/MP-TAB2/MP-TAB.Client/Pages/StatusMap.razor.min.css +++ /dev/null @@ -1 +0,0 @@ -body .bloccoMacc{font-family:'Open Sans Condensed',sans-serif;}@media all and (max-width:425px){.bloccoMacc{font-size:.6em;}}@media all and (min-width:425px){.bloccoMacc{font-size:.8em;}}@media all and (min-width:600px){.bloccoMacc{font-size:1.2em;}}@media all and (min-width:800px){.bloccoMacc{font-size:1em;}}@media all and (min-width:1024px){.bloccoMacc{font-size:1.1em;}}@media all and (min-width:1600px){.bloccoMacc{font-size:1.2em;}} \ No newline at end of file diff --git a/MP-TAB2/MP-TAB.Client/Pages/TCHistory.razor b/MP-TAB2/MP-TAB.Client/Pages/TCHistory.razor deleted file mode 100644 index 4586423f..00000000 --- a/MP-TAB2/MP-TAB.Client/Pages/TCHistory.razor +++ /dev/null @@ -1,190 +0,0 @@ -@using NLog; -@attribute [RenderModeAuto] -@* @attribute [RenderModeServer] *@ - -@inject HttpClient Http - -
-
- -
-
- - - - - - @* *@ - @* *@ - @* *@ - - - - - @if (isLoading) - { - @for (int i = 0; i < NumRecPage; i++) - { - - - - @* *@ - - - - } - } - else - { - @if (ListODL == null || ListODL.Count == 0) - { - - - - } - else - { - foreach (var item in ListODL) - { - - - - @* *@ - - @* *@ - - } - } - } - -
ArticoloInformazioniTCicloNoteImpiantoPeriodo
-
- -
-
- -
-
- -
-
Nessun record trovato
-
-
@item.CodArticolo
- @item.DescArticolo -
-
- Impianto: @item.IdxMacchina -
-
- TC: @item.Tcassegnato.ToString("N3") -
-
- N° pz: @item.NumPezzi pz -
-
- @item.Note -
-
-
- Inizio: @item.DataInizio -
-
- Fine: @item.DataFine -
-
-
-
- -
- -@code { - [Parameter] - public int MatrOpr { get; set; } = 0; - - [Inject] - protected IConfiguration config { get; set; } = null!; - - protected int SearchMinChar = 3; - protected string CodArt = ""; - protected string IdxMacc = "*"; - protected string BaseAddr = ""; - protected bool isLoading = false; - - protected int NumRecPage = 5; - protected int TotalCount = 0; - protected int PageNum = 1; - - protected List ListComplete { get; set; } = new List(); - protected List ListODL { get; set; } = new List(); - - protected override async Task OnInitializedAsync() - { - BaseAddr = config.GetValue("OptConf:BaseAddr") ?? ""; - await ReloadData(); - } - - protected async Task SelCodArt(string newCodArt) - { - CodArt = newCodArt; - await ReloadData(); - } - protected async Task SelIdxMacc(string newIdxMacc) - { - IdxMacc = newIdxMacc; - await ReloadData(); - } - - protected async Task ReloadData() - { - isLoading = true; - if (!string.IsNullOrEmpty(CodArt)) - { - string ApiUrl = $"{BaseAddr}api/ODL/GetODL?CodArt={CodArt}&IdxMacchina={IdxMacc}"; - try - { - var rawData = await Http.GetFromJsonAsync>(ApiUrl); - if (rawData != null) - { - ListComplete = rawData; - TotalCount = ListComplete.Count; - // esegue paginazione - UpdateTable(); - } - } - catch (Exception exc) - { - Log.Error($"Error on dataload{Environment.NewLine}{exc}"); - } - } - isLoading = false; - } - - protected void UpdateTable() - { - // esegue paginazione - if (TotalCount > NumRecPage) - { - ListODL = ListComplete.Skip((PageNum - 1) * NumRecPage).Take(NumRecPage).ToList(); - } - else - { - ListODL = ListComplete; - } - } - - protected void SavePage(int newNum) - { - PageNum = newNum; - UpdateTable(); - } - - protected void SaveNumRec(int newNum) - { - NumRecPage = newNum; - UpdateTable(); - } - - private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); -} diff --git a/MP-TAB2/MP-TAB.Client/Pages/User.razor b/MP-TAB2/MP-TAB.Client/Pages/User.razor deleted file mode 100644 index 5f282702..00000000 --- a/MP-TAB2/MP-TAB.Client/Pages/User.razor +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/MP-TAB2/MP-TAB.Client/Program.cs b/MP-TAB2/MP-TAB.Client/Program.cs deleted file mode 100644 index e3818aaa..00000000 --- a/MP-TAB2/MP-TAB.Client/Program.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Blazored.LocalStorage; -using Blazored.SessionStorage; -using Microsoft.AspNetCore.Components.WebAssembly.Hosting; -using MP.Data.Services; - -var builder = WebAssemblyHostBuilder.CreateDefault(args); - -// servizio cache locale dati -builder.Services.AddSingleton(); -builder.Services.AddScoped(); -builder.Services.AddBlazoredLocalStorage(); -builder.Services.AddBlazoredSessionStorage(); - -// aggiunto x gestione chiamate WebAPI -builder.Services.AddScoped(sp => - new HttpClient - { - BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) - }); - - -await builder.Build().RunAsync(); diff --git a/MP-TAB2/MP-TAB.Client/_Imports.razor b/MP-TAB2/MP-TAB.Client/_Imports.razor deleted file mode 100644 index 726186ea..00000000 --- a/MP-TAB2/MP-TAB.Client/_Imports.razor +++ /dev/null @@ -1,10 +0,0 @@ -@using System.Net.Http -@using System.Net.Http.Json -@using Microsoft.AspNetCore.Components.Forms -@using Microsoft.AspNetCore.Components.Routing -@using Microsoft.AspNetCore.Components.Sections -@using Microsoft.AspNetCore.Components.Web -@using Microsoft.AspNetCore.Components.Web.Virtualization -@using Microsoft.JSInterop -@using MP_TAB.Client -@using MP.Data.DatabaseModels \ No newline at end of file diff --git a/MP-TAB2/MP-TAB.Client/compilerconfig.json b/MP-TAB2/MP-TAB.Client/compilerconfig.json deleted file mode 100644 index d820348d..00000000 --- a/MP-TAB2/MP-TAB.Client/compilerconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "outputFile": "Components/MachineBlock.razor.css", - "inputFile": "Components/MachineBlock.razor.less" - }, - { - "outputFile": "Pages/StatusMap.razor.css", - "inputFile": "Pages/StatusMap.razor.less" - } -] \ No newline at end of file diff --git a/MP-TAB2/MP-TAB.Client/compilerconfig.json.defaults b/MP-TAB2/MP-TAB.Client/compilerconfig.json.defaults deleted file mode 100644 index 41870cc5..00000000 --- a/MP-TAB2/MP-TAB.Client/compilerconfig.json.defaults +++ /dev/null @@ -1,71 +0,0 @@ -{ - "compilers": { - "less": { - "autoPrefix": "", - "cssComb": "none", - "ieCompat": true, - "math": null, - "strictMath": false, - "strictUnits": false, - "relativeUrls": true, - "rootPath": "", - "sourceMapRoot": "", - "sourceMapBasePath": "", - "sourceMap": false - }, - "sass": { - "autoPrefix": "", - "loadPaths": "", - "style": "expanded", - "relativeUrls": true, - "sourceMap": false - }, - "nodesass": { - "autoPrefix": "", - "includePath": "", - "indentType": "space", - "indentWidth": 2, - "outputStyle": "nested", - "precision": 5, - "relativeUrls": true, - "sourceMapRoot": "", - "lineFeed": "", - "sourceMap": false - }, - "stylus": { - "sourceMap": false - }, - "babel": { - "sourceMap": false - }, - "coffeescript": { - "bare": false, - "runtimeMode": "node", - "sourceMap": false - }, - "handlebars": { - "root": "", - "noBOM": false, - "name": "", - "namespace": "", - "knownHelpersOnly": false, - "forcePartial": false, - "knownHelpers": [], - "commonjs": "", - "amd": false, - "sourceMap": false - } - }, - "minifiers": { - "css": { - "enabled": true, - "termSemicolons": true, - "gzip": false - }, - "javascript": { - "enabled": true, - "termSemicolons": true, - "gzip": false - } - } -} \ No newline at end of file diff --git a/MP-TAB2/MP-TAB.Client/wwwroot/appsettings.Development.json b/MP-TAB2/MP-TAB.Client/wwwroot/appsettings.Development.json deleted file mode 100644 index 0c208ae9..00000000 --- a/MP-TAB2/MP-TAB.Client/wwwroot/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/MP-TAB2/MP-TAB.Client/wwwroot/appsettings.json b/MP-TAB2/MP-TAB.Client/wwwroot/appsettings.json deleted file mode 100644 index 0c208ae9..00000000 --- a/MP-TAB2/MP-TAB.Client/wwwroot/appsettings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/MP-TAB2/MP-TAB.Client/wwwroot/images/LogoMapoFull.png b/MP-TAB2/MP-TAB.Client/wwwroot/images/LogoMapoFull.png deleted file mode 100644 index 3d766f04..00000000 Binary files a/MP-TAB2/MP-TAB.Client/wwwroot/images/LogoMapoFull.png and /dev/null differ diff --git a/MP-TAB2/MP-TAB.Client/wwwroot/images/LogoSteamware.png b/MP-TAB2/MP-TAB.Client/wwwroot/images/LogoSteamware.png deleted file mode 100644 index 0f58f814..00000000 Binary files a/MP-TAB2/MP-TAB.Client/wwwroot/images/LogoSteamware.png and /dev/null differ diff --git a/MP-TAB2/MP-TAB.sln b/MP-TAB2/MP-TAB.sln deleted file mode 100644 index 91af90d2..00000000 --- a/MP-TAB2/MP-TAB.sln +++ /dev/null @@ -1,50 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-TAB", "MP-TAB\MP-TAB.csproj", "{2410D33B-FFA6-45A6-B7B5-15F21A160223}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-TAB.Client", "MP-TAB.Client\MP-TAB.Client.csproj", "{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|Any CPU.Build.0 = Debug|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|x64.ActiveCfg = Debug|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|x64.Build.0 = Debug|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|x86.ActiveCfg = Debug|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|x86.Build.0 = Debug|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|Any CPU.ActiveCfg = Release|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|Any CPU.Build.0 = Release|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|x64.ActiveCfg = Release|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|x64.Build.0 = Release|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|x86.ActiveCfg = Release|Any CPU - {416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|x86.Build.0 = Release|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|x64.ActiveCfg = Debug|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|x64.Build.0 = Debug|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|x86.ActiveCfg = Debug|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|x86.Build.0 = Debug|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|Any CPU.Build.0 = Release|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|x64.ActiveCfg = Release|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|x64.Build.0 = Release|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|x86.ActiveCfg = Release|Any CPU - {2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A308E5FF-9B15-451D-BFB6-47D4CDEC6C03} - EndGlobalSection -EndGlobal diff --git a/MP-TAB2/MP-TAB/.config/dotnet-tools.json b/MP-TAB2/MP-TAB/.config/dotnet-tools.json deleted file mode 100644 index b0e38abd..00000000 --- a/MP-TAB2/MP-TAB/.config/dotnet-tools.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": 1, - "isRoot": true, - "tools": {} -} \ No newline at end of file diff --git a/MP-TAB2/MP-TAB/Components/App.razor b/MP-TAB2/MP-TAB/Components/App.razor deleted file mode 100644 index 2f9c30df..00000000 --- a/MP-TAB2/MP-TAB/Components/App.razor +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - @* *@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/MP-TAB2/MP-TAB/Components/Layout/MainLayout.razor b/MP-TAB2/MP-TAB/Components/Layout/MainLayout.razor deleted file mode 100644 index 5e110689..00000000 --- a/MP-TAB2/MP-TAB/Components/Layout/MainLayout.razor +++ /dev/null @@ -1,103 +0,0 @@ -@using NLog; -@inherits LayoutComponentBase - -@inject NavigationManager NavMan -@inject ListSelectDataSrv MDataService -@inject SharedMemService MStor - -
-
-
-
- - - Username - - [999] -
- -
- -
-
- -
-
-
-
- -
-
- @Body -
- -
-
-
- -
- An unhandled error has occurred. - Reload - 🗙 -
- - -@code { - /// - /// Elenco items da menù per pagina corrente... - /// - protected List CurrMenuItems { get; set; } = new List(); - - /// - /// Livello corrente del menu - /// - protected string CurrLevel { get; set; } = ""; - - protected string ResetClass = "btn-primary"; - - /// - /// Init struttura dati - /// - /// - protected override async Task OnInitializedAsync() - { - CurrLevel = MStor.PageLevel(NavMan.Uri); - if (MStor.DictMenu.ContainsKey(CurrLevel)) - { - CurrMenuItems = MStor.DictMenu[CurrLevel]; - } - else - { - CurrMenuItems = await MDataService.ListLinkFilt(CurrLevel); - MStor.DictMenu.Add(CurrLevel, CurrMenuItems); - } - await Task.Delay(1); - } - - private static Logger Log = LogManager.GetCurrentClassLogger(); - - protected async Task ForceReload() - { - Log.Info("Start ForceReload"); - ResetClass = "btn-warning"; - await InvokeAsync(StateHasChanged); - await MDataService.FlushCache(); - MStor.ResetCache(); - await Task.Delay(200); - ResetClass = "btn-primary"; - await InvokeAsync(StateHasChanged); - Log.Info("END ForceReload"); - } - - - private void OnYes() - { - Console.WriteLine($"{DateTime.Now} | 'Yes' button selected."); - } -} \ No newline at end of file diff --git a/MP-TAB2/MP-TAB/Components/Layout/MainLayout.razor.css b/MP-TAB2/MP-TAB/Components/Layout/MainLayout.razor.css deleted file mode 100644 index ea17a5c8..00000000 --- a/MP-TAB2/MP-TAB/Components/Layout/MainLayout.razor.css +++ /dev/null @@ -1,119 +0,0 @@ -.page { - position: relative; - display: flex; - flex-direction: column; -} - -main { - flex: 1; -} - -.sidebar { - /*background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);*/ - padding: 0 10px 0 0; -} - -.top-row { - background-color: #05173d; - /*border-bottom: 1px solid #d6d5d5;*/ - justify-content: flex-end; - height: 3.5rem; - display: flex; - align-items: center; -} - - .top-row ::deep a, .top-row ::deep .btn-link { - white-space: nowrap; - /*margin-left: 1.5rem;*/ - text-decoration: none; - } - - .top-row ::deep a:hover, .top-row ::deep .btn-link:hover { - text-decoration: underline; - } - - .top-row ::deep a:first-child { - overflow: hidden; - text-overflow: ellipsis; - } - -@media (min-width: 640.98px) { - .slideMen:not(.auth) { - display: none; - } - - #mainBody { - width: 83%; - } -} - - - - -@media (max-width: 640.98px) { - .top-row:not(.auth) { - display: none; - } - - #mainBody { - width: 100%; - } - - .top-row.auth { - justify-content: space-between; - } - - .top-row ::deep a, .top-row ::deep .btn-link { - margin-left: 0; - } -} - -@media (min-width: 641px) { - .page { - flex-direction: row; - } - - .sidebar { - width: 250px; - height: 100vh; - position: sticky; - top: 0; - left: 100%; - } -} - -.top-row { - position: sticky; - top: 0; - z-index: 1; -} - - .top-row.auth ::deep a:first-child { - flex: 1; - text-align: right; - width: 0; - } - -.top-row, article { - padding-left: 1rem !important; - padding-right: .5rem !important; -} - -#blazor-error-ui { - background: lightyellow; - bottom: 0; - box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); - display: none; - left: 0; - padding: 0.6rem 1.25rem 0.7rem 1.25rem; - position: fixed; - width: 100%; - z-index: 1000; -} - - #blazor-error-ui .dismiss { - cursor: pointer; - position: absolute; - right: 0.75rem; - top: 0.5rem; - } diff --git a/MP-TAB2/MP-TAB/Components/Layout/NavMenu.razor b/MP-TAB2/MP-TAB/Components/Layout/NavMenu.razor deleted file mode 100644 index a39c6a6d..00000000 --- a/MP-TAB2/MP-TAB/Components/Layout/NavMenu.razor +++ /dev/null @@ -1,71 +0,0 @@ -@inject NavigationManager NavMan -@inject ListSelectDataSrv MDataService - -@*
*@ -@*
-
- -
-
-
-
-
-
- *@ -@* *@ -@* *@ - -@*