From 7d48f67f02e3963a09da71112f1e45b67a2ad70c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 Feb 2025 09:09:39 +0100 Subject: [PATCH] update gestione PODL display ovunque --- MP-TAB3/Components/CurrOdlDetail.razor | 9 +- MP-TAB3/Components/MachineBlock.razor | 28 +- MP-TAB3/Components/MachineBlock.razor.cs | 5 + MP-TAB3/Components/OdlMan.razor | 8 +- MP-TAB3/Components/ProdConfirm.razor | 40 +- MP-TAB3/MP-TAB3.csproj | 8 +- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- MP-TAB3/libman.json | 4 +- MP-TAB3/wwwroot/css/font.css | 12 +- MP-TAB3/wwwroot/css/font.less | 36 +- MP-TAB3/wwwroot/css/font.min.css | 2 +- .../lib/bootstrap/css/bootstrap-grid.css | 4 +- .../lib/bootstrap/css/bootstrap-grid.css.map | 2 +- .../lib/bootstrap/css/bootstrap-grid.min.css | 4 +- .../bootstrap/css/bootstrap-grid.min.css.map | 2 +- .../lib/bootstrap/css/bootstrap-grid.rtl.css | 4 +- .../bootstrap/css/bootstrap-grid.rtl.css.map | 2 +- .../bootstrap/css/bootstrap-grid.rtl.min.css | 4 +- .../css/bootstrap-grid.rtl.min.css.map | 2 +- .../lib/bootstrap/css/bootstrap-reboot.css | 4 +- .../bootstrap/css/bootstrap-reboot.css.map | 2 +- .../bootstrap/css/bootstrap-reboot.min.css | 4 +- .../css/bootstrap-reboot.min.css.map | 2 +- .../bootstrap/css/bootstrap-reboot.rtl.css | 4 +- .../css/bootstrap-reboot.rtl.css.map | 2 +- .../css/bootstrap-reboot.rtl.min.css | 4 +- .../css/bootstrap-reboot.rtl.min.css.map | 2 +- .../lib/bootstrap/css/bootstrap-utilities.css | 4 +- .../bootstrap/css/bootstrap-utilities.css.map | 2 +- .../bootstrap/css/bootstrap-utilities.min.css | 4 +- .../css/bootstrap-utilities.min.css.map | 2 +- .../bootstrap/css/bootstrap-utilities.rtl.css | 4 +- .../css/bootstrap-utilities.rtl.css.map | 2 +- .../css/bootstrap-utilities.rtl.min.css | 4 +- .../css/bootstrap-utilities.rtl.min.css.map | 2 +- .../wwwroot/lib/bootstrap/css/bootstrap.css | 51 +- .../lib/bootstrap/css/bootstrap.css.map | 2 +- .../lib/bootstrap/css/bootstrap.min.css | 6 +- .../lib/bootstrap/css/bootstrap.min.css.map | 2 +- .../lib/bootstrap/css/bootstrap.rtl.css | 56 +- .../lib/bootstrap/css/bootstrap.rtl.css.map | 2 +- .../lib/bootstrap/css/bootstrap.rtl.min.css | 6 +- .../bootstrap/css/bootstrap.rtl.min.css.map | 2 +- .../lib/bootstrap/js/bootstrap.bundle.js | 16 +- .../lib/bootstrap/js/bootstrap.bundle.js.map | 2 +- .../lib/bootstrap/js/bootstrap.bundle.min.js | 6 +- .../bootstrap/js/bootstrap.bundle.min.js.map | 2 +- .../wwwroot/lib/bootstrap/js/bootstrap.esm.js | 16 +- .../lib/bootstrap/js/bootstrap.esm.js.map | 2 +- .../lib/bootstrap/js/bootstrap.esm.min.js | 6 +- .../lib/bootstrap/js/bootstrap.esm.min.js.map | 2 +- MP-TAB3/wwwroot/lib/bootstrap/js/bootstrap.js | 16 +- .../wwwroot/lib/bootstrap/js/bootstrap.js.map | 2 +- .../wwwroot/lib/bootstrap/js/bootstrap.min.js | 6 +- .../lib/bootstrap/js/bootstrap.min.js.map | 2 +- .../lib/bootstrap/scss/_accordion.scss | 22 +- .../wwwroot/lib/bootstrap/scss/_buttons.scss | 9 + .../wwwroot/lib/bootstrap/scss/_carousel.scss | 12 +- .../wwwroot/lib/bootstrap/scss/_modal.scss | 1 - .../lib/bootstrap/scss/_offcanvas.scss | 5 +- .../wwwroot/lib/bootstrap/scss/_tables.scss | 2 +- .../lib/bootstrap/scss/_variables.scss | 10 +- .../lib/bootstrap/scss/forms/_form-check.scss | 2 +- .../lib/bootstrap/scss/mixins/_banner.scss | 4 +- .../lib/bootstrap/scss/mixins/_forms.scss | 14 +- .../lib/bootstrap/scss/mixins/_grid.scss | 2 +- MP-TAB3/wwwroot/lib/font-awesome/css/all.css | 10297 ++++++++-------- .../wwwroot/lib/font-awesome/css/all.min.css | 10 +- .../wwwroot/lib/font-awesome/css/brands.css | 2100 ++-- .../lib/font-awesome/css/brands.min.css | 6 +- .../lib/font-awesome/css/fontawesome.css | 8201 ++++++------ .../lib/font-awesome/css/fontawesome.min.css | 8 +- .../wwwroot/lib/font-awesome/css/regular.css | 4 +- .../lib/font-awesome/css/regular.min.css | 4 +- .../wwwroot/lib/font-awesome/css/solid.css | 4 +- .../lib/font-awesome/css/solid.min.css | 4 +- .../lib/font-awesome/css/svg-with-js.css | 404 +- .../lib/font-awesome/css/svg-with-js.min.css | 6 +- .../lib/font-awesome/css/v4-font-face.css | 4 +- .../lib/font-awesome/css/v4-font-face.min.css | 4 +- .../wwwroot/lib/font-awesome/css/v4-shims.css | 1228 +- .../lib/font-awesome/css/v4-shims.min.css | 6 +- .../lib/font-awesome/css/v5-font-face.css | 4 +- .../lib/font-awesome/css/v5-font-face.min.css | 4 +- MP-TAB3/wwwroot/lib/font-awesome/js/all.js | 7098 +++++------ .../wwwroot/lib/font-awesome/js/all.min.js | 6 +- MP-TAB3/wwwroot/lib/font-awesome/js/brands.js | 576 +- .../wwwroot/lib/font-awesome/js/brands.min.js | 6 +- .../lib/font-awesome/js/conflict-detection.js | 872 +- .../font-awesome/js/conflict-detection.min.js | 6 +- .../lib/font-awesome/js/fontawesome.js | 2926 +++-- .../lib/font-awesome/js/fontawesome.min.js | 6 +- .../wwwroot/lib/font-awesome/js/regular.js | 731 +- .../lib/font-awesome/js/regular.min.js | 6 +- MP-TAB3/wwwroot/lib/font-awesome/js/solid.js | 2877 ++--- .../wwwroot/lib/font-awesome/js/solid.min.js | 6 +- .../wwwroot/lib/font-awesome/js/v4-shims.js | 449 +- .../lib/font-awesome/js/v4-shims.min.js | 6 +- .../lib/font-awesome/sprites/brands.svg | 221 +- .../lib/font-awesome/sprites/regular.svg | 266 +- .../lib/font-awesome/sprites/solid.svg | 2478 ++-- .../font-awesome/webfonts/fa-brands-400.ttf | Bin 189684 -> 210792 bytes .../font-awesome/webfonts/fa-brands-400.woff2 | Bin 109808 -> 118684 bytes .../font-awesome/webfonts/fa-regular-400.ttf | Bin 63348 -> 68064 bytes .../webfonts/fa-regular-400.woff2 | Bin 24488 -> 25472 bytes .../font-awesome/webfonts/fa-solid-900.ttf | Bin 394668 -> 426112 bytes .../font-awesome/webfonts/fa-solid-900.woff2 | Bin 150020 -> 158220 bytes .../webfonts/fa-v4compatibility.ttf | Bin 10172 -> 10836 bytes .../webfonts/fa-v4compatibility.woff2 | Bin 4568 -> 4796 bytes 111 files changed, 20860 insertions(+), 20492 deletions(-) diff --git a/MP-TAB3/Components/CurrOdlDetail.razor b/MP-TAB3/Components/CurrOdlDetail.razor index 89754756..c286b06d 100644 --- a/MP-TAB3/Components/CurrOdlDetail.razor +++ b/MP-TAB3/Components/CurrOdlDetail.razor @@ -78,7 +78,14 @@ Pezzi:
- @CurrPodl.NumPezzi.ToString("N0") + @if (!showPOdlData && CurrOdl!=null) + { + @CurrOdl.NumPezzi.ToString("N0") + } + else + { + @CurrPodl.NumPezzi.ToString("N0") + }
diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index f5c2c822..7f879fb3 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -189,14 +189,14 @@ else
- Cicli Prod. + Cicli Prod @* *@
@($"{RecMSE.PezziProd}")
- Conf Buoni + Buoni Vers @* *@
@@ -208,7 +208,7 @@ else {
- Conf Scarti + Scarti Vers
@($"- {datiProdAct.PzConfScarto}") @@ -219,7 +219,7 @@ else {
- Extra + Qta Extra @* *@
@($"{RecMSE.extraVal}")
@@ -255,8 +255,8 @@ else
-
-
+
+
@if (showPodl) { @@ -264,7 +264,7 @@ else } else { - + }
@@ -280,7 +280,7 @@ else
@if (enableDisegno) { -
+
@if (showDraw) { @@ -288,11 +288,19 @@ else } else { - + }
} + else + { +
+
+ +
+
+ }
} @@ -308,5 +316,5 @@ else } @if (showPodl && RecMSE != null) { - + } \ No newline at end of file diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs index 63e1c324..cfb945ab 100644 --- a/MP-TAB3/Components/MachineBlock.razor.cs +++ b/MP-TAB3/Components/MachineBlock.razor.cs @@ -340,6 +340,11 @@ namespace MP_TAB3.Components private bool showOdlDetail = false; private bool showPodl = false; + protected string isDisabled(bool testCond) + { + return testCond ? $"disabled" : ""; + } + #endregion Private Fields #region Private Properties diff --git a/MP-TAB3/Components/OdlMan.razor b/MP-TAB3/Components/OdlMan.razor index a0632a46..9cb46609 100644 --- a/MP-TAB3/Components/OdlMan.razor +++ b/MP-TAB3/Components/OdlMan.razor @@ -66,12 +66,12 @@
} - @if (!inAttr && !showOdlDetail) + @* @if (!inAttr && !showOdlDetail) {
- } + } *@ if (showOdlDetail || inAttr) { @@ -107,12 +107,12 @@
} - @if (!inAttr && !showOdlDetail) + @* @if (!inAttr && !showOdlDetail) {
- } + } *@ @if (showOdlDetail || inAttr) { diff --git a/MP-TAB3/Components/ProdConfirm.razor b/MP-TAB3/Components/ProdConfirm.razor index aa10e5d1..5a993778 100644 --- a/MP-TAB3/Components/ProdConfirm.razor +++ b/MP-TAB3/Components/ProdConfirm.razor @@ -56,16 +56,40 @@
- Pz Buoni - @lblPz2RecBuoni -
-
- Cicli Rilav. - @lblCicliRilavorati + @if (lblPz2RecBuoni > 0) + { + Pz Buoni + @lblPz2RecBuoni + } + else + { + Pz Buoni + @lblPz2RecBuoni + }
- Pz scarto - @lblPz2RecScarto + @if (lblPz2RecScarto > 0) + { + Pz scarto + @lblPz2RecScarto + } + else + { + Pz scarto + @lblPz2RecScarto + } +
+
+ @if (lblCicliRilavorati > 0) + { + Cicli Rilav. + @lblCicliRilavorati + } + else + { + Cicli Rilav. + @lblCicliRilavorati + }
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 2965f668..427f64db 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2502.1818 + 6.16.2502.1907 enable MP_TAB3 @@ -42,12 +42,6 @@ - - - - - - diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 08d446e3..2d5a5dbf 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2502.1818

+

Versione: 6.16.2502.1907


Note di rilascio: