From e715bfe9b007fa8c6ff9faa0863199358caf7b39 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 18 Dec 2023 11:50:51 +0100 Subject: [PATCH 1/4] Aggiunto deploy IIS02/IIS04 x TAB3 --- .../Properties/PublishProfiles/IIS02.pubxml | 26 +++++++++++++++++++ .../Properties/PublishProfiles/IIS04.pubxml | 26 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 MP-TAB3/Properties/PublishProfiles/IIS02.pubxml create mode 100644 MP-TAB3/Properties/PublishProfiles/IIS04.pubxml diff --git a/MP-TAB3/Properties/PublishProfiles/IIS02.pubxml b/MP-TAB3/Properties/PublishProfiles/IIS02.pubxml new file mode 100644 index 00000000..ed89c11d --- /dev/null +++ b/MP-TAB3/Properties/PublishProfiles/IIS02.pubxml @@ -0,0 +1,26 @@ + + + + + MSDeploy + true + Release + Any CPU + https://iis01.egalware.com/MP/TAB3 + false + e7a7c262-7807-4503-949d-5a6fe3df4400 + false + https://iis01.egalware.com:8172/MsDeploy.axd + Default Web Site/MP/TAB3 + + true + WMSVC + true + true + jenkins + <_SavePWD>true + <_TargetId>IISWebDeploy + + \ No newline at end of file diff --git a/MP-TAB3/Properties/PublishProfiles/IIS04.pubxml b/MP-TAB3/Properties/PublishProfiles/IIS04.pubxml new file mode 100644 index 00000000..ed89c11d --- /dev/null +++ b/MP-TAB3/Properties/PublishProfiles/IIS04.pubxml @@ -0,0 +1,26 @@ + + + + + MSDeploy + true + Release + Any CPU + https://iis01.egalware.com/MP/TAB3 + false + e7a7c262-7807-4503-949d-5a6fe3df4400 + false + https://iis01.egalware.com:8172/MsDeploy.axd + Default Web Site/MP/TAB3 + + true + WMSVC + true + true + jenkins + <_SavePWD>true + <_TargetId>IISWebDeploy + + \ No newline at end of file From ddd080905ecd9716c7a975bb67e94f0a34d9c2c7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 18 Dec 2023 11:51:04 +0100 Subject: [PATCH 2/4] update deploy TAB3 su IIS02/IIS04 --- .gitlab-ci.yml | 18 ++++++++++++++++++ MP-TAB3/MP-TAB3.csproj | 2 ++ .../Properties/PublishProfiles/IIS02.pubxml | 4 ++-- .../Properties/PublishProfiles/IIS04.pubxml | 4 ++-- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 378f9e6a..35fab5b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -566,6 +566,24 @@ IOC:IIS02:deploy: - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj +TAB3:IIS02:deploy: + stage: deploy + tags: + - win + variables: + APP_NAME: MP-TAB3 + SOL_NAME: MP-TAB3 + before_script: + - *nuget-fix + - dotnet restore "$env:SOL_NAME.sln" + rules: + - if: $CI_COMMIT_BRANCH == 'master' + needs: ["IOC:build"] + script: + - dotnet build $env:APP_NAME/$env:APP_NAME.csproj + - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + - dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj + # ----- Start INSTALLER (develop/master) ----- LAND:installer: stage: installer diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 9ea27865..6c8f14ed 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -14,6 +14,8 @@ <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02.pubxml" /> + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS04.pubxml" /> <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfile.pubxml" /> diff --git a/MP-TAB3/Properties/PublishProfiles/IIS02.pubxml b/MP-TAB3/Properties/PublishProfiles/IIS02.pubxml index ed89c11d..7590d6fc 100644 --- a/MP-TAB3/Properties/PublishProfiles/IIS02.pubxml +++ b/MP-TAB3/Properties/PublishProfiles/IIS02.pubxml @@ -8,11 +8,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121. true Release Any CPU - https://iis01.egalware.com/MP/TAB3 + https://iis02.egalware.com/MP/TAB3 false e7a7c262-7807-4503-949d-5a6fe3df4400 false - https://iis01.egalware.com:8172/MsDeploy.axd + https://iis02.egalware.com:8172/MsDeploy.axd Default Web Site/MP/TAB3 true diff --git a/MP-TAB3/Properties/PublishProfiles/IIS04.pubxml b/MP-TAB3/Properties/PublishProfiles/IIS04.pubxml index ed89c11d..d13fe48d 100644 --- a/MP-TAB3/Properties/PublishProfiles/IIS04.pubxml +++ b/MP-TAB3/Properties/PublishProfiles/IIS04.pubxml @@ -8,11 +8,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121. true Release Any CPU - https://iis01.egalware.com/MP/TAB3 + https://iis04.egalware.com/MP/TAB3 false e7a7c262-7807-4503-949d-5a6fe3df4400 false - https://iis01.egalware.com:8172/MsDeploy.axd + https://iis04.egalware.com:8172/MsDeploy.axd Default Web Site/MP/TAB3 true From cbe4cf5bf43f2c3fa43d665123c3335d7737d239 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 18 Dec 2023 11:55:27 +0100 Subject: [PATCH 3/4] aggiunto colore rosso x fermate e fix refresh post fine attrezzaggio --- MP-TAB3/Components/LongStopList.razor.cs | 5 +++++ MP.Data/Services/TabDataService.cs | 1 + 2 files changed, 6 insertions(+) diff --git a/MP-TAB3/Components/LongStopList.razor.cs b/MP-TAB3/Components/LongStopList.razor.cs index f135d0e7..5a9c13a8 100644 --- a/MP-TAB3/Components/LongStopList.razor.cs +++ b/MP-TAB3/Components/LongStopList.razor.cs @@ -106,6 +106,11 @@ namespace MP_TAB3.Components answ = "bg-warning text-dark"; borderColor = "border-warning"; } + else if (sem == "sRo") + { + answ = "bg-danger text-light"; + borderColor = "border-danger"; + } return answ; } [Inject] diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs index fc1d6702..491627f5 100644 --- a/MP.Data/Services/TabDataService.cs +++ b/MP.Data/Services/TabDataService.cs @@ -2368,6 +2368,7 @@ namespace MP.Data.Services { bool answ = false; answ = dbTabController.RicalcMse(idxMacchina, maxAgeSec); + await FlushOdlCache(); await FlushCache(Constants.redisMseKey); return answ; } From 0f0774efac9a0fd1c9f923b14ceff52abe70f456 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 18 Dec 2023 11:58:50 +0100 Subject: [PATCH 4/4] Fix target public tab3 --- MP-TAB3/.config/dotnet-tools.json | 5 +++++ MP-TAB3/Properties/PublishProfiles/IISProfile.pubxml | 2 +- MP.Land/Resources/ChangeLog.html | 8 +++++--- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 MP-TAB3/.config/dotnet-tools.json diff --git a/MP-TAB3/.config/dotnet-tools.json b/MP-TAB3/.config/dotnet-tools.json new file mode 100644 index 00000000..b0e38abd --- /dev/null +++ b/MP-TAB3/.config/dotnet-tools.json @@ -0,0 +1,5 @@ +{ + "version": 1, + "isRoot": true, + "tools": {} +} \ No newline at end of file diff --git a/MP-TAB3/Properties/PublishProfiles/IISProfile.pubxml b/MP-TAB3/Properties/PublishProfiles/IISProfile.pubxml index 1e9feb4c..00b2ea98 100644 --- a/MP-TAB3/Properties/PublishProfiles/IISProfile.pubxml +++ b/MP-TAB3/Properties/PublishProfiles/IISProfile.pubxml @@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. True False e7a7c262-7807-4503-949d-5a6fe3df4400 - bin\publish\MP.TAB3.zip + bin\publish\MP-TAB3.zip true Default Web Site/MP/TAB3 net6.0 diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 84ad57ef..7a6fd26d 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,5 +1,5 @@ - Modulo gestione Programmi MAPO + Modulo Tablet MAPO - DotNet6

Versione: 6.16.2312.1811


Note di rilascio: @@ -9,9 +9,11 @@
    {{LAST-CHANGES}}
  • - v.1.* → + v.6.* →
      -
    • Prima release dotnet5
      • +
    • Release DotNet6/BLazor
      • +
    • Realtime update (websockets)
      • +
    • Ottimizzazione interfaccia
    • Integrazione EFCore