From 95c2e6d4f528154c2e0aa3655a87bc3e9d5101d6 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Tue, 31 Oct 2023 12:40:13 +0100 Subject: [PATCH] cleanup commenti --- MP-TAB-SERV/Components/ControlsMan.razor | 2 - MP-TAB-SERV/Components/IobInfoMan.razor | 37 +----- MP-TAB-SERV/Components/LongStopList.razor | 2 - MP-TAB-SERV/Components/MachineBlock.razor | 62 +--------- MP-TAB-SERV/Components/NotesMan.razor | 57 --------- MP-TAB-SERV/Components/ProdConfirm.razor | 137 ---------------------- MP-TAB-SERV/Components/ProdStat.razor | 131 +-------------------- MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Pages/TCHistory.razor | 6 - MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- MP-TAB-SERV/Shared/NavMenu.razor | 63 ---------- 13 files changed, 7 insertions(+), 498 deletions(-) diff --git a/MP-TAB-SERV/Components/ControlsMan.razor b/MP-TAB-SERV/Components/ControlsMan.razor index d4c521e5..96861d63 100644 --- a/MP-TAB-SERV/Components/ControlsMan.razor +++ b/MP-TAB-SERV/Components/ControlsMan.razor @@ -33,8 +33,6 @@ else
- @*
-
*@
diff --git a/MP-TAB-SERV/Components/IobInfoMan.razor b/MP-TAB-SERV/Components/IobInfoMan.razor index 3569926f..1c68b7f6 100644 --- a/MP-TAB-SERV/Components/IobInfoMan.razor +++ b/MP-TAB-SERV/Components/IobInfoMan.razor @@ -1,39 +1,4 @@ -@*
-
-
- -
-
- IOB Details -
-
-
-
    -
  • -
    Machine Code:
    -
    @idxMacch
    -
    • -
  • -
    IOB Type:
    -
      @infosIob.iType
    -
    • -
  • -
    IOB Name:
    -
    @infosIob.name
    -
    • -
  • -
    IOB Address:
    -
    @infosIob.IP
    -
    • -
  • -
    CNC Absolute counter:
    -
    @infosIob.CNC_Counter
    -
    • -
-
-
*@ - -
+
diff --git a/MP-TAB-SERV/Components/LongStopList.razor b/MP-TAB-SERV/Components/LongStopList.razor index cb387172..92d1bab2 100644 --- a/MP-TAB-SERV/Components/LongStopList.razor +++ b/MP-TAB-SERV/Components/LongStopList.razor @@ -12,10 +12,8 @@
@($"{currFnq.InizioStato:yyyy/MM/dd HH:mm:ss}") - @*09.10.2023 00:30*@
- @*7h 30m*@ @(MP.Data.Utils.FormDurata(currFnq.DurataMinuti))
diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor index 1e873a49..4b5f32f1 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor +++ b/MP-TAB-SERV/Components/MachineBlock.razor @@ -34,7 +34,6 @@ else if (Width > 640) {
- @*@RecMSE.CodMacchina*@ @RecMSE.CodMacchina
@@ -130,66 +129,7 @@ else } else { - @*
-
-
-
-
-
-

- @RecMSE.Nome -

-
-
-
-
- @RecMSE.DescrizioneStato -
-
- @(formatDurata(RecMSE.Durata)) -
-
-
-
-
-
- Confermati -
-
- Prodotti -
-
- Ordinati -
-
-
-
- @($"{RecMSE.PezziConf:N0}") -
-
- @($"{RecMSE.PezziProd:N0}") -
-
- @($"{RecMSE.NumPezzi:N0}") -
-
-
-
- -
-
-
-
-
-
-
-
- -
-
*@ - +
diff --git a/MP-TAB-SERV/Components/NotesMan.razor b/MP-TAB-SERV/Components/NotesMan.razor index ccc5ebc1..d2dabc63 100644 --- a/MP-TAB-SERV/Components/NotesMan.razor +++ b/MP-TAB-SERV/Components/NotesMan.razor @@ -51,61 +51,4 @@
-@* -
- -
- - -
- - - @if (RecordListComments == null) - { - - } - else if (RecordListComments.Count == 0) - { -
Nessun record trovato
- } - else - { - foreach (var item in RecordListComments) - { -
-
-
- @item.Operatore -
-
- -
- @item.Value -
-
-
- -
-
- -
-
-
-
-
- @($"{item.InizioStato:yyyy/MM/dd HH:mm:ss}") -
-
- @item.CodArticolo - @($"ODL{item.IdxODL:000000000}") -
-
-
-
- } - } - -
-
- *@ diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor b/MP-TAB-SERV/Components/ProdConfirm.razor index e578efcf..08f95f69 100644 --- a/MP-TAB-SERV/Components/ProdConfirm.razor +++ b/MP-TAB-SERV/Components/ProdConfirm.razor @@ -8,7 +8,6 @@
- @**@
@if (odlOk) { @@ -22,28 +21,9 @@ {
MANCA ODL: conferma NON permessa
} - - @*
- -
*@
-@*@if (odlOk) -{ -
-
- -
-
-} -else -{ -
MANCA ODL: conferma NON permessa
-}*@ - @if (showInnov) { @@ -71,10 +51,6 @@ else
Pz Buoni @lblPz2RecBuoni
Pz scarto @lblPz2RecScarto
- @*
- - -
*@
@if (showConfirm) @@ -86,55 +62,6 @@ else
- @*
-
- Dati Incrementali -
-
- - ultima conferma --> @dtReqUpdate.ToString() - -
-
- - -
-
-
-
- Pz Scarto - + - Pz Buoni -
-
-
-
-
- @lblPz2RecScarto - + - @lblPz2RecBuoni -
-
-
-
-
- @if (enablePzProdLasciati) - { - - - } - else - { - - } -
-
- @if (showConfirm) - { - - } -
-
*@ }
@@ -143,23 +70,11 @@ else
- @**@
- @*
-
- -
- - Periodo ODL calcolato: - @dtInizio - - - @dtFine - -
*@
@@ -233,58 +148,6 @@ else
- - @*
-
-
- Pz Prodotti TOT [A+B+C] -
-
- @if (isProcessing) - { - - } - else - { - @numPzProdotti.ToString("N0") - } -
-
-
-
-
-
- [B] Scarti VERS. -
-
- @if (isProcessing) - { - - } - else - { - @numPzScaConf.ToString("N0") - } -
-
-
-
-
-
- [C] Pz Buoni VERS. -
-
- @if (isProcessing) - { - - } - else - { - @numPzBuoniConf.ToString("N0") - } -
-
-
*@
@if (!string.IsNullOrEmpty(lblOut)) { diff --git a/MP-TAB-SERV/Components/ProdStat.razor b/MP-TAB-SERV/Components/ProdStat.razor index c08dcbb2..20cb06e6 100644 --- a/MP-TAB-SERV/Components/ProdStat.razor +++ b/MP-TAB-SERV/Components/ProdStat.razor @@ -1,133 +1,4 @@ -@*
-
-

- -

-
-
- @if (RecMSE != null) - { -
-
- @($"ODL num: {RecMSE.IdxOdl}, iniziato {RecMSE.DataInizioOdl:ddd yyyy.MM.dd, HH:mm}") -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @* - - - - - -
- Cod articolo - - Nr pezzi lanciati - - Nr pezzi confermati - - Nr pezzi fatti -
- @RecMSE.CodArticolo - - @($"{RecMSE.NumPezzi:N0}") pz. - - @RecMSE.PezziConf pz. - - (@($"{RecMSE.PezziProd:N0}") pz.) -
- Efficienza Globale - - Efficienza Lavoro - - Efficienza Teorica -
-
- @RecMSE.OEE_tot -
- (@RecMSE.OEE_RT_tot) - 		-
- @RecMSE.OEE_wrk -
- (@RecMSE.OEE_RT_wrk) - 		-
- @RecMSE.OEE_run -
- (@RecMSE.OEE_RT_run) -
- Tc Medio - - Tc Lavoro - - Tc Tecnico - - Tc impostato -
-
- @($"{RecMSE.TCMedio:0.###}") -
- (@($"{RecMSE.TCMedioRt:0.###}")) - 		-
- @($"{RecMSE.TCLav:0.###}") -
- (@($"{RecMSE.TCLavRT:0.###}")) - 		-
- @($"{RecMSE.TCEff:0.###}") -
- (@($"{RecMSE.TCEffRT:0.###}")) - 		-
- @($"{RecMSE.TCAssegnato:0.###}") -
-
- - } -
-
-
-
-*@ -@*@($"ODL num: {RecMSE.IdxOdl}, iniziato {RecMSE.DataInizioOdl:ddd yyyy.MM.dd, HH:mm}")*@ +
Statistiche di prodizione diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index b0ca5e40..19275142 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.3111 + 6.16.2310.3112 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Pages/TCHistory.razor b/MP-TAB-SERV/Pages/TCHistory.razor index 6cc87a79..74855de1 100644 --- a/MP-TAB-SERV/Pages/TCHistory.razor +++ b/MP-TAB-SERV/Pages/TCHistory.razor @@ -10,9 +10,6 @@ Articolo Informazioni - @* TCiclo *@ - @* Note *@ - @* Impianto *@ Periodo @@ -30,7 +27,6 @@
- @* *@
@@ -81,8 +77,6 @@ Fine: @item.DataFine
- @* - *@ } } diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 71928185..16d095bb 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.3111

+

Versione: 6.16.2310.3112


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index 7f1ac41c..cb381b62 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.3111 +6.16.2310.3112 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index cfe3c058..e5f68742 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.3111 + 6.16.2310.3112 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/Shared/NavMenu.razor b/MP-TAB-SERV/Shared/NavMenu.razor index da607ea3..9e64402e 100644 --- a/MP-TAB-SERV/Shared/NavMenu.razor +++ b/MP-TAB-SERV/Shared/NavMenu.razor @@ -2,34 +2,6 @@ @inject ListSelectDataSrv MDataService -@*
    -
    - MP-TAB-SERV - -
    -
    - -
    - -
    *@
    @@ -48,28 +20,6 @@
    } } -@* -
    -
    - - Home - -
    -
    - - Counter - -
    -
    - - Weather - -
    -
    - - CardDemo - -
    *@
    @@ -78,17 +28,4 @@ [Parameter] public List MenuItems { get; set; } = new List(); - - #if false - - private bool collapseNavMenu = true; - - private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; - - private void ToggleNavMenu() - { - collapseNavMenu = !collapseNavMenu; - } - - #endif }