diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index e7925ce5..4de2f7cb 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -1,411 +1,326 @@ -@if (isLoading) +@if (isLoading || CRecMSE == null) { @if (FullMode) { -
-
-
-
- -
-
- -
-
- - - -
-
- -
-
- - - - - - -
-
-
-
+ } else { -
-
-
-
- -
-
- - - - - - - -
-
- -
-
- - - - - - - -
-
- - - -
-
-
-
+ } } else { - @if (CRecMSE == null) + @if (FullMode) { -
-
-
No data
-
- - - - - - - - - - - ...loading stage 2... -
-
-
- } - else - { - @if (FullMode) + if (Width > 640) { - if (Width > 640) - { -
- @CRecMSE.CodMacchina -
-
-
-
- @CRecMSE.Nome -
-
-
-
-
-
-
-
- @CRecMSE.DescrizioneStato -
-
- @(FormatDurata(CRecMSE.Durata)) -
-
-
-
-
-
-   @($" {CRecMSE.PezziConf}")   -
-
- @if (datiProdAct != null && datiProdAct.PzConfScarto > 0) - { - @($"(- {datiProdAct.PzConfScarto})") - } -
-
-
-
-   @($" {CRecMSE.PezziProd}") -
-
-
-
-
- -
-
-
-
ART:
-
@($"{CRecMSE.CodArticolo}")
-
-
-
ODL:
-
@($"ODL{CRecMSE.IdxOdl:00000000}")
-
-
-
PODL:
-
@($"PODL{CRecMSE.IdxPOdl:00000000}")
-
+
+ @CRecMSE.CodMacchina +
+
+
+
+ @CRecMSE.Nome
- } - else - { -
- @CRecMSE.CodMacchina -
-
-
-
- @CRecMSE.Nome -
+
+
+
+
+ @CRecMSE.DescrizioneStato
-
-
-
-
-
-
- @CRecMSE.DescrizioneStato -
-
- - @(FormatDurata(CRecMSE.Durata)) - -
-
-
-
-
-
-   @($" {CRecMSE.PezziConf}")   -
-
- @if (datiProdAct != null && datiProdAct.PzConfScarto > 0) - { - @($"(- {datiProdAct.PzConfScarto})") - } -
-
-
-
-   @($" {CRecMSE.PezziProd}") -
-
-
-
-
- -
-
- -
-
ART:
-
@($"{CRecMSE.CodArticolo}")
-
-
-
ODL:
-
@($"ODL{CRecMSE.IdxOdl:00000000}")
-
-
-
PODL:
-
@($"PODL{CRecMSE.IdxPOdl:00000000}")
-
-
-
-
-
- } - } - else - { -
-
-
-

- @CRecMSE.Nome -

-
-
-
-
-
- Cicli Prod -
- @if (datiProdAct != null) - { -
@($"{datiProdAct.PzTotODL}")
- } - else - { -
@($"{CRecMSE.PezziProd}")
- } -
- @if (datiProdAct != null) - { - @if (datiProdAct.Pz2RecTot > 0) - { -
-
- Da Confermare -
-
- @($"{datiProdAct.Pz2RecTot}") -
-
- } - else - { -
-
- Da Confermare -
-
- @($"{datiProdAct.Pz2RecTot}") -
-
- } - @if (NumScartiConf > 0) - { -
-
- Scarti Versati -
-
- @($"{NumScartiConf}") -
-
- } - @if (datiProdAct.PzConfRilav > 0) - { -
-
- Rilav Versati -
-
- @($"{datiProdAct.PzConfRilav}") -
-
- } -
-
- Buoni Versati -
-
- @($"{datiProdAct.PzConfBuoni}") -
-
- } - @if (CRecMSE.extraVal > 0) - { -
-
- Qta Extra -
-
@($"{CRecMSE.extraVal}")
-
- } -
-
-
- -
-
-
- @if (!string.IsNullOrEmpty(IdxMacchSub)) - { -
- @IdxMacchSub -
- } -
-
-
-
ART
-
@CRecMSE.CodArticolo
-
-
-
ODL
-
@CRecMSE.IdxOdl
-
-
-
PODL:
-
@CRecMSE.IdxPOdl
-
-
-
-
-
-
-
- @if (showPodl) - { - - } - else - { - - } -
-
-
-
-
- @CRecMSE.DescrizioneStato -
-
+
@(FormatDurata(CRecMSE.Durata))
- @if (enableDisegno) - { -
-
- @if (showDraw) +
+
+
+   @($" {CRecMSE.PezziConf}")   +
+
+ @if (datiProdAct != null && datiProdAct.PzConfScarto > 0) { - - } - else - { - + @($"(- {datiProdAct.PzConfScarto})") }
- } - else - { -
-
- +
+
+   @($" {CRecMSE.PezziProd}")
- } +
+
+
+ +
+
+
+
ART:
+
@($"{CRecMSE.CodArticolo}")
+
+
+
ODL:
+
@($"ODL{CRecMSE.IdxOdl:00000000}")
+
+
+
PODL:
+
@($"PODL{CRecMSE.IdxPOdl:00000000}")
+
+
+
} - @if (enableDisegno && showDraw) + else { - string docUrl = string.IsNullOrEmpty(CRecMSE.Disegno) ? $"disegni/{CRecMSE.CodArticolo}.pdf" : $"disegni/{CRecMSE.Disegno}.pdf"; -
- +
+ @CRecMSE.CodMacchina +
+
+
+
+ @CRecMSE.Nome +
+
+
+
+
+
+
+
+ @CRecMSE.DescrizioneStato +
+
+ + @(FormatDurata(CRecMSE.Durata)) + +
+
+
+
+
+
+   @($" {CRecMSE.PezziConf}")   +
+
+ @if (datiProdAct != null && datiProdAct.PzConfScarto > 0) + { + @($"(- {datiProdAct.PzConfScarto})") + } +
+
+
+
+   @($" {CRecMSE.PezziProd}") +
+
+
+
+
+ +
+
+ +
+
ART:
+
@($"{CRecMSE.CodArticolo}")
+
+
+
ODL:
+
@($"ODL{CRecMSE.IdxOdl:00000000}")
+
+
+
PODL:
+
@($"PODL{CRecMSE.IdxPOdl:00000000}")
+
+
+
+
} - @if (showPodl) - { - - } + } + else + { +
+
+
+

+ @CRecMSE.Nome +

+
+
+
+
+
+ Cicli Prod +
+ @if (datiProdAct != null) + { +
@($"{datiProdAct.PzTotODL}")
+ } + else + { +
@($"{CRecMSE.PezziProd}")
+ } +
+ @if (datiProdAct != null) + { + @if (datiProdAct.Pz2RecTot > 0) + { +
+
+ Da Confermare +
+
+ @($"{datiProdAct.Pz2RecTot}") +
+
+ } + else + { +
+
+ Da Confermare +
+
+ @($"{datiProdAct.Pz2RecTot}") +
+
+ } + @if (NumScartiConf > 0) + { +
+
+ Scarti Versati +
+
+ @($"{NumScartiConf}") +
+
+ } + @if (datiProdAct.PzConfRilav > 0) + { +
+
+ Rilav Versati +
+
+ @($"{datiProdAct.PzConfRilav}") +
+
+ } +
+
+ Buoni Versati +
+
+ @($"{datiProdAct.PzConfBuoni}") +
+
+ } + @if (CRecMSE.extraVal > 0) + { +
+
+ Qta Extra +
+
@($"{CRecMSE.extraVal}")
+
+ } +
+
+
+ +
+
+
+ @if (!string.IsNullOrEmpty(IdxMacchSub)) + { +
+ @IdxMacchSub +
+ } +
+
+
+
ART
+
@CRecMSE.CodArticolo
+
+
+
ODL
+
@CRecMSE.IdxOdl
+
+
+
PODL:
+
@CRecMSE.IdxPOdl
+
+
+
+
+
+
+
+ @if (showPodl) + { + + } + else + { + + } +
+
+
+
+
+ @CRecMSE.DescrizioneStato +
+
+ @(FormatDurata(CRecMSE.Durata)) +
+
+
+ @if (enableDisegno) + { +
+
+ @if (showDraw) + { + + } + else + { + + } +
+
+ } + else + { +
+
+ +
+
+ } +
+
+ } + @if (enableDisegno && showDraw) + { + string docUrl = string.IsNullOrEmpty(CRecMSE.Disegno) ? $"disegni/{CRecMSE.CodArticolo}.pdf" : $"disegni/{CRecMSE.Disegno}.pdf"; +
+ +
+ } + @if (showPodl) + { + } } \ No newline at end of file diff --git a/MP-TAB3/Components/PlaceholderDetail.razor b/MP-TAB3/Components/PlaceholderDetail.razor new file mode 100644 index 00000000..1ec38f42 --- /dev/null +++ b/MP-TAB3/Components/PlaceholderDetail.razor @@ -0,0 +1,35 @@ +
+
+
+
+ +
+
+ + + + + + + +
+
+ +
+
+ + + + + + + +
+
+ + + +
+
+
+
\ No newline at end of file diff --git a/MP-TAB3/Components/PlaceholderDetail.razor.css b/MP-TAB3/Components/PlaceholderDetail.razor.css new file mode 100644 index 00000000..61bad387 --- /dev/null +++ b/MP-TAB3/Components/PlaceholderDetail.razor.css @@ -0,0 +1,4 @@ +.pholderHeight { + height: 5rem; + object-fit: cover; +} \ No newline at end of file diff --git a/MP-TAB3/Components/PlaceholderDetail.razor.less b/MP-TAB3/Components/PlaceholderDetail.razor.less new file mode 100644 index 00000000..73045d73 --- /dev/null +++ b/MP-TAB3/Components/PlaceholderDetail.razor.less @@ -0,0 +1,6 @@ + +.pholderHeight { + height: 5rem; + object-fit: cover; +} + diff --git a/MP-TAB3/Components/PlaceholderDetail.razor.min.css b/MP-TAB3/Components/PlaceholderDetail.razor.min.css new file mode 100644 index 00000000..b22a0149 --- /dev/null +++ b/MP-TAB3/Components/PlaceholderDetail.razor.min.css @@ -0,0 +1 @@ +.pholderHeight{height:5rem;object-fit:cover;} \ No newline at end of file diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor b/MP-TAB3/Components/PlaceholderStatusMap.razor new file mode 100644 index 00000000..8d12accf --- /dev/null +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor @@ -0,0 +1,30 @@ +
+
+
+
+ +
+
+ + +
+
+ +
+
+ + + +
+
+ +
+
+ + + + +
+
+
+
\ No newline at end of file diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.css b/MP-TAB3/Components/PlaceholderStatusMap.razor.css new file mode 100644 index 00000000..218fdd85 --- /dev/null +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.css @@ -0,0 +1,4 @@ +.pholderHeight { + height: 3rem; + object-fit: cover; +} \ No newline at end of file diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.less b/MP-TAB3/Components/PlaceholderStatusMap.razor.less new file mode 100644 index 00000000..90d74c36 --- /dev/null +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.less @@ -0,0 +1,6 @@ + +.pholderHeight { + height: 3rem; + object-fit: cover; +} + diff --git a/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css b/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css new file mode 100644 index 00000000..66d7e09e --- /dev/null +++ b/MP-TAB3/Components/PlaceholderStatusMap.razor.min.css @@ -0,0 +1 @@ +.pholderHeight{height:3rem;object-fit:cover;} \ No newline at end of file diff --git a/MP-TAB3/Components/ProdConfirm.razor b/MP-TAB3/Components/ProdConfirm.razor index 86615958..82e4e231 100644 --- a/MP-TAB3/Components/ProdConfirm.razor +++ b/MP-TAB3/Components/ProdConfirm.razor @@ -131,7 +131,7 @@
@if (isProcessing) { - + } else { @@ -148,7 +148,7 @@
@if (isProcessing) { - + } else { @@ -165,7 +165,7 @@
@if (isProcessing) { - + } else { @@ -182,7 +182,7 @@
@if (isProcessing) { - + } else { @@ -199,7 +199,7 @@
@if (isProcessing) { - + } else { diff --git a/MP-TAB3/Components/ProdConfirm.razor.cs b/MP-TAB3/Components/ProdConfirm.razor.cs index a336c64e..23c523e7 100644 --- a/MP-TAB3/Components/ProdConfirm.razor.cs +++ b/MP-TAB3/Components/ProdConfirm.razor.cs @@ -301,7 +301,7 @@ namespace MP_TAB3.Components // azzero cache pezzi conf SDService.MachNumPzSet(IdxMaccSel, -1); await DoUpdate(); - await RefreshData(); + await RefreshData(); TabDServ.NotifyDataInvalidated(IdxMaccSel); Log.Info("Conf 04"); isProcessing = false; diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 10cc639d..daa39fcc 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2503.807 + 6.16.2503.808 enable MP_TAB3 diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index a35f518c..2c4ae257 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2503.807

+

Versione: 6.16.2503.808


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 6b0df209..48bd41a1 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2503.807 +6.16.2503.808 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index e1a9c666..ce8d07db 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2503.807 + 6.16.2503.808 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false diff --git a/MP-TAB3/compilerconfig.json b/MP-TAB3/compilerconfig.json index 52388af1..ecaeb067 100644 --- a/MP-TAB3/compilerconfig.json +++ b/MP-TAB3/compilerconfig.json @@ -58,5 +58,13 @@ { "outputFile": "Components/ProdStopMan.razor.css", "inputFile": "Components/ProdStopMan.razor.less" + }, + { + "outputFile": "Components/PlaceholderDetail.razor.css", + "inputFile": "Components/PlaceholderDetail.razor.less" + }, + { + "outputFile": "Components/PlaceholderStatusMap.razor.css", + "inputFile": "Components/PlaceholderStatusMap.razor.less" } ] \ No newline at end of file