From d7d5d91fcfa9b2f8bc14989249a87e1ae4e39b91 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 28 Nov 2022 09:03:30 +0100 Subject: [PATCH 01/25] fix filtro x macchina XDL --- MP.SPEC/Components/SelFilterXDL.razor | 2 +- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MP.SPEC/Components/SelFilterXDL.razor b/MP.SPEC/Components/SelFilterXDL.razor index 891c9f2e..e658b944 100644 --- a/MP.SPEC/Components/SelFilterXDL.razor +++ b/MP.SPEC/Components/SelFilterXDL.razor @@ -42,7 +42,7 @@ { foreach (var item in ListMacchine) { - + } } diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index ad52035d..adfd359d 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2211.2519 + 6.16.2211.2808 diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index a93c4d7d..3fa090cc 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2211.2519

+

Versione: 6.16.2211.2808


Note di rilascio: *@ -
- - +
+ +
diff --git a/MP.INVE/Components/ProcSuggestion.razor b/MP.INVE/Components/ProcSuggestion.razor index 1381b0bf..1c3820f8 100644 --- a/MP.INVE/Components/ProcSuggestion.razor +++ b/MP.INVE/Components/ProcSuggestion.razor @@ -11,31 +11,51 @@ @if (udc != null) {
-
- - @udc.UDC - - - @tipo - -
+ @* +
+ + @udc.UDC + + + @tipo + +
*@
    -
  • Lotto: @udc.lottoNav.Lotto
    • -
  • Articolo: @udc.lottoNav.CodArt
    • +
  • + Lotto: +
    + + @tipo +
    +
    • +
  • + Articolo: +
    + + +
    +
  • Quantità:
    - + +
-
+
+
+
+ Last scan: @udc.UDC +
+
+ } else { diff --git a/MP.INVE/Components/ProcSuggestion.razor.cs b/MP.INVE/Components/ProcSuggestion.razor.cs index 90f5cd18..8125c9ea 100644 --- a/MP.INVE/Components/ProcSuggestion.razor.cs +++ b/MP.INVE/Components/ProcSuggestion.razor.cs @@ -52,5 +52,15 @@ namespace MP.INVE.Components } } + protected string reqArtMod = "disabilita"; + protected string reqQtaMod = "disabilita"; + protected void cssDisableArt() + { + reqArtMod = ""; + } + protected void cssDisableQta() + { + reqQtaMod = ""; + } } } \ No newline at end of file diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj index 002f6989..1eeb772f 100644 --- a/MP.INVE/MP.INVE.csproj +++ b/MP.INVE/MP.INVE.csproj @@ -5,7 +5,7 @@ enable enable MP.INVE - 6.16.2211.2813 + 6.16.2211.2815 diff --git a/MP.INVE/Pages/Acquisizione.razor b/MP.INVE/Pages/Acquisizione.razor index 672f34fa..7d5ced7c 100644 --- a/MP.INVE/Pages/Acquisizione.razor +++ b/MP.INVE/Pages/Acquisizione.razor @@ -2,27 +2,9 @@ -
-
-

Acquisizione

-
-
-
-
- -
-
-
-
-
- @if (lastScan != null) - { -
- last scan: @($"{lastScan:yyyy.MM.dd HH:mm:ss}") -
- } -
- - -
+
+

Acquisizione

+
+
+
diff --git a/MP.INVE/Pages/_Layout.cshtml b/MP.INVE/Pages/_Layout.cshtml index 967701ec..3059250f 100644 --- a/MP.INVE/Pages/_Layout.cshtml +++ b/MP.INVE/Pages/_Layout.cshtml @@ -63,5 +63,6 @@ + diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html index c88a5e53..1646c9be 100644 --- a/MP.INVE/Resources/ChangeLog.html +++ b/MP.INVE/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOINVE -

Versione: 6.16.2211.2813

+

Versione: 6.16.2211.2815


Note di rilascio:
  • diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt index 76265c4d..45da9bb2 100644 --- a/MP.INVE/Resources/VersNum.txt +++ b/MP.INVE/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2813 +6.16.2211.2815 diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml index a6886372..29fb6552 100644 --- a/MP.INVE/Resources/manifest.xml +++ b/MP.INVE/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2813 + 6.16.2211.2815 https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html false diff --git a/MP.INVE/Shared/MainLayout.razor b/MP.INVE/Shared/MainLayout.razor index 711fe2e5..571e9a33 100644 --- a/MP.INVE/Shared/MainLayout.razor +++ b/MP.INVE/Shared/MainLayout.razor @@ -6,24 +6,16 @@
    - @if ((Height != 480) && (Width != 320)) - { - - } +
    - @if ((Height != 480) && (Width != 320)) - { - - } +
    - @if(!NavManager.Uri.Contains("OperatoreLogin")) - { - @Body - } + @*@remoteUserAgent*@ + @Body
    diff --git a/MP.INVE/Shared/MainLayout.razor.cs b/MP.INVE/Shared/MainLayout.razor.cs index ad97c87b..9a69535c 100644 --- a/MP.INVE/Shared/MainLayout.razor.cs +++ b/MP.INVE/Shared/MainLayout.razor.cs @@ -1,7 +1,10 @@ using Blazored.LocalStorage; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Components; +using Microsoft.EntityFrameworkCore.Metadata.Internal; using Microsoft.JSInterop; using MP.Data.DTO; +using System.Reflection; namespace MP.INVE.Shared { @@ -23,32 +26,10 @@ namespace MP.INVE.Shared #region Protected Methods - protected async Task getId() + protected string remoteUserAgent = "--"; + protected async Task getAgent() { - OperatoreDTO answ = new OperatoreDTO(); - answ = await localStorage.GetItemAsync("MatrOpr"); - if (!NavManager.Uri.Contains("Jumper")) - { - if (answ != null) - { - userName = $"{answ.Cognome} {answ.Nome} ({answ.MatrOpr})"; - if (NavManager.Uri.Contains("OperatoreLogin")) - { - NavManager.NavigateTo("ElencoMagazzini", true); - } - } - else - { - userName = "0"; - if (Height != 480 && Width != 320) - { - if (!NavManager.Uri.Contains("OperatoreLogin")) - { - NavManager.NavigateTo("OperatoreLogin", true); - } - } - } - } + remoteUserAgent = await JSRuntime.InvokeAsync("getUserAgent"); } public int Height { get; set; } @@ -62,10 +43,12 @@ namespace MP.INVE.Shared protected override async Task OnInitializedAsync() { +#if false var dimension = await JSRuntime.InvokeAsync("getWindowDimensions"); Height = dimension.Height; - Width = dimension.Width; - await getId(); + Width = dimension.Width; +#endif + await getAgent(); } protected void UpdateNavDisplay() diff --git a/MP.INVE/wwwroot/css/site.css b/MP.INVE/wwwroot/css/site.css index affc1a73..f5eb885c 100644 --- a/MP.INVE/wwwroot/css/site.css +++ b/MP.INVE/wwwroot/css/site.css @@ -23,9 +23,9 @@ body { font-family: 'Roboto Condensed', sans-serif; } @media (max-width: 320px) { - .navbar-toggler { - display: none; - } + /*.navbar-toggler { + display: none; + }*/ } .compresser { display: none; @@ -60,6 +60,11 @@ a, .loginOperatore { box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px; } +.disabilita { + pointer-events: none; + color: #AAA; + background: #F5F5F5; +} .watermark { position: absolute; top: 250px; diff --git a/MP.INVE/wwwroot/css/site.less b/MP.INVE/wwwroot/css/site.less index 95727060..f7f8c966 100644 --- a/MP.INVE/wwwroot/css/site.less +++ b/MP.INVE/wwwroot/css/site.less @@ -17,9 +17,9 @@ html, body { @media(max-width: 320px) { - .navbar-toggler { + /*.navbar-toggler { display: none; - } + }*/ } .compresser { @@ -64,6 +64,12 @@ a, .btn-link { box-shadow: rgba(50, 50, 93, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px; } +.disabilita { + pointer-events: none; + color: #AAA; + background: #F5F5F5; +} + .watermark { position: absolute; top: 250px; diff --git a/MP.INVE/wwwroot/css/site.min.css b/MP.INVE/wwwroot/css/site.min.css index 2df0b148..b390175b 100644 --- a/MP.INVE/wwwroot/css/site.min.css +++ b/MP.INVE/wwwroot/css/site.min.css @@ -1 +1 @@ -@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');@import url('fonts.css');h1,h2,h3,h4,h5,h6,b,display-1,display-2,display-3,display-4{font-family:'Lato',sans-serif;}html,body{font-family:'Roboto',sans-serif;}.textConsensed{font-family:'Roboto Condensed',sans-serif;}@media(max-width:320px){.navbar-toggler{display:none;}}.compresser{display:none;}h1:focus{outline:none;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}.selBlock{background-color:#cff4fc;}.loginOperatore{box-shadow:rgba(50,50,93,.25) 0 50px 100px -20px,rgba(0,0,0,.3) 0 30px 60px -30px;}.watermark{position:absolute;top:250px;left:500px;opacity:.2;}.textTrim{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}.max5Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max10Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max20Char{white-space:nowrap;width:20rem;overflow:hidden;text-overflow:ellipsis;}.footer{line-height:1.8em;}.dcContainer{width:22rem;height:22rem;position:relative;}.dcBox{width:100%;height:100%;position:absolute;top:0;left:0;}.dcOverlay{z-index:9;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}.shortcuts{text-align:center;}.shortcuts .shortcut-icon{font-size:2rem;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:2rem/3 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:1rem/4 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:640px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}body{font-size:.8em;}}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5em;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:1rem/4 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}blue{color:#800080;background-color:#800080;}.dc_yellow{color:#ff0;background-color:#ff0;}.dc_gray{color:#808080;}.dc_red{color:#f00;}.dc_green{color:#008000;background-color:#008000;} \ No newline at end of file +@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');@import url('fonts.css');h1,h2,h3,h4,h5,h6,b,display-1,display-2,display-3,display-4{font-family:'Lato',sans-serif;}html,body{font-family:'Roboto',sans-serif;}.textConsensed{font-family:'Roboto Condensed',sans-serif;}.compresser{display:none;}h1:focus{outline:none;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}.selBlock{background-color:#cff4fc;}.loginOperatore{box-shadow:rgba(50,50,93,.25) 0 50px 100px -20px,rgba(0,0,0,.3) 0 30px 60px -30px;}.disabilita{pointer-events:none;color:#aaa;background:#f5f5f5;}.watermark{position:absolute;top:250px;left:500px;opacity:.2;}.textTrim{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}.max5Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max10Char{white-space:nowrap;width:10rem;overflow:hidden;text-overflow:ellipsis;}.max20Char{white-space:nowrap;width:20rem;overflow:hidden;text-overflow:ellipsis;}.footer{line-height:1.8em;}.dcContainer{width:22rem;height:22rem;position:relative;}.dcBox{width:100%;height:100%;position:absolute;top:0;left:0;}.dcOverlay{z-index:9;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}.shortcuts{text-align:center;}.shortcuts .shortcut-icon{font-size:2rem;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:2rem/3 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:1rem/4 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:640px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}body{font-size:.8em;}}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5em;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:1rem/4 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}blue{color:#800080;background-color:#800080;}.dc_yellow{color:#ff0;background-color:#ff0;}.dc_gray{color:#808080;}.dc_red{color:#f00;}.dc_green{color:#008000;background-color:#008000;} \ No newline at end of file diff --git a/MP.INVE/wwwroot/lib/UserAgent.js b/MP.INVE/wwwroot/lib/UserAgent.js new file mode 100644 index 00000000..6a1d89cf --- /dev/null +++ b/MP.INVE/wwwroot/lib/UserAgent.js @@ -0,0 +1,3 @@ +window.getUserAgent = () => { + return navigator.userAgent; +}; \ No newline at end of file From c67ba09ff35b5400870b5155635d6a8d8cdc9879 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 28 Nov 2022 17:40:00 +0100 Subject: [PATCH 12/25] fix PODL modifica e clona --- MP.Data/Controllers/MpSpecController.cs | 62 ++++++++++++++++++++----- MP.SPEC/Data/MpDataService.cs | 4 +- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 6 files changed, 58 insertions(+), 16 deletions(-) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 33b5ba9f..968f40e1 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -621,6 +621,7 @@ namespace MP.Data.Controllers return dbResult; } +#if false /// /// Elenco PODL non avviati filtrati x articolo, KeyRich (che contiene stato) @@ -643,7 +644,8 @@ namespace MP.Data.Controllers .ToList(); } return dbResult; - } + } +#endif /// /// Elenco valori ammessi x tabella/colonna @@ -954,22 +956,42 @@ namespace MP.Data.Controllers public async Task PODL_startSetup(PODLExpModel editRec, int matrOpr, double tcRich, int pzPallet, string note) { bool answ = false; + + PODLModel recPODL = new PODLModel() + { + IdxPromessa = editRec.IdxPromessa, + KeyRichiesta = editRec.KeyRichiesta, + KeyBCode = editRec.KeyBCode, + IdxOdl = editRec.IdxOdl, + CodArticolo = editRec.CodArticolo, + CodGruppo = editRec.CodGruppo, + IdxMacchina = editRec.IdxMacchina, + NumPezzi = editRec.NumPezzi, + Tcassegnato = editRec.Tcassegnato, + DueDate = editRec.DueDate, + Priorita = editRec.Priorita, + PzPallet = editRec.PzPallet, + Note = editRec.Note, + CodCli = editRec.CodCli, + InsertDate = editRec.InsertDate + }; + using (var dbCtx = new MoonProContext(_configuration)) { try { var currRec = dbCtx - .DbSetPODLExp + .DbSetPODL .AsNoTracking() - .Where(x => x.IdxPromessa == editRec.IdxPromessa) + .Where(x => x.IdxPromessa == recPODL.IdxPromessa) .FirstOrDefault(); if (currRec != null) { // eseguo stored attrezzaggio - var IdxPromessa = new SqlParameter("@idxPromessa", editRec.IdxPromessa); + var IdxPromessa = new SqlParameter("@idxPromessa", recPODL.IdxPromessa); var MatrOpr = new SqlParameter("@MatrOpr", matrOpr); - var IdxMacchina = new SqlParameter("@IdxMacchina", editRec.IdxMacchina); + var IdxMacchina = new SqlParameter("@IdxMacchina", recPODL.IdxMacchina); var TCRichAttr = new SqlParameter("@TCRichAttr", tcRich); var PzPallet = new SqlParameter("@PzPallet", pzPallet); var Note = new SqlParameter("@Note", note); @@ -996,17 +1018,35 @@ namespace MP.Data.Controllers /// public async Task PODLDeleteRecord(PODLExpModel currRec) { + PODLModel recPODL = new PODLModel() + { + IdxPromessa = currRec.IdxPromessa, + KeyRichiesta = currRec.KeyRichiesta, + KeyBCode = currRec.KeyBCode, + IdxOdl = currRec.IdxOdl, + CodArticolo = currRec.CodArticolo, + CodGruppo = currRec.CodGruppo, + IdxMacchina = currRec.IdxMacchina, + NumPezzi = currRec.NumPezzi, + Tcassegnato = currRec.Tcassegnato, + DueDate = currRec.DueDate, + Priorita = currRec.Priorita, + PzPallet = currRec.PzPallet, + Note = currRec.Note, + CodCli = currRec.CodCli, + InsertDate = currRec.InsertDate + }; bool fatto = false; using (var dbCtx = new MoonProContext(_configuration)) { try { var currVal = dbCtx - .DbSetPODLExp - .Where(x => x.IdxPromessa == currRec.IdxPromessa) + .DbSetPODL + .Where(x => x.IdxPromessa == recPODL.IdxPromessa) .FirstOrDefault(); dbCtx - .DbSetPODLExp + .DbSetPODL .Remove(currVal); await dbCtx.SaveChangesAsync(); fatto = true; @@ -1032,7 +1072,7 @@ namespace MP.Data.Controllers try { var currRec = dbCtx - .DbSetPODLExp + .DbSetPODL .Where(x => x.IdxPromessa == editRec.IdxPromessa) .FirstOrDefault(); if (currRec != null) @@ -1051,8 +1091,8 @@ namespace MP.Data.Controllers else { dbCtx - .DbSetPODLExp - .Add(editRec); + .DbSetPODL + .Add(currRec); } await dbCtx.SaveChangesAsync(); fatto = true; diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index af80d0d3..a8a89dc6 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -733,6 +733,7 @@ namespace MP.SPEC.Data return result; } +#if false /// /// Elenco PODL avviati filtrati x articolo, KeyRich (che contiene stato) @@ -769,7 +770,8 @@ namespace MP.SPEC.Data TimeSpan ts = stopWatch.Elapsed; Log.Debug($"ListPODLFiltNOOdl | Read from {readType}: {ts.TotalMilliseconds}ms"); return result; - } + } +#endif /// /// Elenco di tutte le macchine gestite diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 611a81ea..fe0bf660 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2211.2809 + 6.16.2211.2817 diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index b2bb0afc..999d97cd 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

    Versione: 6.16.2211.2809

    +

    Versione: 6.16.2211.2817


    Note di rilascio:
    • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 2b8343ef..2ecd71f2 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2809 +6.16.2211.2817 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 0cd691b5..2ef22785 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2809 + 6.16.2211.2817 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false From b5ed1571064aafb6d9bfc5c8eb695d3dc6ba4e6e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 28 Nov 2022 18:30:06 +0100 Subject: [PATCH 13/25] PODL: - Fix ordinamento su DB --- MP.Data/Controllers/MpSpecController.cs | 4 +- MP.Data/Utils.cs | 65 ++++++++++++++++++++++++- MP.SPEC/Components/ListPODL.razor.cs | 24 +-------- MP.SPEC/Data/MpDataService.cs | 37 +++++++++----- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/PODL.razor.cs | 13 ++--- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 9 files changed, 102 insertions(+), 49 deletions(-) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 968f40e1..d9dc302b 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -1064,7 +1064,7 @@ namespace MP.Data.Controllers ///
    /// /// - public async Task PODLUpdateRecord(PODLExpModel editRec) + public async Task PODLUpdateRecord(PODLModel editRec) { bool fatto = false; using (var dbCtx = new MoonProContext(_configuration)) @@ -1092,7 +1092,7 @@ namespace MP.Data.Controllers { dbCtx .DbSetPODL - .Add(currRec); + .Add(editRec); } await dbCtx.SaveChangesAsync(); fatto = true; diff --git a/MP.Data/Utils.cs b/MP.Data/Utils.cs index f7f548cd..c52fc80b 100644 --- a/MP.Data/Utils.cs +++ b/MP.Data/Utils.cs @@ -1,5 +1,6 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; +using MP.Data.DatabaseModels; using MP.Data.DTO; using System; using System.Collections.Generic; @@ -13,7 +14,7 @@ namespace MP.Data public class Utils { #region Public Properties - + public static string redKeyArtUsed { @@ -109,6 +110,68 @@ namespace MP.Data return answ; } + public class POdlExt + { + /// + /// Clona un POdleExt a POdl + /// + /// + /// + public static PODLModel convertToPOdl(PODLExpModel selRec) + { + // creo record duplicato... + PODLModel newRec = new PODLModel() + { + Attivabile = selRec.Attivabile, + CodArticolo = selRec.CodArticolo, + CodCli = selRec.CodCli, + CodGruppo = selRec.CodGruppo, + DueDate = selRec.DueDate, + IdxMacchina = selRec.IdxMacchina, + IdxOdl = selRec.IdxOdl, + IdxPromessa = 0, + InsertDate = selRec.InsertDate, + KeyBCode = selRec.KeyBCode, + KeyRichiesta = selRec.KeyRichiesta, + Note = selRec.Note, + NumPezzi = selRec.NumPezzi, + Priorita = selRec.Priorita, + PzPallet = selRec.PzPallet, + Tcassegnato = selRec.Tcassegnato + }; + return newRec; + } + /// + /// Clona un POdleExt + /// + /// + /// + public static PODLExpModel clone(PODLExpModel selRec) + { + // creo record duplicato... + PODLExpModel newRec = new PODLExpModel() + { + Attivabile = selRec.Attivabile, + CodArticolo = selRec.CodArticolo, + CodCli = selRec.CodCli, + CodGruppo = selRec.CodGruppo, + DueDate = selRec.DueDate, + IdxMacchina = selRec.IdxMacchina, + IdxOdl = selRec.IdxOdl, + IdxPromessa = 0, + InsertDate = selRec.InsertDate, + KeyBCode = selRec.KeyBCode, + KeyRichiesta = selRec.KeyRichiesta, + Note = $"DUPLICATED - {selRec.Note}", + NumPezzi = selRec.NumPezzi, + Priorita = selRec.Priorita, + PzPallet = selRec.PzPallet, + Tcassegnato = selRec.Tcassegnato + }; + return newRec; + } + } + #endregion Public Methods } } \ No newline at end of file diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 73730092..5ee60510 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; +using MP.Data; using MP.Data.DatabaseModels; using MP.SPEC.Data; using MP.SPEC.Services; @@ -76,28 +77,7 @@ namespace MP.SPEC.Components protected async Task cloneRecord(PODLExpModel selRec) { - // creo record duplicato... - PODLExpModel newRec = new PODLExpModel() - { - Attivabile = selRec.Attivabile, - CodArticolo = selRec.CodArticolo, - CodCli = selRec.CodCli, - CodGruppo = selRec.CodGruppo, - DueDate = selRec.DueDate, - IdxMacchina = selRec.IdxMacchina, - IdxOdl = selRec.IdxOdl, - IdxPromessa = 0, - InsertDate = selRec.InsertDate, - KeyBCode = selRec.KeyBCode, - KeyRichiesta = selRec.KeyRichiesta, - Note = $"DUPLICATED - {selRec.Note}", - NumPezzi = selRec.NumPezzi, - Priorita = selRec.Priorita, - PzPallet = selRec.PzPallet, - Tcassegnato = selRec.Tcassegnato - }; - currRecord = selRec; - await RecordSel.InvokeAsync(newRec); + await RecordSel.InvokeAsync(Utils.POdlExt.clone(selRec)); } /// diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index a8a89dc6..e9357190 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -708,7 +708,7 @@ namespace MP.SPEC.Data Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); string readType = "DB"; - string currKey = $"{redisPOdlList}:{lanciato}:{keyRichPart}:{idxMacchina}:{codGruppo}"; + string currKey = $"{redisPOdlList}:{codGruppo}:{idxMacchina}:{keyRichPart}:{lanciato}"; // cerco in redis dato valore sel macchina... RedisValue rawData = redisDb.StringGet(currKey); if (rawData.HasValue) @@ -1064,7 +1064,12 @@ namespace MP.SPEC.Data /// public async Task PODLDeleteRecord(PODLExpModel currRec) { - return await dbController.PODLDeleteRecord(currRec); + var dbResult = await dbController.PODLDeleteRecord(currRec); + // elimino cache redis... + RedisValue pattern = new RedisValue($"{redisXdlData}:*"); + bool answ = await ExecFlushRedisPattern(pattern); + await Task.Delay(1); + return dbResult; } /// @@ -1074,7 +1079,12 @@ namespace MP.SPEC.Data /// public async Task POdlDoSetup(PODLExpModel currRec) { - return await dbController.PODL_startSetup(currRec, 0, 1, 1, ""); + var dbResult = await dbController.PODL_startSetup(currRec, 0, 1, 1, ""); + // elimino cache redis... + RedisValue pattern = new RedisValue($"{redisXdlData}:*"); + bool answ = await ExecFlushRedisPattern(pattern); + await Task.Delay(1); + return dbResult; } /// @@ -1082,13 +1092,13 @@ namespace MP.SPEC.Data /// /// /// - public async Task POdlUpdateRecord(PODLExpModel currRec) + public async Task POdlUpdateRecord(PODLModel currRec) { var dbResult = await dbController.PODLUpdateRecord(currRec); // elimino cache redis... - RedisValue pattern = new RedisValue($"{redisPOdlList}:*"); + RedisValue pattern = new RedisValue($"{redisXdlData}:*"); bool answ = await ExecFlushRedisPattern(pattern); - + await Task.Delay(1); return dbResult; } @@ -1243,13 +1253,16 @@ namespace MP.SPEC.Data private const string redisMacList = redisBaseAddr + "SPEC:Cache:MacList"; - private const string redisOdlCurrByMac = redisBaseAddr + "SPEC:Cache:OdlByMac"; - private const string redisOdlList = redisBaseAddr + "SPEC:Cache:OdlList"; - private const string redisPOdlByOdl = redisBaseAddr + "SPEC:Cache:POdlByOdl"; - private const string redisPOdlByPOdl = redisBaseAddr + "SPEC:Cache:POdlByPOdl"; - private const string redisPOdlList = redisBaseAddr + "SPEC:Cache:POdlList"; - private const string redisPOdlListNOOdl = redisBaseAddr + "SPEC:Cache:POdlListNOOdl"; + private const string redisXdlData = redisBaseAddr + "SPEC:Cache:XDL"; + + private const string redisOdlCurrByMac = redisXdlData + ":OdlByMac"; + private const string redisOdlList = redisXdlData + ":OdlList"; + + private const string redisPOdlByOdl = redisXdlData + ":POdlByOdl"; + private const string redisPOdlByPOdl = redisXdlData + ":POdlByPOdl"; + private const string redisPOdlList = redisXdlData + ":POdlList"; + private const string redisPOdlListNOOdl = redisXdlData + ":POdlListNOOdl"; private const string redisStatoCom = redisBaseAddr + "SPEC:Cache:StatoCom"; private const string redisTipoArt = redisBaseAddr + "SPEC:Cache:TipoArt"; diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index fe0bf660..061dadf4 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2211.2817 + 6.16.2211.2818 diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 6f1b20e6..92b1d249 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -182,14 +182,11 @@ namespace MP.SPEC.Pages if (!await JSRuntime.InvokeAsync("confirm", "Confermi di voler salvare le modifiche?")) return; await Task.Delay(1); - var done = await MDService.POdlUpdateRecord(selRec); - await callSyncDb(selRec); + var clonedRec = MP.Data.Utils.POdlExt.convertToPOdl(selRec); + var done = await MDService.POdlUpdateRecord(clonedRec); + await callSyncDb(clonedRec); currRecord = null; - await reloadData(); - // forzo update parametri - await Task.Delay(1); - currFase = "*"; - await Task.Delay(1); + NavManager.NavigateTo(NavManager.Uri, true); } protected void UpdateTotCount(int newTotCount) @@ -359,7 +356,7 @@ namespace MP.SPEC.Pages /// /// /// - private async Task callSyncDb(PODLExpModel selRec) + private async Task callSyncDb(PODLModel selRec) { // chiamo aggiunta task SyncDb... string idxMacc = selRec.IdxMacchina; diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 999d97cd..6835ff4b 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

    Versione: 6.16.2211.2817

    +

    Versione: 6.16.2211.2818


    Note di rilascio:
    • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 2ecd71f2..80b0949d 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2817 +6.16.2211.2818 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 2ef22785..12a66a71 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2817 + 6.16.2211.2818 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false From a1588014303d837b0d6ad02effa3c84d58c2e5f4 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 29 Nov 2022 09:20:22 +0100 Subject: [PATCH 14/25] aggiunta filtri attivi notificati --- MP.SPEC/Pages/ODL.razor | 204 +++++++++++++++++++------------------ MP.SPEC/Pages/ODL.razor.cs | 7 +- 2 files changed, 110 insertions(+), 101 deletions(-) diff --git a/MP.SPEC/Pages/ODL.razor b/MP.SPEC/Pages/ODL.razor index 406a3ea0..bfb97518 100644 --- a/MP.SPEC/Pages/ODL.razor +++ b/MP.SPEC/Pages/ODL.razor @@ -8,7 +8,7 @@

      ODL

    -
    +
    Completati @@ -19,115 +19,121 @@
    -
    +
    - @if (filtActive) - { -
    - @**@ + @if (filtActive) + { +
    + @**@ + @if (selReparto != "*") + { + + } @if (selMacchina != "*") - { + { - } - @if (selStato != "*") - { + } + @if (selStato != "*") + { - } + } +
    + } + @selDtStart   + @selDtEnd   +
    + + +
    - } -
    - - -
    -
    @*
    -
    -

    FILTRI

    - -
    -
    -
    -
    - Seleziona i filtri per: -
    -
    -
    +
    +

    FILTRI

    + +
    +
    +
    +
    + Seleziona i filtri per: +
    +
    +
    -
    - -
    -
    - - -
    -
    -
    +
    + +
    +
    + + +
    +
    +
    -
    - -
    -
    - - -
    -
    -
    +
    + +
    +
    + + +
    +
    +
    -
    - -
    -
    - - -
    -
    - @if (!isActive) - { -
    - -
    -
    - - -
    -
    - -
    -
    - - -
    - } -
    +
    + +
    +
    + + +
    +
    + @if (!isActive) + { +
    + +
    +
    + + +
    +
    + +
    +
    + + +
    + } +
    *@
    diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs index 929351a5..5a4ee2de 100644 --- a/MP.SPEC/Pages/ODL.razor.cs +++ b/MP.SPEC/Pages/ODL.razor.cs @@ -136,7 +136,10 @@ namespace MP.SPEC.Pages { selMacchina = "*"; } - + protected void resetReparto() + { + selReparto = "*"; + } protected void setDtMax() { // copio il filtro @@ -170,7 +173,7 @@ namespace MP.SPEC.Pages private bool filtActive { - get => selMacchina != "*" || selStato != "*"; + get => selMacchina != "*" || selStato != "*" || selReparto != "*"; } private bool isLoading { get; set; } = false; From 5baa3cfbc4dab29468d5db3a76911b450953d9b6 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 29 Nov 2022 09:20:51 +0100 Subject: [PATCH 15/25] refresh versioni --- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index 6835ff4b..b3a9c38b 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

    Versione: 6.16.2211.2818

    +

    Versione: 6.16.2211.2908


    Note di rilascio:
    • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 80b0949d..b1afe6a1 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2818 +6.16.2211.2908 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 12a66a71..969aadea 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2818 + 6.16.2211.2908 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false From d4d7854d4e7fda11ab078b3edc8b93583ac9beea Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 29 Nov 2022 09:21:00 +0100 Subject: [PATCH 16/25] altro refresh --- MP.SPEC/MP.SPEC.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 061dadf4..ecdd0715 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2211.2818 + 6.16.2211.2908 From 443737196c54a11a7ea3df502e833de00f65ea73 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 29 Nov 2022 10:06:26 +0100 Subject: [PATCH 17/25] inizio aggiunta mostra filtri + filtro x data funzionante --- MP.Data/Controllers/MpSpecController.cs | 6 +- MP.SPEC/Components/ListPODL.razor.cs | 27 +++++++- MP.SPEC/Data/MpDataService.cs | 8 ++- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/ODL.razor.cs | 8 ++- MP.SPEC/Pages/PODL.razor | 87 ++++++++++++------------- MP.SPEC/Pages/PODL.razor.cs | 47 ++++++++++++- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 10 files changed, 132 insertions(+), 59 deletions(-) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index d9dc302b..04a91d61 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -600,7 +600,7 @@ namespace MP.Data.Controllers /// Macchina /// Gruppo /// - public List ListPODLFilt(bool lanciato, string keyRichPart, string idxMacchina, string codGruppo) + public List ListPODLFilt(bool lanciato, string keyRichPart, string idxMacchina, string codGruppo, DateTime startDate, DateTime endDate) { List dbResult = new List(); @@ -610,10 +610,12 @@ namespace MP.Data.Controllers var KeyRich = new SqlParameter("@KeyRich", keyRichPart); var IdxMacc = new SqlParameter("@IdxMacchina", idxMacchina); var CodGrp = new SqlParameter("@CodGruppo", codGruppo); + var DateFrom = new SqlParameter("@DateFrom", startDate); + var DateTo = new SqlParameter("@DateTo", endDate); dbResult = dbCtx .DbSetPODLExp - .FromSqlRaw("EXEC stp_PODL_getByFiltSpec @Lanciato, @KeyRich, @CodGruppo, @IdxMacchina", Lanc, KeyRich, CodGrp, IdxMacc) + .FromSqlRaw("EXEC stp_PODL_getByFiltSpec @Lanciato, @KeyRich, @CodGruppo, @IdxMacchina, @DateFrom, @DateFrom", Lanc, KeyRich, CodGrp, IdxMacc, DateFrom, DateTo) .AsNoTracking() //.AsEnumerable() .ToList(); diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 5ee60510..61b074d0 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -221,6 +221,31 @@ namespace MP.SPEC.Components #region Private Properties + + private DateTime selDtStart + { + get => actFilter.DtStart; + set + { + if (!actFilter.DtStart.Equals(value)) + { + actFilter.DtStart = value; + currPage = 1; + } + } + } + private DateTime selDtEnd + { + get => actFilter.DtEnd; + set + { + if (!actFilter.DtEnd.Equals(value)) + { + actFilter.DtEnd = value; + currPage = 1; + } + } + } private int _totalCount { get; set; } = 0; private int currPage @@ -393,7 +418,7 @@ namespace MP.SPEC.Components { ListRecords = null; isLoading = true; - SearchRecords = await MDService.ListPODLFilt(hasOdl, StatoSel, macchina, reparto); + SearchRecords = await MDService.ListPODLFilt(hasOdl, StatoSel, macchina, reparto, selDtStart, selDtEnd); totalCount = SearchRecords.Count; ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); await Task.Delay(1); diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index e9357190..9fcf22f3 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -701,14 +701,16 @@ namespace MP.SPEC.Data /// KeyRich (parziale) da cercare (es cod stato x yacht) /// Macchina /// Gruppo + /// Data inizio + /// Data fine /// - public async Task> ListPODLFilt(bool lanciato, string keyRichPart, string idxMacchina, string codGruppo) + public async Task> ListPODLFilt(bool lanciato, string keyRichPart, string idxMacchina, string codGruppo, DateTime startDate, DateTime endDate) { List? result = new List(); Stopwatch stopWatch = new Stopwatch(); stopWatch.Start(); string readType = "DB"; - string currKey = $"{redisPOdlList}:{codGruppo}:{idxMacchina}:{keyRichPart}:{lanciato}"; + string currKey = $"{redisPOdlList}:{codGruppo}:{idxMacchina}:{keyRichPart}:{lanciato}:{startDate:yyyyMMdd_HHmmss}:{endDate:yyyyMMdd_HHmmss}"; // cerco in redis dato valore sel macchina... RedisValue rawData = redisDb.StringGet(currKey); if (rawData.HasValue) @@ -718,7 +720,7 @@ namespace MP.SPEC.Data } else { - result = await Task.FromResult(dbController.ListPODLFilt(lanciato, keyRichPart, idxMacchina, codGruppo)); + result = await Task.FromResult(dbController.ListPODLFilt(lanciato, keyRichPart, idxMacchina, codGruppo, startDate, endDate)); // serializzo e salvo... rawData = JsonConvert.SerializeObject(result); redisDb.StringSet(currKey, rawData, TimeSpan.FromSeconds(redisShortTimeCache)); diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index ecdd0715..fe3ed6c3 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2211.2908 + 6.16.2211.2910 diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs index 5a4ee2de..fb11ee4f 100644 --- a/MP.SPEC/Pages/ODL.razor.cs +++ b/MP.SPEC/Pages/ODL.razor.cs @@ -142,9 +142,11 @@ namespace MP.SPEC.Pages } protected void setDtMax() { - // copio il filtro - currFilter.DtEnd = RoundDatetime(5); - currFilter.DtStart = RoundDatetime(5).AddDays(-10); + if (currFilter.HasOdl == true) + { + currFilter.DtEnd = RoundDatetime(5); + currFilter.DtStart = RoundDatetime(5).AddDays(-10); + } } protected void UpdateTotCount(int newTotCount) diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index c9a05e53..196b07e5 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -3,57 +3,54 @@
      -
      -
      -
      -
      -

      Promesse ODL

      -
      -
      -
      -
      - Da Produrre -
      - -
      - Lanciati -
      +
      +
      +

      Promesse ODL

      +
      +
      +
      +
      + Da Produrre +
      +
      - + Lanciati
      -
      - @if (addEnabled) + @if (addEnabled) + { + + } +
      + + @*
      + +
      *@ +
      +
      + @if (filtActive) + { +
      + @**@ + @if (selReparto != "*") { - + + } + @if (macchina != "*") + { + + } + @if (StatoSel != "*") + { + }
      -
      -
      -
      + } + @if (hasOdl) + { + @selDtStart   + @selDtEnd   + }
      - @* - *@ - @* - *@ - @**@
      diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 92b1d249..4b106ce5 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -60,6 +60,20 @@ namespace MP.SPEC.Pages await Task.Delay(1); } + protected void resetFase() + { + StatoSel = "*"; + } + + protected void resetMacchina() + { + macchina = "*"; + } + protected void resetReparto() + { + selReparto = "*"; + } + protected void ForceReload(int newNum) { numRecord = newNum; @@ -96,7 +110,7 @@ namespace MP.SPEC.Pages } ListMacchine = await MDService.MacchineGetAll(); ListStati = await MDService.AnagStatiComm(); - SearchRecords = await MDService.ListPODLFilt(hasOdl, StatoSel, macchina, selReparto); + //SearchRecords = await MDService.ListPODLFilt(hasOdl, StatoSel, macchina, selReparto, selDtStart, selDtEnd); currAzienda = await MDService.tryGetConfig("AZIENDA"); padCodXdl = await MDService.tryGetConfig("padCodXdl"); // carico dati @@ -189,6 +203,8 @@ namespace MP.SPEC.Pages NavManager.NavigateTo(NavManager.Uri, true); } + + protected void UpdateTotCount(int newTotCount) { totalCount = newTotCount; @@ -282,6 +298,30 @@ namespace MP.SPEC.Pages } } } + private DateTime selDtStart + { + get => currFilter.DtStart; + set + { + if (!currFilter.DtStart.Equals(value)) + { + currFilter.DtStart = value; + currPage = 1; + } + } + } + private DateTime selDtEnd + { + get => currFilter.DtEnd; + set + { + if (!currFilter.DtEnd.Equals(value)) + { + currFilter.DtEnd = value; + currPage = 1; + } + } + } private SelectXdlParams currFilter { get; set; } = new SelectXdlParams(); @@ -347,6 +387,11 @@ namespace MP.SPEC.Pages set => currFilter.TotCount = value; } + private bool filtActive + { + get => macchina != "*" || StatoSel != "*" || selReparto != "*"; + } + #endregion Private Properties #region Private Methods diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index b3a9c38b..8936904e 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

      Versione: 6.16.2211.2908

      +

      Versione: 6.16.2211.2910


      Note di rilascio:
      • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index b1afe6a1..56715376 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2908 +6.16.2211.2910 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index 969aadea..f4c4f84c 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2908 + 6.16.2211.2910 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false From 41b080afcf60cbaaa2e138edd592c92c2c772d82 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 29 Nov 2022 11:05:54 +0100 Subject: [PATCH 18/25] fine mostra filtri attivi --- MP.Data/Controllers/MpSpecController.cs | 2 +- MP.SPEC/Data/SelectXdlParams.cs | 2 +- MP.SPEC/Pages/ODL.razor | 87 ----------------------- MP.SPEC/Pages/PODL.razor | 91 ++++++++++++++++--------- 4 files changed, 62 insertions(+), 120 deletions(-) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 04a91d61..055522b3 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -615,7 +615,7 @@ namespace MP.Data.Controllers dbResult = dbCtx .DbSetPODLExp - .FromSqlRaw("EXEC stp_PODL_getByFiltSpec @Lanciato, @KeyRich, @CodGruppo, @IdxMacchina, @DateFrom, @DateFrom", Lanc, KeyRich, CodGrp, IdxMacc, DateFrom, DateTo) + .FromSqlRaw("EXEC stp_PODL_getByFiltSpec @Lanciato, @KeyRich, @CodGruppo, @IdxMacchina, @DateFrom, @DateTo", Lanc, KeyRich, CodGrp, IdxMacc, DateFrom, DateTo) .AsNoTracking() //.AsEnumerable() .ToList(); diff --git a/MP.SPEC/Data/SelectXdlParams.cs b/MP.SPEC/Data/SelectXdlParams.cs index e52e1b14..a5bd2d66 100644 --- a/MP.SPEC/Data/SelectXdlParams.cs +++ b/MP.SPEC/Data/SelectXdlParams.cs @@ -17,7 +17,7 @@ namespace MP.SPEC.Data public string CodReparto { get; set; } = "*"; public int CurrPage { get; set; } = 1; public DateTime DtEnd { get; set; } = Utils.InitDatetime(DateTime.Now, 5); - public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 5).AddDays(-10); + public DateTime DtStart { get; set; } = Utils.InitDatetime(DateTime.Now, 5).AddMonths(-2); public bool HasOdl { get; set; } = false; public string IdxMacchina { get; set; } = "*"; public bool IsActive { get; set; } = true; diff --git a/MP.SPEC/Pages/ODL.razor b/MP.SPEC/Pages/ODL.razor index bfb97518..e1a03bdb 100644 --- a/MP.SPEC/Pages/ODL.razor +++ b/MP.SPEC/Pages/ODL.razor @@ -48,93 +48,6 @@
      - @*
      -
      -

      FILTRI

      - -
      -
      -
      -
      - Seleziona i filtri per: -
      -
      -
      - -
      - -
      -
      - - -
      -
      -
      - -
      - -
      -
      - - -
      -
      -
      - -
      - -
      -
      - - -
      -
      - @if (!isActive) - { -
      - -
      -
      - - -
      -
      - -
      -
      - - -
      - } -
      -
      *@
      diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index 196b07e5..e1726226 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -21,45 +21,74 @@ }
      - - @*
      - -
      *@
      -
      - @if (filtActive) - { -
      - @**@ - @if (selReparto != "*") - { - - } - @if (macchina != "*") - { - - } - @if (StatoSel != "*") - { - - } -
      - } - @if (hasOdl) - { - @selDtStart   - @selDtEnd   - } -
      - -
      +
      +
      + @if (filtActive) + { +
      + @**@ + @if (selReparto != "*") + { + + } + @if (macchina != "*") + { + + } + @if (StatoSel != "*") + { + + } +
      + } + @if (hasOdl) + { + @selDtStart   + @selDtEnd   + } +
      +
      + @*@if (filtActive) + { +
      + @* + @if (selReparto != "*") + { + + } + @if (macchina != "*") + { + + } + @if (StatoSel != "*") + { + + } +
      + } + @if (hasOdl) + { + @selDtStart   + @selDtEnd   + } + +
      + + + +
      +
      +
      +
      *@ +
      @if (currRecord != null) { From a07c9488e6a01cf136f5111c7df8c0b1b92988f1 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 29 Nov 2022 11:54:42 +0100 Subject: [PATCH 19/25] aggiornamento filtri + modifiche grafiche --- MP.SPEC/Components/ListPODL.razor.cs | 9 +++++ MP.SPEC/Data/SelectXdlParams.cs | 4 ++ MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/PODL.razor | 59 ++++++++-------------------- MP.SPEC/Pages/PODL.razor.cs | 30 ++++++++------ MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 8 files changed, 51 insertions(+), 59 deletions(-) diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 61b074d0..d2ef2f67 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -77,7 +77,10 @@ namespace MP.SPEC.Components protected async Task cloneRecord(PODLExpModel selRec) { + currRecord = null; + currRecord = selRec; await RecordSel.InvokeAsync(Utils.POdlExt.clone(selRec)); + header = "Nuovo PODL"; } /// @@ -137,6 +140,7 @@ namespace MP.SPEC.Components protected async Task selRecord(PODLExpModel? selRec) { currRecord = selRec; + header = "Modifica PODL"; await RecordSel.InvokeAsync(selRec); } @@ -379,6 +383,11 @@ namespace MP.SPEC.Components answ = !odlCurrList.Contains(idxMacchina); return answ; } + protected string header + { + get => actFilter.Header; + set => actFilter.Header = value; + } /// /// processa evento richiesto diff --git a/MP.SPEC/Data/SelectXdlParams.cs b/MP.SPEC/Data/SelectXdlParams.cs index a5bd2d66..e91ae7c9 100644 --- a/MP.SPEC/Data/SelectXdlParams.cs +++ b/MP.SPEC/Data/SelectXdlParams.cs @@ -24,6 +24,7 @@ namespace MP.SPEC.Data public int MaxRecord { get; set; } = 100; public int NumRec { get; set; } = 10; public string SearchVal { get; set; } = "*"; + public string Header { get; set; } = ""; public int TotCount { get; set; } = 0; #endregion Public Properties @@ -45,6 +46,7 @@ namespace MP.SPEC.Data MaxRecord = this.MaxRecord, NumRec = this.NumRec, SearchVal = this.SearchVal, + Header = this.Header, TotCount = this.TotCount }; return clonedData; @@ -87,6 +89,8 @@ namespace MP.SPEC.Data if (SearchVal != item.SearchVal) return false; + if (Header != item.Header) + return false; if (TotCount != item.TotCount) return false; diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index fe3ed6c3..663173fe 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2211.2910 + 6.16.2211.2911 diff --git a/MP.SPEC/Pages/PODL.razor b/MP.SPEC/Pages/PODL.razor index e1726226..7a9d707d 100644 --- a/MP.SPEC/Pages/PODL.razor +++ b/MP.SPEC/Pages/PODL.razor @@ -55,47 +55,13 @@
      - - @*@if (filtActive) - { -
      - @* - @if (selReparto != "*") - { - - } - @if (macchina != "*") - { - - } - @if (StatoSel != "*") - { - - } -
      - } - @if (hasOdl) - { - @selDtStart   - @selDtEnd   - } - -
      - - - -
      -
      -
      -
      *@ -
      @if (currRecord != null) {
      -
      Modifica PODL
      +
      @header
      @@ -112,7 +78,7 @@