Merge branch 'Release/FixTab03Naming02'

.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

MP-TAB3/.config/dotnet-tools.json

@@ -0,0 +1,5 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {}
+}

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]

MP-TAB3/MP-TAB3.csproj

@@ -14,6 +14,8 @@
 
   <ItemGroup>
     <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" />
+    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02.pubxml" />
+    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS04.pubxml" />
     <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfile.pubxml" />
   </ItemGroup>
 

MP-TAB3/Properties/PublishProfiles/IIS02.pubxml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish>https://iis02.egalware.com/MP/TAB3</SiteUrlToLaunchAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <ProjectGuid>e7a7c262-7807-4503-949d-5a6fe3df4400</ProjectGuid>
+    <SelfContained>false</SelfContained>
+    <MSDeployServiceURL>https://iis02.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/MP/TAB3</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>true</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>true</EnableMSDeployBackup>
+    <EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
+    <UserName>jenkins</UserName>
+    <_SavePWD>true</_SavePWD>
+    <_TargetId>IISWebDeploy</_TargetId>
+  </PropertyGroup>
+</Project>

MP-TAB3/Properties/PublishProfiles/IIS04.pubxml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <WebPublishMethod>MSDeploy</WebPublishMethod>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish>https://iis04.egalware.com/MP/TAB3</SiteUrlToLaunchAfterPublish>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <ProjectGuid>e7a7c262-7807-4503-949d-5a6fe3df4400</ProjectGuid>
+    <SelfContained>false</SelfContained>
+    <MSDeployServiceURL>https://iis04.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
+    <DeployIisAppPath>Default Web Site/MP/TAB3</DeployIisAppPath>
+    <RemoteSitePhysicalPath />
+    <SkipExtraFilesOnServer>true</SkipExtraFilesOnServer>
+    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+    <EnableMSDeployBackup>true</EnableMSDeployBackup>
+    <EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
+    <UserName>jenkins</UserName>
+    <_SavePWD>true</_SavePWD>
+    <_TargetId>IISWebDeploy</_TargetId>
+  </PropertyGroup>
+</Project>

MP-TAB3/Properties/PublishProfiles/IISProfile.pubxml

@@ -11,7 +11,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
         <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
         <ExcludeApp_Data>False</ExcludeApp_Data>
         <ProjectGuid>e7a7c262-7807-4503-949d-5a6fe3df4400</ProjectGuid>
-        <DesktopBuildPackageLocation>bin\publish\MP.TAB3.zip</DesktopBuildPackageLocation>
+        <DesktopBuildPackageLocation>bin\publish\MP-TAB3.zip</DesktopBuildPackageLocation>
         <PackageAsSingleFile>true</PackageAsSingleFile>
         <DeployIisAppPath>Default Web Site/MP/TAB3</DeployIisAppPath>
         <TargetFramework>net6.0</TargetFramework>

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;
         }

MP.Land/Resources/ChangeLog.html

@@ -1,5 +1,5 @@
 <body>
-    <i>Modulo gestione Programmi MAPO</i>
+    <i>Modulo Tablet MAPO - DotNet6</i>
     <h4>Versione: 6.16.2312.1811</h4>
     <br />
     Note di rilascio:
@@ -9,9 +9,11 @@
             <ul>{{LAST-CHANGES}}</ul>
         </li>
         <li>
-            <b>v.1.* &rarr;</b>
+            <b>v.6.* &rarr;</b>
             <ul>
-                <li>Prima release dotnet5</li>
+                <li>Release DotNet6/BLazor</li>
+                <li>Realtime update (websockets)</li>
+                <li>Ottimizzazione interfaccia</li>
                 <li>Integrazione EFCore</li>
             </ul>
         </li>