diff --git a/MP-TAB3/Components/MachineBlock.razor b/MP-TAB3/Components/MachineBlock.razor index 12ec5b71..73a97bf0 100644 --- a/MP-TAB3/Components/MachineBlock.razor +++ b/MP-TAB3/Components/MachineBlock.razor @@ -253,8 +253,8 @@ else
-
-
+
+
@RecMSE.DescrizioneStato
@@ -274,7 +274,6 @@ else
} - } } diff --git a/MP-TAB3/Components/MachineBlock.razor.cs b/MP-TAB3/Components/MachineBlock.razor.cs index bf91ac15..778388e3 100644 --- a/MP-TAB3/Components/MachineBlock.razor.cs +++ b/MP-TAB3/Components/MachineBlock.razor.cs @@ -15,6 +15,9 @@ namespace MP_TAB3.Components public string currIpv4 { get; set; } = ""; + [Parameter] + public bool doBlink { get; set; } = false; + [Parameter] public bool FullMode { get; set; } = true; @@ -36,9 +39,6 @@ namespace MP_TAB3.Components [Parameter] public int Width { get; set; } = 0; - [Parameter] - public bool doBlink { get; set; } = false; - #endregion Public Properties #region Public Methods diff --git a/MP-TAB3/Components/ProdConfirm.razor b/MP-TAB3/Components/ProdConfirm.razor index ea8259b0..6bfd0989 100644 --- a/MP-TAB3/Components/ProdConfirm.razor +++ b/MP-TAB3/Components/ProdConfirm.razor @@ -7,14 +7,14 @@
@if (enableMagPrint) { -
+
} @if (odlOk) { -
-
@@ -92,11 +92,11 @@
} -
+
Dati Globali ODL
-
+
[A] NUOVI Pz.Prod @@ -113,7 +113,7 @@
-
+
Pz Prodotti TOT [A+B+C] @@ -130,7 +130,7 @@
-
+
[B] Scarti VERS. @@ -147,7 +147,7 @@
-
+
[C] Pz Buoni VERS. @@ -168,11 +168,11 @@ @if (!confProdActive) {
-
- Reg. SCARTI +
+ Reg. SCARTI
-
- Reg. CONTROLLI +
+ Reg. CONTROLLI
} diff --git a/MP-TAB3/Components/ProdStopMan.razor b/MP-TAB3/Components/ProdStopMan.razor index 86176c72..c3ce69ce 100644 --- a/MP-TAB3/Components/ProdStopMan.razor +++ b/MP-TAB3/Components/ProdStopMan.razor @@ -1,11 +1,14 @@ -
+
- @objTxt + @* @objTxt *@ +
+ @objTxt +
diff --git a/MP-TAB3/Components/ProdStopMan.razor.cs b/MP-TAB3/Components/ProdStopMan.razor.cs index 83be44d4..7cee4629 100644 --- a/MP-TAB3/Components/ProdStopMan.razor.cs +++ b/MP-TAB3/Components/ProdStopMan.razor.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Components; +using static Org.BouncyCastle.Math.EC.ECCurve; namespace MP_TAB3.Components { @@ -23,13 +24,57 @@ namespace MP_TAB3.Components #endregion Public Properties + #region Protected Properties + + [Inject] + protected IConfiguration config { get; set; } = null!; + + #endregion Protected Properties + #region Protected Methods + protected override void OnInitialized() + { + maxChar4Scroll = config.GetValue("ServerConf:maxChar4Scroll"); + } + protected async Task ReportSelected() { await E_EventSelected.InvokeAsync(IdxEvento); } + /// + /// CSS class x testo (se descr lunga scorre...) + /// + protected string textCss(string currText) + { + string answ = " text-nowrap text-truncate w-100"; + if (currText.Length > maxChar4Scroll) + { + // calcolo delta... a-b-c con 5-10-oltre + int delta = currText.Length - maxChar4Scroll; + if (delta < 5) + { + answ = " scroll-left-a"; + } + else if (delta < 10) + { + answ = " scroll-left-b"; + } + else + { + answ = " scroll-left-c"; + } + } + return answ; + } + #endregion Protected Methods + + #region Private Fields + + private int maxChar4Scroll = 20; + + #endregion Private Fields } } \ No newline at end of file diff --git a/MP-TAB3/Components/ProdStopMan.razor.css b/MP-TAB3/Components/ProdStopMan.razor.css new file mode 100644 index 00000000..ef7cad90 --- /dev/null +++ b/MP-TAB3/Components/ProdStopMan.razor.css @@ -0,0 +1,108 @@ +/* gestione scroll testo A: 100% */ +.scroll-left-a { + height: 1.5em; + overflow: hidden; + position: relative; + width: 100%; + white-space: nowrap; +} +.scroll-left-a span { + /*display: inline-block;*/ + position: absolute; + width: 100%; + height: 100%; + margin: 0; + line-height: 1.5em; + /* Starting position */ + -moz-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + /* Apply animation to this element */ + -moz-animation: scroll-left-a 8s ease infinite; + -webkit-animation: scroll-left-a 8s ease infinite; + animation: scroll-left-a 8s ease infinite; +} +/* Move it (define the animation) */ +@keyframes scroll-left-a { + 0% { + transform: translateX(-50%); + } + 30% { + transform: translateX(-50%); + } + 80% { + transform: translateX(-80%); + } +} +/* gestione scroll testo B: 120% */ +.scroll-left-b { + height: 1.5em; + overflow: hidden; + position: relative; + width: 100%; + white-space: nowrap; +} +.scroll-left-b span { + /*display: inline-block;*/ + position: absolute; + width: 100%; + height: 100%; + margin: 0; + line-height: 1.5em; + /* Starting position */ + -moz-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + /* Apply animation to this element */ + -moz-animation: scroll-left-b 8s ease infinite; + -webkit-animation: scroll-left-b 8s ease infinite; + animation: scroll-left-b 8s ease infinite; +} +/* Move it (define the animation) */ +@keyframes scroll-left-b { + 0% { + transform: translateX(-50%); + } + 30% { + transform: translateX(-50%); + } + 80% { + transform: translateX(-120%); + } +} +/* gestione scroll testo C: 150% */ +.scroll-left-c { + height: 1.5em; + overflow: hidden; + position: relative; + width: 100%; + white-space: nowrap; +} +.scroll-left-c span { + /*display: inline-block;*/ + position: absolute; + width: 100%; + height: 100%; + margin: 0; + line-height: 1.5em; + /* Starting position */ + -moz-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + /* Apply animation to this element */ + -moz-animation: scroll-left-c 8s ease infinite; + -webkit-animation: scroll-left-c 8s ease infinite; + animation: scroll-left-c 8s ease infinite; +} +/* Move it (define the animation) */ +@keyframes scroll-left-c { + 0% { + transform: translateX(-50%); + } + 30% { + transform: translateX(-50%); + } + 80% { + transform: translateX(-150%); + } +} \ No newline at end of file diff --git a/MP-TAB3/Components/ProdStopMan.razor.less b/MP-TAB3/Components/ProdStopMan.razor.less new file mode 100644 index 00000000..8cc96da7 --- /dev/null +++ b/MP-TAB3/Components/ProdStopMan.razor.less @@ -0,0 +1,123 @@ +body { +} + + +/* gestione scroll testo A: 100% */ +.scroll-left-a { + height: 1.5em; + overflow: hidden; + position: relative; + width: 100%; + white-space: nowrap; +} + +.scroll-left-a span { + /*display: inline-block;*/ + position: absolute; + width: 100%; + height: 100%; + margin: 0; + line-height: 1.5em; + /* Starting position */ + -moz-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + /* Apply animation to this element */ + -moz-animation: scroll-left-a 8s ease infinite; + -webkit-animation: scroll-left-a 8s ease infinite; + animation: scroll-left-a 8s ease infinite; +} +/* Move it (define the animation) */ +@keyframes scroll-left-a { + 0% { + transform: translateX(-50%); + } + + 30% { + transform: translateX(-50%); + } + + 80% { + transform: translateX(-80%); + } +} + +/* gestione scroll testo B: 120% */ +.scroll-left-b { + height: 1.5em; + overflow: hidden; + position: relative; + width: 100%; + white-space: nowrap; +} + +.scroll-left-b span { + /*display: inline-block;*/ + position: absolute; + width: 100%; + height: 100%; + margin: 0; + line-height: 1.5em; + /* Starting position */ + -moz-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + /* Apply animation to this element */ + -moz-animation: scroll-left-b 8s ease infinite; + -webkit-animation: scroll-left-b 8s ease infinite; + animation: scroll-left-b 8s ease infinite; +} +/* Move it (define the animation) */ +@keyframes scroll-left-b { + 0% { + transform: translateX(-50%); + } + + 30% { + transform: translateX(-50%); + } + + 80% { + transform: translateX(-120%); + } +} + +/* gestione scroll testo C: 150% */ +.scroll-left-c { + height: 1.5em; + overflow: hidden; + position: relative; + width: 100%; + white-space: nowrap; +} + +.scroll-left-c span { + /*display: inline-block;*/ + position: absolute; + width: 100%; + height: 100%; + margin: 0; + line-height: 1.5em; + /* Starting position */ + -moz-transform: translateX(-50%); + -webkit-transform: translateX(-50%); + transform: translateX(-50%); + /* Apply animation to this element */ + -moz-animation: scroll-left-c 8s ease infinite; + -webkit-animation: scroll-left-c 8s ease infinite; + animation: scroll-left-c 8s ease infinite; +} +/* Move it (define the animation) */ +@keyframes scroll-left-c { + 0% { + transform: translateX(-50%); + } + + 30% { + transform: translateX(-50%); + } + + 80% { + transform: translateX(-150%); + } +} \ No newline at end of file diff --git a/MP-TAB3/Components/ProdStopMan.razor.min.css b/MP-TAB3/Components/ProdStopMan.razor.min.css new file mode 100644 index 00000000..68fdab72 --- /dev/null +++ b/MP-TAB3/Components/ProdStopMan.razor.min.css @@ -0,0 +1 @@ +.scroll-left-a{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left-a span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%);-moz-animation:scroll-left-a 8s ease infinite;-webkit-animation:scroll-left-a 8s ease infinite;animation:scroll-left-a 8s ease infinite;}@keyframes scroll-left-a{0%{transform:translateX(-50%);}30%{transform:translateX(-50%);}80%{transform:translateX(-80%);}}.scroll-left-b{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left-b span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%);-moz-animation:scroll-left-b 8s ease infinite;-webkit-animation:scroll-left-b 8s ease infinite;animation:scroll-left-b 8s ease infinite;}@keyframes scroll-left-b{0%{transform:translateX(-50%);}30%{transform:translateX(-50%);}80%{transform:translateX(-120%);}}.scroll-left-c{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left-c span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%);-moz-animation:scroll-left-c 8s ease infinite;-webkit-animation:scroll-left-c 8s ease infinite;animation:scroll-left-c 8s ease infinite;}@keyframes scroll-left-c{0%{transform:translateX(-50%);}30%{transform:translateX(-50%);}80%{transform:translateX(-150%);}} \ No newline at end of file diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index b544e5eb..ecc96afa 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2405.2217 + 6.16.2405.2909 enable MP_TAB3 diff --git a/MP-TAB3/Pages/RegNewDevice.razor.cs b/MP-TAB3/Pages/RegNewDevice.razor.cs index 4b4f715d..2556702e 100644 --- a/MP-TAB3/Pages/RegNewDevice.razor.cs +++ b/MP-TAB3/Pages/RegNewDevice.razor.cs @@ -26,6 +26,7 @@ namespace MP_TAB3.Pages #region Protected Fields protected int expDays = 1; + protected bool recordLogin = true; protected string txtError = ""; protected DateTime vetoScan = DateTime.Now; @@ -110,7 +111,26 @@ namespace MP_TAB3.Pages await MsgServ.SetCurrOperDtoLSAsync(hash); await MsgServ.SetLastMatrOprAsync(rigaOpr.MatrOpr); await TDService.OperatoreSetRedis(matrOpr, hash, devGuid); - await Task.Delay(50); + + // se abilitato in config... + + if (recordLogin) + { + // salvo registrazione login utente + string generOpr = $"{rigaOpr.Cognome} {rigaOpr.Nome}"; + RegistroDichiarazioniModel ulRec = new RegistroDichiarazioniModel() + { + TagCode = "UserLogin", + IdxMacchina = "", + DtRec = DateTime.Now, + MatrOpr = matrOpr, + ValString = $"Login: {generOpr}" + }; + await TDService.RegDichiarInsert(ulRec); + } + + // passo a status map + await Task.Delay(150); NavMan.NavigateTo("status-map", true); } else @@ -125,6 +145,7 @@ namespace MP_TAB3.Pages txtError = ""; matrOpr = await MsgServ.GetLastMatrOprAsync(); TDService.ConfigGetVal("cookieDayExpire", ref expDays); + TDService.ConfigGetVal("TAB_UL_Record", ref recordLogin); ShowScanBarcode = !SMServ.GetConfBool("TAB_WebCamHide"); oprList = await TDService.ElencoOperatori(); // filtro solo abilitati + ordino x nome... diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 8c9359be..9fdd693f 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2405.2217

+

Versione: 6.16.2405.2909


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index 70539025..bc2e8ed0 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2405.2217 +6.16.2405.2909 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index 1ad20aa1..fcec4544 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2405.2217 + 6.16.2405.2909 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/appsettings.json b/MP-TAB3/appsettings.json index d0de5c91..5db9c2a2 100644 --- a/MP-TAB3/appsettings.json +++ b/MP-TAB3/appsettings.json @@ -25,7 +25,8 @@ "BasePathDisegni": "\\\\iis01\\W$\\Files\\Disegni", "BaseUrlTab": "/MP/TAB3", "ImgBasePath": "https://iis01.egalware.com/MP/images/macchine/small/", - "MpIoNS": "MoonPro:SQL2016DEV:MoonPro" + "MpIoNS": "MoonPro:SQL2016DEV:MoonPro", + "maxChar4Scroll": 21 }, "AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net", "MailKitMailSettings": { diff --git a/MP-TAB3/compilerconfig.json b/MP-TAB3/compilerconfig.json index ace0b521..52388af1 100644 --- a/MP-TAB3/compilerconfig.json +++ b/MP-TAB3/compilerconfig.json @@ -54,5 +54,9 @@ { "outputFile": "Components/ParamsMan.razor.css", "inputFile": "Components/ParamsMan.razor.less" + }, + { + "outputFile": "Components/ProdStopMan.razor.css", + "inputFile": "Components/ProdStopMan.razor.less" } ] \ No newline at end of file diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj index bee37567..af49b3ea 100644 --- a/MP.Mon/MP.Mon.csproj +++ b/MP.Mon/MP.Mon.csproj @@ -4,7 +4,7 @@ net6.0 enable enable - 6.16.2405.1719 + 6.16.2405.2315 diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html index cdebf4c7..1b4d3524 100644 --- a/MP.Mon/Resources/ChangeLog.html +++ b/MP.Mon/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MON MAPO -

    Versione: 6.16.2405.1719

    +

    Versione: 6.16.2405.2315


    Note di rilascio:
    • diff --git a/MP.Mon/Resources/VersNum.txt b/MP.Mon/Resources/VersNum.txt index 0678146b..65bc5654 100644 --- a/MP.Mon/Resources/VersNum.txt +++ b/MP.Mon/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2405.1719 +6.16.2405.2315 diff --git a/MP.Mon/Resources/manifest.xml b/MP.Mon/Resources/manifest.xml index e6c55cc4..7b903672 100644 --- a/MP.Mon/Resources/manifest.xml +++ b/MP.Mon/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2405.1719 + 6.16.2405.2315 https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html false