From 015903f899fd3024aac3a271fc36462cc9b3be02 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 15 Dec 2023 15:21:40 +0100 Subject: [PATCH] DoppiaTavola: - ok ma va riattrezzata la seconda... --- MP-TAB-SERV/Components/OdlMan.razor.cs | 24 ++++++++++++++++-------- MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/MP-TAB-SERV/Components/OdlMan.razor.cs b/MP-TAB-SERV/Components/OdlMan.razor.cs index 67dc94fa..a16de7cf 100644 --- a/MP-TAB-SERV/Components/OdlMan.razor.cs +++ b/MP-TAB-SERV/Components/OdlMan.razor.cs @@ -1186,14 +1186,18 @@ namespace MP_TAB_SERV.Components { } // ora verifico SE E SOLO SE è ANCORA in attrezzaggio +#if false if (inAttr) + { +#endif + // ora verifico SE ALTRA TAVOLA ha ODL... + if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso) { - // ora verifico SE ALTRA TAVOLA ha ODL... - if (dtChiusura.AddMinutes(gPeriodReopenOdlTav) > adesso) - { - answ = showReopenOdlTav; - } + answ = showReopenOdlTav; } +#if false + } +#endif } } return answ; @@ -1221,11 +1225,15 @@ namespace MP_TAB_SERV.Components // ora verifico SE ALTRA TAVOLA ha ODL... if (!emptyOdlAltraMacc) { +#if false // ora verifico SE E SOLO SE è ANCORA in attrezzaggio if (inAttr) - { - answ = showSplitOdlOnTav; - } + { +#endif + answ = showSplitOdlOnTav; +#if false + } +#endif } } } diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 75865b1f..930c8c60 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2312.1514 + 6.16.2312.1515 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index bb9afe0d..3607a83f 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2312.1514

+

Versione: 6.16.2312.1515


Note di rilascio: