diff --git a/MP-TAB-SERV/Components/IobInfoMan.razor b/MP-TAB-SERV/Components/IobInfoMan.razor index f5a92a64..3569926f 100644 --- a/MP-TAB-SERV/Components/IobInfoMan.razor +++ b/MP-TAB-SERV/Components/IobInfoMan.razor @@ -1,4 +1,4 @@ -
+@*
@@ -31,4 +31,56 @@
+
*@ + +
+
+
+
+
Iob Type
+
+ @if(infosIob.iType == MP.Data.Objects.Enums.IobType.rPi) + { + + } + else if (infosIob.iType == MP.Data.Objects.Enums.IobType.WIN || infosIob.iType == MP.Data.Objects.Enums.IobType.ND) + { + + } +
+
+
+
+
+
+
+
Machine Cod
+
@idxMacch
+
+
+
+
+
Iob Address
+
@infosIob.IP
+
+
+
+
+
+
+
+
+
Iob Name
+
@infosIob.name
+
+
+
+
+
+
+
CNC Absolute counter
+
@infosIob.CNC_Counter
+
+
+
\ No newline at end of file diff --git a/MP-TAB-SERV/Components/IobInfoMan.razor.css b/MP-TAB-SERV/Components/IobInfoMan.razor.css new file mode 100644 index 00000000..6c8e12e9 --- /dev/null +++ b/MP-TAB-SERV/Components/IobInfoMan.razor.css @@ -0,0 +1,5 @@ +.cardObj { + border-radius: 0.375rem; + background: linear-gradient(121deg, rgba(255, 255, 255, 0.2) -0.71%, rgba(255, 255, 255, 0.05) 97.66%); + box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25); +} \ No newline at end of file diff --git a/MP-TAB-SERV/Components/IobInfoMan.razor.less b/MP-TAB-SERV/Components/IobInfoMan.razor.less new file mode 100644 index 00000000..debe0f23 --- /dev/null +++ b/MP-TAB-SERV/Components/IobInfoMan.razor.less @@ -0,0 +1,5 @@ +.cardObj { + border-radius: 0.375rem; + background: linear-gradient(121deg, rgba(255, 255, 255, 0.20) -0.71%, rgba(255, 255, 255, 0.05) 97.66%); + box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25); +} diff --git a/MP-TAB-SERV/Components/IobInfoMan.razor.min.css b/MP-TAB-SERV/Components/IobInfoMan.razor.min.css new file mode 100644 index 00000000..a73512c0 --- /dev/null +++ b/MP-TAB-SERV/Components/IobInfoMan.razor.min.css @@ -0,0 +1 @@ +.cardObj{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);} \ No newline at end of file diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor index 0da9cd1e..d08a10a4 100644 --- a/MP-TAB-SERV/Components/ProdConfirm.razor +++ b/MP-TAB-SERV/Components/ProdConfirm.razor @@ -49,7 +49,7 @@ else
- +
@@ -57,8 +57,8 @@ else
@if (enablePzProdLasciati) { - - + + } else { @@ -67,10 +67,12 @@ else
-
- +
Pz Buoni @lblPz2RecBuoni
+
Pz scarto @lblPz2RecScarto
+ @* + -
+ *@
@if (showConfirm) diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index be2d53cc..a565a4f8 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.2310.2509 + 6.16.2310.2517 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Pages/WorkShift.razor b/MP-TAB-SERV/Pages/WorkShift.razor index 218c51da..2f3ace78 100644 --- a/MP-TAB-SERV/Pages/WorkShift.razor +++ b/MP-TAB-SERV/Pages/WorkShift.razor @@ -7,25 +7,30 @@ else { -
-
-

Gestione Turni

-
-
-
-
+

Gestione Turni

+
+
+
+
+

Stato Turni Attivi

+
+
+
+
+
+
@@ -33,38 +38,14 @@ else
-
-
-
-
-

Stato Turni Attivi

-
-
-
-
- Turno 1 -
-
-
-
- Turno 2 -
-
-
-
- Turno 3 -
-
+
+
+
+
+ Turno Aperto
-
-
-
- Turno Aperto -
-
- Turno Chiuso -
-
+
+ Turno Chiuso
diff --git a/MP-TAB-SERV/Pages/WorkShift.razor.css b/MP-TAB-SERV/Pages/WorkShift.razor.css new file mode 100644 index 00000000..ed8d08f3 --- /dev/null +++ b/MP-TAB-SERV/Pages/WorkShift.razor.css @@ -0,0 +1,5 @@ +.cardShift { + border-radius: 0.375rem; + background: linear-gradient(121deg, rgba(255, 255, 255, 0.2) -0.71%, rgba(255, 255, 255, 0.05) 97.66%); + box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25); +} \ No newline at end of file diff --git a/MP-TAB-SERV/Pages/WorkShift.razor.less b/MP-TAB-SERV/Pages/WorkShift.razor.less new file mode 100644 index 00000000..0f29e9a7 --- /dev/null +++ b/MP-TAB-SERV/Pages/WorkShift.razor.less @@ -0,0 +1,5 @@ +.cardShift { + border-radius: 0.375rem; + background: linear-gradient(121deg, rgba(255, 255, 255, 0.20) -0.71%, rgba(255, 255, 255, 0.05) 97.66%); + box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25); +} diff --git a/MP-TAB-SERV/Pages/WorkShift.razor.min.css b/MP-TAB-SERV/Pages/WorkShift.razor.min.css new file mode 100644 index 00000000..ac6b40dc --- /dev/null +++ b/MP-TAB-SERV/Pages/WorkShift.razor.min.css @@ -0,0 +1 @@ +.cardShift{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);} \ No newline at end of file diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 511e3d72..287877e4 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.2509

+

Versione: 6.16.2310.2517


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index 24c0b9d0..c04ea83d 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.2509 +6.16.2310.2517 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index 264c7685..49d12c02 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.2509 + 6.16.2310.2517 https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html false diff --git a/MP-TAB-SERV/compilerconfig.json b/MP-TAB-SERV/compilerconfig.json index d2f89971..8be7ecdd 100644 --- a/MP-TAB-SERV/compilerconfig.json +++ b/MP-TAB-SERV/compilerconfig.json @@ -18,5 +18,17 @@ { "outputFile": "Components/ProdStat.razor.css", "inputFile": "Components/ProdStat.razor.less" + }, + { + "outputFile": "Pages/IobInfo.razor.css", + "inputFile": "Pages/IobInfo.razor.less" + }, + { + "outputFile": "Components/IobInfoMan.razor.css", + "inputFile": "Components/IobInfoMan.razor.less" + }, + { + "outputFile": "Pages/WorkShift.razor.css", + "inputFile": "Pages/WorkShift.razor.less" } ] \ No newline at end of file diff --git a/MP-TAB-SERV/wwwroot/images/linuxLogo.png b/MP-TAB-SERV/wwwroot/images/linuxLogo.png new file mode 100644 index 00000000..2afbacf6 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/images/linuxLogo.png differ diff --git a/MP-TAB-SERV/wwwroot/images/winLogo.png b/MP-TAB-SERV/wwwroot/images/winLogo.png new file mode 100644 index 00000000..92cab382 Binary files /dev/null and b/MP-TAB-SERV/wwwroot/images/winLogo.png differ