From 890c2f6742720c1572bf40e42f34edb75dc82ac2 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 5 Oct 2023 15:01:05 +0200 Subject: [PATCH 1/4] tolto overlay in resized mode --- MP-TAB-SERV/Components/MachineBlock.razor | 4 ++-- MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor index 5ff8d645..6bba448e 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor +++ b/MP-TAB-SERV/Components/MachineBlock.razor @@ -93,7 +93,7 @@ else {
-
+ @*
@@ -112,7 +112,7 @@ else
-
+
*@
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 2790f0f7..de401236 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.512 + 6.16.2310.515 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 758bfbc6..e1243fcc 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.512

+

Versione: 6.16.2310.515


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index f3a1d699..038428d5 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.512 +6.16.2310.515 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index d7af7a92..b8d8b1ed 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.512 + 6.16.2310.515 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 From 650e4b3824b46d7907d827bf3f9bf04dc070d28a Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 5 Oct 2023 15:22:37 +0200 Subject: [PATCH 2/4] aggiunto bottone pdf --- MP-TAB-SERV/Components/MachineBlock.razor | 128 ++++++++++++---------- 1 file changed, 68 insertions(+), 60 deletions(-) diff --git a/MP-TAB-SERV/Components/MachineBlock.razor b/MP-TAB-SERV/Components/MachineBlock.razor index 6bba448e..234a5247 100644 --- a/MP-TAB-SERV/Components/MachineBlock.razor +++ b/MP-TAB-SERV/Components/MachineBlock.razor @@ -91,79 +91,87 @@ else } else { -
    -
    - @*
    -
    -
    -
    - Art +
    +
    +
    + @*
    +
    +
    +
    + Art +
    +
    + @RecMSE.CodArticolo +
    +
    +
    +
    + @($"PODL{RecMSE.IdxPOdl:00000000}") +
    +
    + @($"ODL{RecMSE.IdxOdl:00000000}") +
    +
    +
    +
    *@ +
    +
    +
    +

    + @RecMSE.Nome +

    -
    - @RecMSE.CodArticolo -
    -
    -
    -
    - @($"PODL{RecMSE.IdxPOdl:00000000}") -
    -
    - @($"ODL{RecMSE.IdxOdl:00000000}") -
    -
    -
    -
    *@ -
    -
    -
    -

    - @RecMSE.Nome -

    -
    -
    -
    -
    - @RecMSE.DescrizioneStato -
    -
    - @(formatDurata(RecMSE.Durata)) +
    +
    +
    + @RecMSE.DescrizioneStato +
    +
    + @(formatDurata(RecMSE.Durata)) +
    -
    -
    -
    -
    - Confermati +
    +
    +
    + Confermati +
    +
    + Prodotti +
    +
    + Ordinati +
    -
    - Prodotti +
    +
    + @($"{RecMSE.PezziConf:N0}") +
    +
    + @($"{RecMSE.PezziProd:N0}") +
    +
    + @($"{RecMSE.NumPezzi:N0}") +
    -
    - Ordinati -
    -
    -
    -
    - @($"{RecMSE.PezziConf:N0}") -
    -
    - @($"{RecMSE.PezziProd:N0}") -
    -
    - @($"{RecMSE.NumPezzi:N0}") -
    -
    -
    -
    - +
    +
    + +
    +
    + +
    } } + From 4b564df8de72a257f8e6e9fa523232ad0354372a Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 5 Oct 2023 16:45:39 +0200 Subject: [PATCH 3/4] ok pagina scheda tecnica --- MP-TAB-SERV/Components/TechSheetDetail.razor | 24 +++++++++++++++---- .../Components/TechSheetDetail.razor.cs | 6 +++++ MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- 6 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 MP-TAB-SERV/Components/TechSheetDetail.razor.cs diff --git a/MP-TAB-SERV/Components/TechSheetDetail.razor b/MP-TAB-SERV/Components/TechSheetDetail.razor index 95a73d89..f654734d 100644 --- a/MP-TAB-SERV/Components/TechSheetDetail.razor +++ b/MP-TAB-SERV/Components/TechSheetDetail.razor @@ -1,5 +1,19 @@ -

    TechSheetDetail

    - -@code { - -} +
    +
    + Scheda Tecnica +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    \ No newline at end of file diff --git a/MP-TAB-SERV/Components/TechSheetDetail.razor.cs b/MP-TAB-SERV/Components/TechSheetDetail.razor.cs new file mode 100644 index 00000000..885b880d --- /dev/null +++ b/MP-TAB-SERV/Components/TechSheetDetail.razor.cs @@ -0,0 +1,6 @@ +namespace MP_TAB_SERV.Components +{ + public partial class TechSheetDetail + { + } +} \ No newline at end of file diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index de401236..a99c8a76 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.515 + 6.16.2310.516 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index e1243fcc..d32cd9bc 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.515

    +

    Versione: 6.16.2310.516


    Note di rilascio:
    • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index 038428d5..de576d66 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.515 +6.16.2310.516 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index b8d8b1ed..ec036ee3 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.515 + 6.16.2310.516 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 From b3aa2e1a9f39c983be938138ed22f63a0d064111 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 5 Oct 2023 17:46:41 +0200 Subject: [PATCH 4/4] ok gestione info iob --- MP-TAB-SERV/Components/IobInfoMan.razor | 8 +++---- MP-TAB-SERV/Components/IobInfoMan.razor.cs | 23 ++++++++++++++++++ MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Pages/IobInfo.razor | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- MP.Data/DTO/IobInfoDTO.cs | 15 ++++++++++++ MP.Data/Services/TabDataService.cs | 28 ++++++++++++++++++++++ 9 files changed, 74 insertions(+), 10 deletions(-) create mode 100644 MP.Data/DTO/IobInfoDTO.cs diff --git a/MP-TAB-SERV/Components/IobInfoMan.razor b/MP-TAB-SERV/Components/IobInfoMan.razor index 0ca74e68..190064bc 100644 --- a/MP-TAB-SERV/Components/IobInfoMan.razor +++ b/MP-TAB-SERV/Components/IobInfoMan.razor @@ -1,5 +1,3 @@ -

      IobInfoMan

      - -@code { - -} +@infosIob.IP +@infosIob.iType +@infosIob.name \ No newline at end of file diff --git a/MP-TAB-SERV/Components/IobInfoMan.razor.cs b/MP-TAB-SERV/Components/IobInfoMan.razor.cs index e69de29b..663f2789 100644 --- a/MP-TAB-SERV/Components/IobInfoMan.razor.cs +++ b/MP-TAB-SERV/Components/IobInfoMan.razor.cs @@ -0,0 +1,23 @@ +using Microsoft.AspNetCore.Components; +using MP.Data.DTO; +using MP.Data.Services; + +namespace MP_TAB_SERV.Components +{ + public partial class IobInfoMan + { + [Parameter] + public string idxMacch { get; set; } = ""; + + [Inject] + protected TabDataService TabSrv { get; set; } = null!; + + protected IobInfoDTO infosIob { get; set; } = new IobInfoDTO(); + + protected override async Task OnInitializedAsync() + { + infosIob = await TabSrv.IobInfo(idxMacch); + } + + } +} \ No newline at end of file diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index a99c8a76..1c95f69b 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.516 + 6.16.2310.517 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Pages/IobInfo.razor b/MP-TAB-SERV/Pages/IobInfo.razor index 2050c2f2..dcf4d33a 100644 --- a/MP-TAB-SERV/Pages/IobInfo.razor +++ b/MP-TAB-SERV/Pages/IobInfo.razor @@ -9,5 +9,5 @@ else
      - + } diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index d32cd9bc..7c4adefc 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.516

      +

      Versione: 6.16.2310.517


      Note di rilascio:
      • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index de576d66..4dcc099c 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.516 +6.16.2310.517 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index ec036ee3..2cb14e29 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.516 + 6.16.2310.517 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.Data/DTO/IobInfoDTO.cs b/MP.Data/DTO/IobInfoDTO.cs new file mode 100644 index 00000000..a0fd39ec --- /dev/null +++ b/MP.Data/DTO/IobInfoDTO.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MP.Data.DTO +{ + public class IobInfoDTO + { + public string name { get; set; } = "ND"; + public string IP { get; set; } = "::1"; + public string iType { get; set; } = "Win"; + } +} diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs index 75e34186..2e0a3dc4 100644 --- a/MP.Data/Services/TabDataService.cs +++ b/MP.Data/Services/TabDataService.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.Configuration; using MP.Data.DatabaseModels; +using MP.Data.DTO; using Newtonsoft.Json; using NLog; using StackExchange.Redis; @@ -157,6 +158,32 @@ namespace MP.Data.Services return result; } + + + + public async Task IobInfo(string IdxMacchina) + { + string source = "DB"; + Stopwatch sw = new Stopwatch(); + sw.Start(); + IobInfoDTO? result = new IobInfoDTO(); + // cerco in redis... + string currKey = $"{moonProRedisBaseKey}:{IdxMacchina}"; + RedisValue rawData = await redisDb.StringGetAsync(currKey); + if (!string.IsNullOrEmpty($"{rawData}")) + { + result = JsonConvert.DeserializeObject($"{rawData}"); + source = "REDIS"; + } + if (result == null) + { + result = new IobInfoDTO(); + } + sw.Stop(); + Log.Debug($"IobInfo | {source} | {sw.Elapsed.TotalMilliseconds}ms"); + return result; + } + public void Dispose() { // Clear database controller @@ -414,6 +441,7 @@ namespace MP.Data.Services private static Logger Log = LogManager.GetCurrentClassLogger(); private string redisBaseKey = "MP:TAB:Cache"; + private string moonProRedisBaseKey = "MoonPro:SQL2016DEV:MoonPro:hM2IOB"; #endregion Private Fields }