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/.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/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-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 new file mode 100644 index 00000000..7590d6fc --- /dev/null +++ b/MP-TAB3/Properties/PublishProfiles/IIS02.pubxml @@ -0,0 +1,26 @@ + + + + + MSDeploy + true + Release + Any CPU + https://iis02.egalware.com/MP/TAB3 + false + e7a7c262-7807-4503-949d-5a6fe3df4400 + false + https://iis02.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..d13fe48d --- /dev/null +++ b/MP-TAB3/Properties/PublishProfiles/IIS04.pubxml @@ -0,0 +1,26 @@ + + + + + MSDeploy + true + Release + Any CPU + https://iis04.egalware.com/MP/TAB3 + false + e7a7c262-7807-4503-949d-5a6fe3df4400 + false + https://iis04.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/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.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; } 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 @@
  • - v.1.* → + v.6.* →