Merge branch 'develop' into SDK

Fix gestione chiamata contapezzi corrente su doppia tavola

.gitlab-ci.yml

@@ -271,7 +271,7 @@ ADM:staging:
    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj'
  needs: ["ADM:build"]
  
 IO:staging:
@@ -285,7 +285,7 @@ IO:staging:
    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj'
  needs: ["IO:build"]
 
 SITE:staging:
@@ -299,7 +299,7 @@ SITE:staging:
    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
  needs: ["SITE:build"]
 
 # MON:staging:
@@ -313,7 +313,7 @@ SITE:staging:
 #    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
 #    - *version-fix
 #  script: 
-#    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
+#    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
 #  needs: ["MON:build"]
  
 TAB:staging:
@@ -327,7 +327,7 @@ TAB:staging:
    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj'
  needs: ["TAB:build"]
  
 MAG:staging:
@@ -341,7 +341,7 @@ MAG:staging:
    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj'
  needs: ["MAG:build"]
 
 ADM:deploy:
@@ -355,7 +355,7 @@ ADM:deploy:
    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj'
  needs: ["ADM:build"]
  
 IO:deploy:
@@ -369,7 +369,7 @@ IO:deploy:
    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj'
  needs: ["IO:build"]
  
 SITE:deploy:
@@ -383,7 +383,7 @@ SITE:deploy:
    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
  needs: ["SITE:build"]
 
 # MON:deploy:
@@ -397,7 +397,7 @@ SITE:deploy:
 #    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
 #    - *version-fix
 #  script: 
-#    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
+#    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
 #  needs: ["MON:build"]
  
 TAB:deploy:
@@ -411,7 +411,7 @@ TAB:deploy:
    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj'
  needs: ["TAB:build"]
  
 MAG:deploy:
@@ -425,7 +425,7 @@ MAG:deploy:
    - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'  
    - *version-fix
  script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS03 /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj'
+   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj'
  needs: ["MAG:build"]
 
 ADM:install:

MP-ADM/Content/bootstrap-grid.css

@@ -1,6 +1,6 @@
 /*!
- * Bootstrap Grid v5.3.1 (https://getbootstrap.com/)
- * Copyright 2011-2023 The Bootstrap Authors
+ * Bootstrap Grid v5.3.3 (https://getbootstrap.com/)
+ * Copyright 2011-2024 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 .container,
@@ -93,7 +93,7 @@
 
 .row-cols-3 > * {
   flex: 0 0 auto;
-  width: 33.3333333333%;
+  width: 33.33333333%;
 }
 
 .row-cols-4 > * {
@@ -108,7 +108,7 @@
 
 .row-cols-6 > * {
   flex: 0 0 auto;
-  width: 16.6666666667%;
+  width: 16.66666667%;
 }
 
 .col-auto {
@@ -298,7 +298,7 @@
   }
   .row-cols-sm-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-sm-4 > * {
     flex: 0 0 auto;
@@ -310,7 +310,7 @@
   }
   .row-cols-sm-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-sm-auto {
     flex: 0 0 auto;
@@ -467,7 +467,7 @@
   }
   .row-cols-md-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-md-4 > * {
     flex: 0 0 auto;
@@ -479,7 +479,7 @@
   }
   .row-cols-md-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-md-auto {
     flex: 0 0 auto;
@@ -636,7 +636,7 @@
   }
   .row-cols-lg-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-lg-4 > * {
     flex: 0 0 auto;
@@ -648,7 +648,7 @@
   }
   .row-cols-lg-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-lg-auto {
     flex: 0 0 auto;
@@ -805,7 +805,7 @@
   }
   .row-cols-xl-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-xl-4 > * {
     flex: 0 0 auto;
@@ -817,7 +817,7 @@
   }
   .row-cols-xl-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-xl-auto {
     flex: 0 0 auto;
@@ -974,7 +974,7 @@
   }
   .row-cols-xxl-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-xxl-4 > * {
     flex: 0 0 auto;
@@ -986,7 +986,7 @@
   }
   .row-cols-xxl-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-xxl-auto {
     flex: 0 0 auto;

MP-ADM/Content/bootstrap-grid.rtl.css

@@ -1,6 +1,6 @@
 /*!
- * Bootstrap Grid v5.3.1 (https://getbootstrap.com/)
- * Copyright 2011-2023 The Bootstrap Authors
+ * Bootstrap Grid v5.3.3 (https://getbootstrap.com/)
+ * Copyright 2011-2024 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 .container,
@@ -93,7 +93,7 @@
 
 .row-cols-3 > * {
   flex: 0 0 auto;
-  width: 33.3333333333%;
+  width: 33.33333333%;
 }
 
 .row-cols-4 > * {
@@ -108,7 +108,7 @@
 
 .row-cols-6 > * {
   flex: 0 0 auto;
-  width: 16.6666666667%;
+  width: 16.66666667%;
 }
 
 .col-auto {
@@ -298,7 +298,7 @@
   }
   .row-cols-sm-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-sm-4 > * {
     flex: 0 0 auto;
@@ -310,7 +310,7 @@
   }
   .row-cols-sm-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-sm-auto {
     flex: 0 0 auto;
@@ -467,7 +467,7 @@
   }
   .row-cols-md-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-md-4 > * {
     flex: 0 0 auto;
@@ -479,7 +479,7 @@
   }
   .row-cols-md-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-md-auto {
     flex: 0 0 auto;
@@ -636,7 +636,7 @@
   }
   .row-cols-lg-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-lg-4 > * {
     flex: 0 0 auto;
@@ -648,7 +648,7 @@
   }
   .row-cols-lg-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-lg-auto {
     flex: 0 0 auto;
@@ -805,7 +805,7 @@
   }
   .row-cols-xl-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-xl-4 > * {
     flex: 0 0 auto;
@@ -817,7 +817,7 @@
   }
   .row-cols-xl-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-xl-auto {
     flex: 0 0 auto;
@@ -974,7 +974,7 @@
   }
   .row-cols-xxl-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-xxl-4 > * {
     flex: 0 0 auto;
@@ -986,7 +986,7 @@
   }
   .row-cols-xxl-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-xxl-auto {
     flex: 0 0 auto;

MP-ADM/Content/bootstrap-reboot.css

@@ -1,6 +1,6 @@
 /*!
- * Bootstrap Reboot v5.3.1 (https://getbootstrap.com/)
- * Copyright 2011-2023 The Bootstrap Authors
+ * Bootstrap Reboot v5.3.3 (https://getbootstrap.com/)
+ * Copyright 2011-2024 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 :root,
@@ -98,6 +98,7 @@
   --bs-link-hover-color: #0a58ca;
   --bs-link-hover-color-rgb: 10, 88, 202;
   --bs-code-color: #d63384;
+  --bs-highlight-color: #212529;
   --bs-highlight-bg: #fff3cd;
   --bs-border-width: 1px;
   --bs-border-style: solid;
@@ -169,6 +170,8 @@
   --bs-link-color-rgb: 110, 168, 254;
   --bs-link-hover-color-rgb: 139, 185, 254;
   --bs-code-color: #e685b5;
+  --bs-highlight-color: #dee2e6;
+  --bs-highlight-bg: #664d03;
   --bs-border-color: #495057;
   --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
   --bs-form-valid-color: #75b798;
@@ -324,6 +327,7 @@ small {
 
 mark {
   padding: 0.1875em;
+  color: var(--bs-highlight-color);
   background-color: var(--bs-highlight-bg);
 }
 

MP-ADM/Content/bootstrap-reboot.rtl.css

@@ -1,6 +1,6 @@
 /*!
- * Bootstrap Reboot v5.3.1 (https://getbootstrap.com/)
- * Copyright 2011-2023 The Bootstrap Authors
+ * Bootstrap Reboot v5.3.3 (https://getbootstrap.com/)
+ * Copyright 2011-2024 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 :root,
@@ -98,6 +98,7 @@
   --bs-link-hover-color: #0a58ca;
   --bs-link-hover-color-rgb: 10, 88, 202;
   --bs-code-color: #d63384;
+  --bs-highlight-color: #212529;
   --bs-highlight-bg: #fff3cd;
   --bs-border-width: 1px;
   --bs-border-style: solid;
@@ -169,6 +170,8 @@
   --bs-link-color-rgb: 110, 168, 254;
   --bs-link-hover-color-rgb: 139, 185, 254;
   --bs-code-color: #e685b5;
+  --bs-highlight-color: #dee2e6;
+  --bs-highlight-bg: #664d03;
   --bs-border-color: #495057;
   --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
   --bs-form-valid-color: #75b798;
@@ -324,6 +327,7 @@ small {
 
 mark {
   padding: 0.1875em;
+  color: var(--bs-highlight-color);
   background-color: var(--bs-highlight-bg);
 }
 

MP-ADM/Content/bootstrap-utilities.css

@@ -1,6 +1,6 @@
 /*!
- * Bootstrap Utilities v5.3.1 (https://getbootstrap.com/)
- * Copyright 2011-2023 The Bootstrap Authors
+ * Bootstrap Utilities v5.3.3 (https://getbootstrap.com/)
+ * Copyright 2011-2024 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 :root,
@@ -98,6 +98,7 @@
   --bs-link-hover-color: #0a58ca;
   --bs-link-hover-color-rgb: 10, 88, 202;
   --bs-code-color: #d63384;
+  --bs-highlight-color: #212529;
   --bs-highlight-bg: #fff3cd;
   --bs-border-width: 1px;
   --bs-border-style: solid;
@@ -169,6 +170,8 @@
   --bs-link-color-rgb: 110, 168, 254;
   --bs-link-hover-color-rgb: 139, 185, 254;
   --bs-code-color: #e685b5;
+  --bs-highlight-color: #dee2e6;
+  --bs-highlight-bg: #664d03;
   --bs-border-color: #495057;
   --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
   --bs-form-valid-color: #75b798;
@@ -716,15 +719,15 @@
 }
 
 .shadow {
-  box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;
+  box-shadow: var(--bs-box-shadow) !important;
 }
 
 .shadow-sm {
-  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;
+  box-shadow: var(--bs-box-shadow-sm) !important;
 }
 
 .shadow-lg {
-  box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important;
+  box-shadow: var(--bs-box-shadow-lg) !important;
 }
 
 .shadow-none {

MP-ADM/Content/bootstrap-utilities.rtl.css

@@ -1,6 +1,6 @@
 /*!
- * Bootstrap Utilities v5.3.1 (https://getbootstrap.com/)
- * Copyright 2011-2023 The Bootstrap Authors
+ * Bootstrap Utilities v5.3.3 (https://getbootstrap.com/)
+ * Copyright 2011-2024 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 :root,
@@ -98,6 +98,7 @@
   --bs-link-hover-color: #0a58ca;
   --bs-link-hover-color-rgb: 10, 88, 202;
   --bs-code-color: #d63384;
+  --bs-highlight-color: #212529;
   --bs-highlight-bg: #fff3cd;
   --bs-border-width: 1px;
   --bs-border-style: solid;
@@ -169,6 +170,8 @@
   --bs-link-color-rgb: 110, 168, 254;
   --bs-link-hover-color-rgb: 139, 185, 254;
   --bs-code-color: #e685b5;
+  --bs-highlight-color: #dee2e6;
+  --bs-highlight-bg: #664d03;
   --bs-border-color: #495057;
   --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
   --bs-form-valid-color: #75b798;
@@ -716,15 +719,15 @@
 }
 
 .shadow {
-  box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;
+  box-shadow: var(--bs-box-shadow) !important;
 }
 
 .shadow-sm {
-  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;
+  box-shadow: var(--bs-box-shadow-sm) !important;
 }
 
 .shadow-lg {
-  box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important;
+  box-shadow: var(--bs-box-shadow-lg) !important;
 }
 
 .shadow-none {

MP-ADM/Content/bootstrap.css

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 /*!
- * Bootstrap  v5.3.1 (https://getbootstrap.com/)
- * Copyright 2011-2023 The Bootstrap Authors
+ * Bootstrap  v5.3.3 (https://getbootstrap.com/)
+ * Copyright 2011-2024 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 :root,
@@ -99,6 +99,7 @@
   --bs-link-hover-color: #0a58ca;
   --bs-link-hover-color-rgb: 10, 88, 202;
   --bs-code-color: #d63384;
+  --bs-highlight-color: #212529;
   --bs-highlight-bg: #fff3cd;
   --bs-border-width: 1px;
   --bs-border-style: solid;
@@ -170,6 +171,8 @@
   --bs-link-color-rgb: 110, 168, 254;
   --bs-link-hover-color-rgb: 139, 185, 254;
   --bs-code-color: #e685b5;
+  --bs-highlight-color: #dee2e6;
+  --bs-highlight-bg: #664d03;
   --bs-border-color: #495057;
   --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
   --bs-form-valid-color: #75b798;
@@ -325,6 +328,7 @@ small, .small {
 
 mark, .mark {
   padding: 0.1875em;
+  color: var(--bs-highlight-color);
   background-color: var(--bs-highlight-bg);
 }
 
@@ -819,7 +823,7 @@ progress {
 
 .row-cols-3 > * {
   flex: 0 0 auto;
-  width: 33.3333333333%;
+  width: 33.33333333%;
 }
 
 .row-cols-4 > * {
@@ -834,7 +838,7 @@ progress {
 
 .row-cols-6 > * {
   flex: 0 0 auto;
-  width: 16.6666666667%;
+  width: 16.66666667%;
 }
 
 .col-auto {
@@ -1024,7 +1028,7 @@ progress {
   }
   .row-cols-sm-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-sm-4 > * {
     flex: 0 0 auto;
@@ -1036,7 +1040,7 @@ progress {
   }
   .row-cols-sm-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-sm-auto {
     flex: 0 0 auto;
@@ -1193,7 +1197,7 @@ progress {
   }
   .row-cols-md-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-md-4 > * {
     flex: 0 0 auto;
@@ -1205,7 +1209,7 @@ progress {
   }
   .row-cols-md-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-md-auto {
     flex: 0 0 auto;
@@ -1362,7 +1366,7 @@ progress {
   }
   .row-cols-lg-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-lg-4 > * {
     flex: 0 0 auto;
@@ -1374,7 +1378,7 @@ progress {
   }
   .row-cols-lg-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-lg-auto {
     flex: 0 0 auto;
@@ -1531,7 +1535,7 @@ progress {
   }
   .row-cols-xl-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-xl-4 > * {
     flex: 0 0 auto;
@@ -1543,7 +1547,7 @@ progress {
   }
   .row-cols-xl-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-xl-auto {
     flex: 0 0 auto;
@@ -1700,7 +1704,7 @@ progress {
   }
   .row-cols-xxl-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-xxl-4 > * {
     flex: 0 0 auto;
@@ -1712,7 +1716,7 @@ progress {
   }
   .row-cols-xxl-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-xxl-auto {
     flex: 0 0 auto;
@@ -1856,16 +1860,16 @@ progress {
   --bs-table-bg-type: initial;
   --bs-table-color-state: initial;
   --bs-table-bg-state: initial;
-  --bs-table-color: var(--bs-body-color);
+  --bs-table-color: var(--bs-emphasis-color);
   --bs-table-bg: var(--bs-body-bg);
   --bs-table-border-color: var(--bs-border-color);
   --bs-table-accent-bg: transparent;
-  --bs-table-striped-color: var(--bs-body-color);
-  --bs-table-striped-bg: rgba(0, 0, 0, 0.05);
-  --bs-table-active-color: var(--bs-body-color);
-  --bs-table-active-bg: rgba(0, 0, 0, 0.1);
-  --bs-table-hover-color: var(--bs-body-color);
-  --bs-table-hover-bg: rgba(0, 0, 0, 0.075);
+  --bs-table-striped-color: var(--bs-emphasis-color);
+  --bs-table-striped-bg: rgba(var(--bs-emphasis-color-rgb), 0.05);
+  --bs-table-active-color: var(--bs-emphasis-color);
+  --bs-table-active-bg: rgba(var(--bs-emphasis-color-rgb), 0.1);
+  --bs-table-hover-color: var(--bs-emphasis-color);
+  --bs-table-hover-bg: rgba(var(--bs-emphasis-color-rgb), 0.075);
   width: 100%;
   margin-bottom: 1rem;
   vertical-align: top;
@@ -1934,7 +1938,7 @@ progress {
 .table-primary {
   --bs-table-color: #000;
   --bs-table-bg: #cfe2ff;
-  --bs-table-border-color: #bacbe6;
+  --bs-table-border-color: #a6b5cc;
   --bs-table-striped-bg: #c5d7f2;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #bacbe6;
@@ -1948,7 +1952,7 @@ progress {
 .table-secondary {
   --bs-table-color: #000;
   --bs-table-bg: #e2e3e5;
-  --bs-table-border-color: #cbccce;
+  --bs-table-border-color: #b5b6b7;
   --bs-table-striped-bg: #d7d8da;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #cbccce;
@@ -1962,7 +1966,7 @@ progress {
 .table-success {
   --bs-table-color: #000;
   --bs-table-bg: #d1e7dd;
-  --bs-table-border-color: #bcd0c7;
+  --bs-table-border-color: #a7b9b1;
   --bs-table-striped-bg: #c7dbd2;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #bcd0c7;
@@ -1976,7 +1980,7 @@ progress {
 .table-info {
   --bs-table-color: #000;
   --bs-table-bg: #cff4fc;
-  --bs-table-border-color: #badce3;
+  --bs-table-border-color: #a6c3ca;
   --bs-table-striped-bg: #c5e8ef;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #badce3;
@@ -1990,7 +1994,7 @@ progress {
 .table-warning {
   --bs-table-color: #000;
   --bs-table-bg: #fff3cd;
-  --bs-table-border-color: #e6dbb9;
+  --bs-table-border-color: #ccc2a4;
   --bs-table-striped-bg: #f2e7c3;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #e6dbb9;
@@ -2004,7 +2008,7 @@ progress {
 .table-danger {
   --bs-table-color: #000;
   --bs-table-bg: #f8d7da;
-  --bs-table-border-color: #dfc2c4;
+  --bs-table-border-color: #c6acae;
   --bs-table-striped-bg: #eccccf;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #dfc2c4;
@@ -2018,7 +2022,7 @@ progress {
 .table-light {
   --bs-table-color: #000;
   --bs-table-bg: #f8f9fa;
-  --bs-table-border-color: #dfe0e1;
+  --bs-table-border-color: #c6c7c8;
   --bs-table-striped-bg: #ecedee;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #dfe0e1;
@@ -2032,7 +2036,7 @@ progress {
 .table-dark {
   --bs-table-color: #fff;
   --bs-table-bg: #212529;
-  --bs-table-border-color: #373b3e;
+  --bs-table-border-color: #4d5154;
   --bs-table-striped-bg: #2c3034;
   --bs-table-striped-color: #fff;
   --bs-table-active-bg: #373b3e;
@@ -2388,6 +2392,7 @@ textarea.form-control-lg {
 
 .form-check-input {
   --bs-form-check-bg: var(--bs-body-bg);
+  flex-shrink: 0;
   width: 1em;
   height: 1em;
   margin-top: 0.25em;
@@ -2544,7 +2549,7 @@ textarea.form-control-lg {
   height: 0.5rem;
   color: transparent;
   cursor: pointer;
-  background-color: var(--bs-tertiary-bg);
+  background-color: var(--bs-secondary-bg);
   border-color: transparent;
   border-radius: 1rem;
 }
@@ -2573,7 +2578,7 @@ textarea.form-control-lg {
   height: 0.5rem;
   color: transparent;
   cursor: pointer;
-  background-color: var(--bs-tertiary-bg);
+  background-color: var(--bs-secondary-bg);
   border-color: transparent;
   border-radius: 1rem;
 }
@@ -3037,6 +3042,9 @@ textarea.form-control-lg {
 .btn-check:checked + .btn:focus-visible, :not(.btn-check) + .btn:active:focus-visible, .btn:first-child:active:focus-visible, .btn.active:focus-visible, .btn.show:focus-visible {
   box-shadow: var(--bs-btn-focus-box-shadow);
 }
+.btn-check:checked:focus-visible + .btn {
+  box-shadow: var(--bs-btn-focus-box-shadow);
+}
 .btn:disabled, .btn.disabled, fieldset:disabled .btn {
   color: var(--bs-btn-disabled-color);
   pointer-events: none;
@@ -3431,7 +3439,7 @@ textarea.form-control-lg {
   --bs-dropdown-inner-border-radius: calc(var(--bs-border-radius) - var(--bs-border-width));
   --bs-dropdown-divider-bg: var(--bs-border-color-translucent);
   --bs-dropdown-divider-margin-y: 0.5rem;
-  --bs-dropdown-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+  --bs-dropdown-box-shadow: var(--bs-box-shadow);
   --bs-dropdown-link-color: var(--bs-body-color);
   --bs-dropdown-link-hover-color: var(--bs-body-color);
   --bs-dropdown-link-hover-bg: var(--bs-tertiary-bg);
@@ -4568,12 +4576,11 @@ textarea.form-control-lg {
   --bs-accordion-btn-padding-y: 1rem;
   --bs-accordion-btn-color: var(--bs-body-color);
   --bs-accordion-btn-bg: var(--bs-accordion-bg);
-  --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23212529'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
+  --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='%23212529' stroke-linecap='round' stroke-linejoin='round'%3e%3cpath d='M2 5L8 11L14 5'/%3e%3c/svg%3e");
   --bs-accordion-btn-icon-width: 1.25rem;
   --bs-accordion-btn-icon-transform: rotate(-180deg);
   --bs-accordion-btn-icon-transition: transform 0.2s ease-in-out;
-  --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23052c65'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
-  --bs-accordion-btn-focus-border-color: #86b7fe;
+  --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='%23052c65' stroke-linecap='round' stroke-linejoin='round'%3e%3cpath d='M2 5L8 11L14 5'/%3e%3c/svg%3e");
   --bs-accordion-btn-focus-box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
   --bs-accordion-body-padding-x: 1.25rem;
   --bs-accordion-body-padding-y: 1rem;
@@ -4631,7 +4638,6 @@ textarea.form-control-lg {
 }
 .accordion-button:focus {
   z-index: 3;
-  border-color: var(--bs-accordion-btn-focus-border-color);
   outline: 0;
   box-shadow: var(--bs-accordion-btn-focus-box-shadow);
 }
@@ -4649,7 +4655,7 @@ textarea.form-control-lg {
   border-top-left-radius: var(--bs-accordion-border-radius);
   border-top-right-radius: var(--bs-accordion-border-radius);
 }
-.accordion-item:first-of-type .accordion-button {
+.accordion-item:first-of-type > .accordion-header .accordion-button {
   border-top-left-radius: var(--bs-accordion-inner-border-radius);
   border-top-right-radius: var(--bs-accordion-inner-border-radius);
 }
@@ -4660,11 +4666,11 @@ textarea.form-control-lg {
   border-bottom-right-radius: var(--bs-accordion-border-radius);
   border-bottom-left-radius: var(--bs-accordion-border-radius);
 }
-.accordion-item:last-of-type .accordion-button.collapsed {
+.accordion-item:last-of-type > .accordion-header .accordion-button.collapsed {
   border-bottom-right-radius: var(--bs-accordion-inner-border-radius);
   border-bottom-left-radius: var(--bs-accordion-inner-border-radius);
 }
-.accordion-item:last-of-type .accordion-collapse {
+.accordion-item:last-of-type > .accordion-collapse {
   border-bottom-right-radius: var(--bs-accordion-border-radius);
   border-bottom-left-radius: var(--bs-accordion-border-radius);
 }
@@ -4673,21 +4679,21 @@ textarea.form-control-lg {
   padding: var(--bs-accordion-body-padding-y) var(--bs-accordion-body-padding-x);
 }
 
-.accordion-flush .accordion-collapse {
-  border-width: 0;
-}
-.accordion-flush .accordion-item {
+.accordion-flush > .accordion-item {
   border-right: 0;
   border-left: 0;
   border-radius: 0;
 }
-.accordion-flush .accordion-item:first-child {
+.accordion-flush > .accordion-item:first-child {
   border-top: 0;
 }
-.accordion-flush .accordion-item:last-child {
+.accordion-flush > .accordion-item:last-child {
   border-bottom: 0;
 }
-.accordion-flush .accordion-item .accordion-button, .accordion-flush .accordion-item .accordion-button.collapsed {
+.accordion-flush > .accordion-item > .accordion-header .accordion-button, .accordion-flush > .accordion-item > .accordion-header .accordion-button.collapsed {
+  border-radius: 0;
+}
+.accordion-flush > .accordion-item > .accordion-collapse {
   border-radius: 0;
 }
 
@@ -5473,7 +5479,7 @@ textarea.form-control-lg {
   --bs-modal-border-color: var(--bs-border-color-translucent);
   --bs-modal-border-width: var(--bs-border-width);
   --bs-modal-border-radius: var(--bs-border-radius-lg);
-  --bs-modal-box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+  --bs-modal-box-shadow: var(--bs-box-shadow-sm);
   --bs-modal-inner-border-radius: calc(var(--bs-border-radius-lg) - (var(--bs-border-width)));
   --bs-modal-header-padding-x: 1rem;
   --bs-modal-header-padding-y: 1rem;
@@ -5573,7 +5579,6 @@ textarea.form-control-lg {
   display: flex;
   flex-shrink: 0;
   align-items: center;
-  justify-content: space-between;
   padding: var(--bs-modal-header-padding);
   border-bottom: var(--bs-modal-header-border-width) solid var(--bs-modal-header-border-color);
   border-top-left-radius: var(--bs-modal-inner-border-radius);
@@ -5614,7 +5619,7 @@ textarea.form-control-lg {
 @media (min-width: 576px) {
   .modal {
     --bs-modal-margin: 1.75rem;
-    --bs-modal-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+    --bs-modal-box-shadow: var(--bs-box-shadow);
   }
   .modal-dialog {
     max-width: var(--bs-modal-width);
@@ -5866,7 +5871,7 @@ textarea.form-control-lg {
   --bs-popover-border-color: var(--bs-border-color-translucent);
   --bs-popover-border-radius: var(--bs-border-radius-lg);
   --bs-popover-inner-border-radius: calc(var(--bs-border-radius-lg) - var(--bs-border-width));
-  --bs-popover-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+  --bs-popover-box-shadow: var(--bs-box-shadow);
   --bs-popover-header-padding-x: 1rem;
   --bs-popover-header-padding-y: 0.5rem;
   --bs-popover-header-font-size: 1rem;
@@ -6139,20 +6144,12 @@ textarea.form-control-lg {
   background-size: 100% 100%;
 }
 
-/* rtl:options: {
-  "autoRename": true,
-  "stringMap":[ {
-    "name"    : "prev-next",
-    "search"  : "prev",
-    "replace" : "next"
-  } ]
-} */
 .carousel-control-prev-icon {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'/%3e%3c/svg%3e");
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'/%3e%3c/svg%3e") /*rtl:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e")*/;
 }
 
 .carousel-control-next-icon {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e") /*rtl:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'/%3e%3c/svg%3e")*/;
 }
 
 .carousel-indicators {
@@ -6301,7 +6298,7 @@ textarea.form-control-lg {
   --bs-offcanvas-bg: var(--bs-body-bg);
   --bs-offcanvas-border-width: var(--bs-border-width);
   --bs-offcanvas-border-color: var(--bs-border-color-translucent);
-  --bs-offcanvas-box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+  --bs-offcanvas-box-shadow: var(--bs-box-shadow-sm);
   --bs-offcanvas-transition: transform 0.3s ease-in-out;
   --bs-offcanvas-title-line-height: 1.5;
 }
@@ -6772,14 +6769,11 @@ textarea.form-control-lg {
 .offcanvas-header {
   display: flex;
   align-items: center;
-  justify-content: space-between;
   padding: var(--bs-offcanvas-padding-y) var(--bs-offcanvas-padding-x);
 }
 .offcanvas-header .btn-close {
   padding: calc(var(--bs-offcanvas-padding-y) * 0.5) calc(var(--bs-offcanvas-padding-x) * 0.5);
-  margin-top: calc(-0.5 * var(--bs-offcanvas-padding-y));
-  margin-right: calc(-0.5 * var(--bs-offcanvas-padding-x));
-  margin-bottom: calc(-0.5 * var(--bs-offcanvas-padding-y));
+  margin: calc(-0.5 * var(--bs-offcanvas-padding-y)) calc(-0.5 * var(--bs-offcanvas-padding-x)) calc(-0.5 * var(--bs-offcanvas-padding-y)) auto;
 }
 
 .offcanvas-title {
@@ -7380,15 +7374,15 @@ textarea.form-control-lg {
 }
 
 .shadow {
-  box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;
+  box-shadow: var(--bs-box-shadow) !important;
 }
 
 .shadow-sm {
-  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;
+  box-shadow: var(--bs-box-shadow-sm) !important;
 }
 
 .shadow-lg {
-  box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important;
+  box-shadow: var(--bs-box-shadow-lg) !important;
 }
 
 .shadow-none {

MP-ADM/Content/bootstrap.rtl.css

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 /*!
- * Bootstrap  v5.3.1 (https://getbootstrap.com/)
- * Copyright 2011-2023 The Bootstrap Authors
+ * Bootstrap  v5.3.3 (https://getbootstrap.com/)
+ * Copyright 2011-2024 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 :root,
@@ -99,6 +99,7 @@
   --bs-link-hover-color: #0a58ca;
   --bs-link-hover-color-rgb: 10, 88, 202;
   --bs-code-color: #d63384;
+  --bs-highlight-color: #212529;
   --bs-highlight-bg: #fff3cd;
   --bs-border-width: 1px;
   --bs-border-style: solid;
@@ -170,6 +171,8 @@
   --bs-link-color-rgb: 110, 168, 254;
   --bs-link-hover-color-rgb: 139, 185, 254;
   --bs-code-color: #e685b5;
+  --bs-highlight-color: #dee2e6;
+  --bs-highlight-bg: #664d03;
   --bs-border-color: #495057;
   --bs-border-color-translucent: rgba(255, 255, 255, 0.15);
   --bs-form-valid-color: #75b798;
@@ -325,6 +328,7 @@ small, .small {
 
 mark, .mark {
   padding: 0.1875em;
+  color: var(--bs-highlight-color);
   background-color: var(--bs-highlight-bg);
 }
 
@@ -817,7 +821,7 @@ progress {
 
 .row-cols-3 > * {
   flex: 0 0 auto;
-  width: 33.3333333333%;
+  width: 33.33333333%;
 }
 
 .row-cols-4 > * {
@@ -832,7 +836,7 @@ progress {
 
 .row-cols-6 > * {
   flex: 0 0 auto;
-  width: 16.6666666667%;
+  width: 16.66666667%;
 }
 
 .col-auto {
@@ -1022,7 +1026,7 @@ progress {
   }
   .row-cols-sm-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-sm-4 > * {
     flex: 0 0 auto;
@@ -1034,7 +1038,7 @@ progress {
   }
   .row-cols-sm-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-sm-auto {
     flex: 0 0 auto;
@@ -1191,7 +1195,7 @@ progress {
   }
   .row-cols-md-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-md-4 > * {
     flex: 0 0 auto;
@@ -1203,7 +1207,7 @@ progress {
   }
   .row-cols-md-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-md-auto {
     flex: 0 0 auto;
@@ -1360,7 +1364,7 @@ progress {
   }
   .row-cols-lg-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-lg-4 > * {
     flex: 0 0 auto;
@@ -1372,7 +1376,7 @@ progress {
   }
   .row-cols-lg-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-lg-auto {
     flex: 0 0 auto;
@@ -1529,7 +1533,7 @@ progress {
   }
   .row-cols-xl-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-xl-4 > * {
     flex: 0 0 auto;
@@ -1541,7 +1545,7 @@ progress {
   }
   .row-cols-xl-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-xl-auto {
     flex: 0 0 auto;
@@ -1698,7 +1702,7 @@ progress {
   }
   .row-cols-xxl-3 > * {
     flex: 0 0 auto;
-    width: 33.3333333333%;
+    width: 33.33333333%;
   }
   .row-cols-xxl-4 > * {
     flex: 0 0 auto;
@@ -1710,7 +1714,7 @@ progress {
   }
   .row-cols-xxl-6 > * {
     flex: 0 0 auto;
-    width: 16.6666666667%;
+    width: 16.66666667%;
   }
   .col-xxl-auto {
     flex: 0 0 auto;
@@ -1854,16 +1858,16 @@ progress {
   --bs-table-bg-type: initial;
   --bs-table-color-state: initial;
   --bs-table-bg-state: initial;
-  --bs-table-color: var(--bs-body-color);
+  --bs-table-color: var(--bs-emphasis-color);
   --bs-table-bg: var(--bs-body-bg);
   --bs-table-border-color: var(--bs-border-color);
   --bs-table-accent-bg: transparent;
-  --bs-table-striped-color: var(--bs-body-color);
-  --bs-table-striped-bg: rgba(0, 0, 0, 0.05);
-  --bs-table-active-color: var(--bs-body-color);
-  --bs-table-active-bg: rgba(0, 0, 0, 0.1);
-  --bs-table-hover-color: var(--bs-body-color);
-  --bs-table-hover-bg: rgba(0, 0, 0, 0.075);
+  --bs-table-striped-color: var(--bs-emphasis-color);
+  --bs-table-striped-bg: rgba(var(--bs-emphasis-color-rgb), 0.05);
+  --bs-table-active-color: var(--bs-emphasis-color);
+  --bs-table-active-bg: rgba(var(--bs-emphasis-color-rgb), 0.1);
+  --bs-table-hover-color: var(--bs-emphasis-color);
+  --bs-table-hover-bg: rgba(var(--bs-emphasis-color-rgb), 0.075);
   width: 100%;
   margin-bottom: 1rem;
   vertical-align: top;
@@ -1932,7 +1936,7 @@ progress {
 .table-primary {
   --bs-table-color: #000;
   --bs-table-bg: #cfe2ff;
-  --bs-table-border-color: #bacbe6;
+  --bs-table-border-color: #a6b5cc;
   --bs-table-striped-bg: #c5d7f2;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #bacbe6;
@@ -1946,7 +1950,7 @@ progress {
 .table-secondary {
   --bs-table-color: #000;
   --bs-table-bg: #e2e3e5;
-  --bs-table-border-color: #cbccce;
+  --bs-table-border-color: #b5b6b7;
   --bs-table-striped-bg: #d7d8da;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #cbccce;
@@ -1960,7 +1964,7 @@ progress {
 .table-success {
   --bs-table-color: #000;
   --bs-table-bg: #d1e7dd;
-  --bs-table-border-color: #bcd0c7;
+  --bs-table-border-color: #a7b9b1;
   --bs-table-striped-bg: #c7dbd2;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #bcd0c7;
@@ -1974,7 +1978,7 @@ progress {
 .table-info {
   --bs-table-color: #000;
   --bs-table-bg: #cff4fc;
-  --bs-table-border-color: #badce3;
+  --bs-table-border-color: #a6c3ca;
   --bs-table-striped-bg: #c5e8ef;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #badce3;
@@ -1988,7 +1992,7 @@ progress {
 .table-warning {
   --bs-table-color: #000;
   --bs-table-bg: #fff3cd;
-  --bs-table-border-color: #e6dbb9;
+  --bs-table-border-color: #ccc2a4;
   --bs-table-striped-bg: #f2e7c3;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #e6dbb9;
@@ -2002,7 +2006,7 @@ progress {
 .table-danger {
   --bs-table-color: #000;
   --bs-table-bg: #f8d7da;
-  --bs-table-border-color: #dfc2c4;
+  --bs-table-border-color: #c6acae;
   --bs-table-striped-bg: #eccccf;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #dfc2c4;
@@ -2016,7 +2020,7 @@ progress {
 .table-light {
   --bs-table-color: #000;
   --bs-table-bg: #f8f9fa;
-  --bs-table-border-color: #dfe0e1;
+  --bs-table-border-color: #c6c7c8;
   --bs-table-striped-bg: #ecedee;
   --bs-table-striped-color: #000;
   --bs-table-active-bg: #dfe0e1;
@@ -2030,7 +2034,7 @@ progress {
 .table-dark {
   --bs-table-color: #fff;
   --bs-table-bg: #212529;
-  --bs-table-border-color: #373b3e;
+  --bs-table-border-color: #4d5154;
   --bs-table-striped-bg: #2c3034;
   --bs-table-striped-color: #fff;
   --bs-table-active-bg: #373b3e;
@@ -2386,6 +2390,7 @@ textarea.form-control-lg {
 
 .form-check-input {
   --bs-form-check-bg: var(--bs-body-bg);
+  flex-shrink: 0;
   width: 1em;
   height: 1em;
   margin-top: 0.25em;
@@ -2542,7 +2547,7 @@ textarea.form-control-lg {
   height: 0.5rem;
   color: transparent;
   cursor: pointer;
-  background-color: var(--bs-tertiary-bg);
+  background-color: var(--bs-secondary-bg);
   border-color: transparent;
   border-radius: 1rem;
 }
@@ -2571,7 +2576,7 @@ textarea.form-control-lg {
   height: 0.5rem;
   color: transparent;
   cursor: pointer;
-  background-color: var(--bs-tertiary-bg);
+  background-color: var(--bs-secondary-bg);
   border-color: transparent;
   border-radius: 1rem;
 }
@@ -3035,6 +3040,9 @@ textarea.form-control-lg {
 .btn-check:checked + .btn:focus-visible, :not(.btn-check) + .btn:active:focus-visible, .btn:first-child:active:focus-visible, .btn.active:focus-visible, .btn.show:focus-visible {
   box-shadow: var(--bs-btn-focus-box-shadow);
 }
+.btn-check:checked:focus-visible + .btn {
+  box-shadow: var(--bs-btn-focus-box-shadow);
+}
 .btn:disabled, .btn.disabled, fieldset:disabled .btn {
   color: var(--bs-btn-disabled-color);
   pointer-events: none;
@@ -3429,7 +3437,7 @@ textarea.form-control-lg {
   --bs-dropdown-inner-border-radius: calc(var(--bs-border-radius) - var(--bs-border-width));
   --bs-dropdown-divider-bg: var(--bs-border-color-translucent);
   --bs-dropdown-divider-margin-y: 0.5rem;
-  --bs-dropdown-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+  --bs-dropdown-box-shadow: var(--bs-box-shadow);
   --bs-dropdown-link-color: var(--bs-body-color);
   --bs-dropdown-link-hover-color: var(--bs-body-color);
   --bs-dropdown-link-hover-bg: var(--bs-tertiary-bg);
@@ -4566,12 +4574,11 @@ textarea.form-control-lg {
   --bs-accordion-btn-padding-y: 1rem;
   --bs-accordion-btn-color: var(--bs-body-color);
   --bs-accordion-btn-bg: var(--bs-accordion-bg);
-  --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23212529'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
+  --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='%23212529' stroke-linecap='round' stroke-linejoin='round'%3e%3cpath d='M2 5L8 11L14 5'/%3e%3c/svg%3e");
   --bs-accordion-btn-icon-width: 1.25rem;
   --bs-accordion-btn-icon-transform: rotate(-180deg);
   --bs-accordion-btn-icon-transition: transform 0.2s ease-in-out;
-  --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23052c65'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
-  --bs-accordion-btn-focus-border-color: #86b7fe;
+  --bs-accordion-btn-active-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='%23052c65' stroke-linecap='round' stroke-linejoin='round'%3e%3cpath d='M2 5L8 11L14 5'/%3e%3c/svg%3e");
   --bs-accordion-btn-focus-box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
   --bs-accordion-body-padding-x: 1.25rem;
   --bs-accordion-body-padding-y: 1rem;
@@ -4629,7 +4636,6 @@ textarea.form-control-lg {
 }
 .accordion-button:focus {
   z-index: 3;
-  border-color: var(--bs-accordion-btn-focus-border-color);
   outline: 0;
   box-shadow: var(--bs-accordion-btn-focus-box-shadow);
 }
@@ -4647,7 +4653,7 @@ textarea.form-control-lg {
   border-top-right-radius: var(--bs-accordion-border-radius);
   border-top-left-radius: var(--bs-accordion-border-radius);
 }
-.accordion-item:first-of-type .accordion-button {
+.accordion-item:first-of-type > .accordion-header .accordion-button {
   border-top-right-radius: var(--bs-accordion-inner-border-radius);
   border-top-left-radius: var(--bs-accordion-inner-border-radius);
 }
@@ -4658,11 +4664,11 @@ textarea.form-control-lg {
   border-bottom-left-radius: var(--bs-accordion-border-radius);
   border-bottom-right-radius: var(--bs-accordion-border-radius);
 }
-.accordion-item:last-of-type .accordion-button.collapsed {
+.accordion-item:last-of-type > .accordion-header .accordion-button.collapsed {
   border-bottom-left-radius: var(--bs-accordion-inner-border-radius);
   border-bottom-right-radius: var(--bs-accordion-inner-border-radius);
 }
-.accordion-item:last-of-type .accordion-collapse {
+.accordion-item:last-of-type > .accordion-collapse {
   border-bottom-left-radius: var(--bs-accordion-border-radius);
   border-bottom-right-radius: var(--bs-accordion-border-radius);
 }
@@ -4671,21 +4677,21 @@ textarea.form-control-lg {
   padding: var(--bs-accordion-body-padding-y) var(--bs-accordion-body-padding-x);
 }
 
-.accordion-flush .accordion-collapse {
-  border-width: 0;
-}
-.accordion-flush .accordion-item {
+.accordion-flush > .accordion-item {
   border-left: 0;
   border-right: 0;
   border-radius: 0;
 }
-.accordion-flush .accordion-item:first-child {
+.accordion-flush > .accordion-item:first-child {
   border-top: 0;
 }
-.accordion-flush .accordion-item:last-child {
+.accordion-flush > .accordion-item:last-child {
   border-bottom: 0;
 }
-.accordion-flush .accordion-item .accordion-button, .accordion-flush .accordion-item .accordion-button.collapsed {
+.accordion-flush > .accordion-item > .accordion-header .accordion-button, .accordion-flush > .accordion-item > .accordion-header .accordion-button.collapsed {
+  border-radius: 0;
+}
+.accordion-flush > .accordion-item > .accordion-collapse {
   border-radius: 0;
 }
 
@@ -5471,7 +5477,7 @@ textarea.form-control-lg {
   --bs-modal-border-color: var(--bs-border-color-translucent);
   --bs-modal-border-width: var(--bs-border-width);
   --bs-modal-border-radius: var(--bs-border-radius-lg);
-  --bs-modal-box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+  --bs-modal-box-shadow: var(--bs-box-shadow-sm);
   --bs-modal-inner-border-radius: calc(var(--bs-border-radius-lg) - (var(--bs-border-width)));
   --bs-modal-header-padding-x: 1rem;
   --bs-modal-header-padding-y: 1rem;
@@ -5571,7 +5577,6 @@ textarea.form-control-lg {
   display: flex;
   flex-shrink: 0;
   align-items: center;
-  justify-content: space-between;
   padding: var(--bs-modal-header-padding);
   border-bottom: var(--bs-modal-header-border-width) solid var(--bs-modal-header-border-color);
   border-top-right-radius: var(--bs-modal-inner-border-radius);
@@ -5612,7 +5617,7 @@ textarea.form-control-lg {
 @media (min-width: 576px) {
   .modal {
     --bs-modal-margin: 1.75rem;
-    --bs-modal-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+    --bs-modal-box-shadow: var(--bs-box-shadow);
   }
   .modal-dialog {
     max-width: var(--bs-modal-width);
@@ -5856,7 +5861,7 @@ textarea.form-control-lg {
   --bs-popover-border-color: var(--bs-border-color-translucent);
   --bs-popover-border-radius: var(--bs-border-radius-lg);
   --bs-popover-inner-border-radius: calc(var(--bs-border-radius-lg) - var(--bs-border-width));
-  --bs-popover-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+  --bs-popover-box-shadow: var(--bs-box-shadow);
   --bs-popover-header-padding-x: 1rem;
   --bs-popover-header-padding-y: 0.5rem;
   --bs-popover-header-font-size: 1rem;
@@ -6120,14 +6125,15 @@ textarea.form-control-lg {
   background-position: 50%;
   background-size: 100% 100%;
 }
-.carousel-control-next-icon {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'/%3e%3c/svg%3e");
-}
 
 .carousel-control-prev-icon {
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
 }
 
+.carousel-control-next-icon {
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23fff'%3e%3cpath d='M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z'/%3e%3c/svg%3e");
+}
+
 .carousel-indicators {
   position: absolute;
   left: 0;
@@ -6179,8 +6185,8 @@ textarea.form-control-lg {
   text-align: center;
 }
 
-.carousel-dark .carousel-control-next-icon,
-.carousel-dark .carousel-control-prev-icon {
+.carousel-dark .carousel-control-prev-icon,
+.carousel-dark .carousel-control-next-icon {
   filter: invert(1) grayscale(100);
 }
 .carousel-dark .carousel-indicators [data-bs-target] {
@@ -6190,9 +6196,9 @@ textarea.form-control-lg {
   color: #000;
 }
 
-[data-bs-theme=dark] .carousel .carousel-control-next-icon,
-[data-bs-theme=dark] .carousel .carousel-control-prev-icon, [data-bs-theme=dark].carousel .carousel-control-next-icon,
-[data-bs-theme=dark].carousel .carousel-control-prev-icon {
+[data-bs-theme=dark] .carousel .carousel-control-prev-icon,
+[data-bs-theme=dark] .carousel .carousel-control-next-icon, [data-bs-theme=dark].carousel .carousel-control-prev-icon,
+[data-bs-theme=dark].carousel .carousel-control-next-icon {
   filter: invert(1) grayscale(100);
 }
 [data-bs-theme=dark] .carousel .carousel-indicators [data-bs-target], [data-bs-theme=dark].carousel .carousel-indicators [data-bs-target] {
@@ -6274,7 +6280,7 @@ textarea.form-control-lg {
   --bs-offcanvas-bg: var(--bs-body-bg);
   --bs-offcanvas-border-width: var(--bs-border-width);
   --bs-offcanvas-border-color: var(--bs-border-color-translucent);
-  --bs-offcanvas-box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
+  --bs-offcanvas-box-shadow: var(--bs-box-shadow-sm);
   --bs-offcanvas-transition: transform 0.3s ease-in-out;
   --bs-offcanvas-title-line-height: 1.5;
 }
@@ -6745,14 +6751,11 @@ textarea.form-control-lg {
 .offcanvas-header {
   display: flex;
   align-items: center;
-  justify-content: space-between;
   padding: var(--bs-offcanvas-padding-y) var(--bs-offcanvas-padding-x);
 }
 .offcanvas-header .btn-close {
   padding: calc(var(--bs-offcanvas-padding-y) * 0.5) calc(var(--bs-offcanvas-padding-x) * 0.5);
-  margin-top: calc(-0.5 * var(--bs-offcanvas-padding-y));
-  margin-left: calc(-0.5 * var(--bs-offcanvas-padding-x));
-  margin-bottom: calc(-0.5 * var(--bs-offcanvas-padding-y));
+  margin: calc(-0.5 * var(--bs-offcanvas-padding-y)) auto calc(-0.5 * var(--bs-offcanvas-padding-y)) calc(-0.5 * var(--bs-offcanvas-padding-x));
 }
 
 .offcanvas-title {
@@ -7353,15 +7356,15 @@ textarea.form-control-lg {
 }
 
 .shadow {
-  box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;
+  box-shadow: var(--bs-box-shadow) !important;
 }
 
 .shadow-sm {
-  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;
+  box-shadow: var(--bs-box-shadow-sm) !important;
 }
 
 .shadow-lg {
-  box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important;
+  box-shadow: var(--bs-box-shadow-lg) !important;
 }
 
 .shadow-none {

MP-ADM/MP-ADM.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -50,8 +49,8 @@
     <Reference Include="AjaxControlToolkit, Version=20.1.0.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
       <HintPath>..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll</HintPath>
     </Reference>
-    <Reference Include="AspNet.ScriptManager.jQuery, Version=3.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AspNet.ScriptManager.jQuery.3.7.0\lib\net45\AspNet.ScriptManager.jQuery.dll</HintPath>
+    <Reference Include="AspNet.ScriptManager.jQuery, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AspNet.ScriptManager.jQuery.3.7.1\lib\net45\AspNet.ScriptManager.jQuery.dll</HintPath>
     </Reference>
     <Reference Include="AspNet.ScriptManager.jQuery.UI.Combined, Version=1.12.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\AspNet.ScriptManager.jQuery.UI.Combined.1.12.1\lib\net45\AspNet.ScriptManager.jQuery.UI.Combined.dll</HintPath>
@@ -59,8 +58,8 @@
     <Reference Include="Crc32.NET, Version=1.0.0.0, Culture=neutral, PublicKeyToken=dc0b95cf99bf4e99, processorArchitecture=MSIL">
       <HintPath>..\packages\Crc32.NET.1.2.0\lib\net20\Crc32.NET.dll</HintPath>
     </Reference>
-    <Reference Include="DnsClient, Version=1.7.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
-      <HintPath>..\packages\DnsClient.1.7.0\lib\net45\DnsClient.dll</HintPath>
+    <Reference Include="DnsClient, Version=1.8.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
+      <HintPath>..\packages\DnsClient.1.8.0\lib\netstandard2.0\DnsClient.dll</HintPath>
     </Reference>
     <Reference Include="Elmah, Version=1.2.14706.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>
@@ -71,18 +70,27 @@
     <Reference Include="IronSnappy, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b1d4b1dc83bdcf31, processorArchitecture=MSIL">
       <HintPath>..\packages\IronSnappy.1.3.1\lib\netstandard2.0\IronSnappy.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.AspNet.SessionState.SessionStateModule.1.1.0\lib\Net462\Microsoft.AspNet.SessionState.SessionStateModule.dll</HintPath>
+    <Reference Include="Microsoft.AspNet.SessionState.SessionStateModule, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.SessionState.SessionStateModule.2.0.0\lib\Net462\Microsoft.AspNet.SessionState.SessionStateModule.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Web.RedisSessionStateProvider, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.5.0.0\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
+    <Reference Include="Microsoft.Web.RedisSessionStateProvider, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.5.0.4\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Win32.Registry, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
     </Reference>
     <Reference Include="MongoDB.Bson, Version=2.17.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MongoDB.Bson.2.17.0\lib\netstandard2.0\MongoDB.Bson.dll</HintPath>
@@ -100,7 +108,7 @@
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.5.2.4\lib\net46\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.3.3\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PdfSharp, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
       <HintPath>..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll</HintPath>
@@ -115,7 +123,7 @@
       <HintPath>..\packages\SharpCompress.0.38.0\lib\net462\SharpCompress.dll</HintPath>
     </Reference>
     <Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
-      <HintPath>..\packages\StackExchange.Redis.2.6.122\lib\net461\StackExchange.Redis.dll</HintPath>
+      <HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
     </Reference>
     <Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
@@ -128,20 +136,21 @@
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System" />
-    <Reference Include="System.Configuration.ConfigurationManager, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Configuration.ConfigurationManager.6.0.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
+    <Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Diagnostics.PerformanceCounter, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
+    <Reference Include="System.Diagnostics.PerformanceCounter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.PerformanceCounter.8.0.0\lib\net462\System.Diagnostics.PerformanceCounter.dll</HintPath>
     </Reference>
+    <Reference Include="System.DirectoryServices" />
     <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
     </Reference>
-    <Reference Include="System.IO.Pipelines, Version=6.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.6.0.3\lib\net461\System.IO.Pipelines.dll</HintPath>
+    <Reference Include="System.IO.Pipelines, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
@@ -162,8 +171,8 @@
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
-    <Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
+    <Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
@@ -171,8 +180,8 @@
     <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
     </Reference>
-    <Reference Include="System.Security.Cryptography.Pkcs, Version=6.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Pkcs.6.0.3\lib\net461\System.Security.Cryptography.Pkcs.dll</HintPath>
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
@@ -180,8 +189,8 @@
     <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
     </Reference>
-    <Reference Include="System.Security.Permissions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Permissions.6.0.0\lib\net461\System.Security.Permissions.dll</HintPath>
+    <Reference Include="System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
@@ -191,8 +200,8 @@
     <Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Channels, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Channels.6.0.0\lib\net461\System.Threading.Channels.dll</HintPath>
+    <Reference Include="System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Channels.8.0.0\lib\net462\System.Threading.Channels.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -529,6 +538,8 @@
     <Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
     <Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
     <Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
+    <Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
+    <Content Include="App_Readme\SteamWare_demo\example-app.config" />
     <Content Include="Scripts\bootstrap.min.js.map" />
     <Content Include="Scripts\bootstrap.js.map" />
     <Content Include="Scripts\bootstrap.esm.min.js.map" />
@@ -551,16 +562,14 @@
     <Content Include="Content\bootstrap-grid.rtl.css.map" />
     <Content Include="Content\bootstrap-grid.min.css.map" />
     <Content Include="Content\bootstrap-grid.css.map" />
-    <Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
-    <Content Include="App_Readme\SteamWare_demo\example-app.config" />
     <None Include="Scripts\jquery-3.4.1.intellisense.js" />
     <Content Include="Scripts\jquery-3.4.1.js" />
     <Content Include="Scripts\jquery-3.4.1.slim.js" />
-    <None Include="Scripts\jquery-3.7.0.intellisense.js" />
-    <Content Include="Scripts\jquery-3.7.0.js" />
-    <Content Include="Scripts\jquery-3.7.0.min.js" />
-    <Content Include="Scripts\jquery-3.7.0.slim.js" />
-    <Content Include="Scripts\jquery-3.7.0.slim.min.js" />
+    <None Include="Scripts\jquery-3.7.1.intellisense.js" />
+    <Content Include="Scripts\jquery-3.7.1.js" />
+    <Content Include="Scripts\jquery-3.7.1.min.js" />
+    <Content Include="Scripts\jquery-3.7.1.slim.js" />
+    <Content Include="Scripts\jquery-3.7.1.slim.min.js" />
     <Content Include="Scripts\popper-utils.js" />
     <Content Include="Scripts\popper-utils.min.js" />
     <Content Include="Scripts\popper.js" />
@@ -1330,8 +1339,8 @@
     <Content Include="Scripts\popper-utils.js.map" />
     <Content Include="Web.PROD.Jetco.config" />
     <Content Include="Web.DEV.config" />
-    <Content Include="Scripts\jquery-3.7.0.slim.min.map" />
-    <Content Include="Scripts\jquery-3.7.0.min.map" />
+    <Content Include="Scripts\jquery-3.7.1.slim.min.map" />
+    <Content Include="Scripts\jquery-3.7.1.min.map" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -1362,8 +1371,8 @@
     <TypeScriptCompile Include="Scripts\index.d.ts" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.8.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.8.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -1397,12 +1406,9 @@
       <ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets'))" />
     <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.5.4\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.5.4\build\MongoDB.Libmongocrypt.targets'))" />
     <Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.17.0\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.17.0\build\MongoDB.Driver.Core.targets'))" />
   </Target>
-  <Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" />
   <Import Project="..\packages\MongoDB.Libmongocrypt.1.5.4\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.5.4\build\MongoDB.Libmongocrypt.targets')" />
   <Import Project="..\packages\MongoDB.Driver.Core.2.17.0\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.17.0\build\MongoDB.Driver.Core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

MP-ADM/Scripts/bootstrap.bundle.js

@@ -1,6 +1,6 @@
 /*!
-  * Bootstrap v5.3.1 (https://getbootstrap.com/)
-  * Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Bootstrap v5.3.3 (https://getbootstrap.com/)
+  * Copyright 2011-2024 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
 (function (global, factory) {
@@ -210,7 +210,6 @@
   const reflow = element => {
     element.offsetHeight; // eslint-disable-line no-unused-expressions
   };
-
   const getjQuery = () => {
     if (window.jQuery && !document.body.hasAttribute('data-bs-no-jquery')) {
       return window.jQuery;
@@ -648,7 +647,7 @@
    * Constants
    */
 
-  const VERSION = '5.3.1';
+  const VERSION = '5.3.3';
 
   /**
    * Class definition
@@ -731,7 +730,7 @@
       }
       selector = hrefAttribute && hrefAttribute !== '#' ? hrefAttribute.trim() : null;
     }
-    return parseSelector(selector);
+    return selector ? selector.split(',').map(sel => parseSelector(sel)).join(',') : null;
   };
   const SelectorEngine = {
     find(selector, element = document.documentElement) {
@@ -3916,7 +3915,6 @@
     // if false, we use the backdrop helper without adding any element to the dom
     rootElement: 'body' // give the choice to place backdrop under different elements
   };
-
   const DefaultType$8 = {
     className: 'string',
     clickCallback: '(function|null)',
@@ -4041,7 +4039,6 @@
     autofocus: true,
     trapElement: null // The element to trap focus inside of
   };
-
   const DefaultType$7 = {
     autofocus: 'boolean',
     trapElement: 'element'
@@ -4768,7 +4765,10 @@
     br: [],
     col: [],
     code: [],
+    dd: [],
     div: [],
+    dl: [],
+    dt: [],
     em: [],
     hr: [],
     h1: [],
@@ -5866,7 +5866,7 @@
   const CLASS_DROPDOWN = 'dropdown';
   const SELECTOR_DROPDOWN_TOGGLE = '.dropdown-toggle';
   const SELECTOR_DROPDOWN_MENU = '.dropdown-menu';
-  const NOT_SELECTOR_DROPDOWN_TOGGLE = ':not(.dropdown-toggle)';
+  const NOT_SELECTOR_DROPDOWN_TOGGLE = `:not(${SELECTOR_DROPDOWN_TOGGLE})`;
   const SELECTOR_TAB_PANEL = '.list-group, .nav, [role="tablist"]';
   const SELECTOR_OUTER = '.nav-item, .list-group-item';
   const SELECTOR_INNER = `.nav-link${NOT_SELECTOR_DROPDOWN_TOGGLE}, .list-group-item${NOT_SELECTOR_DROPDOWN_TOGGLE}, [role="tab"]${NOT_SELECTOR_DROPDOWN_TOGGLE}`;

MP-ADM/Scripts/bootstrap.esm.js

@@ -1,6 +1,6 @@
 /*!
-  * Bootstrap v5.3.1 (https://getbootstrap.com/)
-  * Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Bootstrap v5.3.3 (https://getbootstrap.com/)
+  * Copyright 2011-2024 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
 import * as Popper from '@popperjs/core';
@@ -206,7 +206,6 @@ const noop = () => {};
 const reflow = element => {
   element.offsetHeight; // eslint-disable-line no-unused-expressions
 };
-
 const getjQuery = () => {
   if (window.jQuery && !document.body.hasAttribute('data-bs-no-jquery')) {
     return window.jQuery;
@@ -644,7 +643,7 @@ class Config {
  * Constants
  */
 
-const VERSION = '5.3.1';
+const VERSION = '5.3.3';
 
 /**
  * Class definition
@@ -727,7 +726,7 @@ const getSelector = element => {
     }
     selector = hrefAttribute && hrefAttribute !== '#' ? hrefAttribute.trim() : null;
   }
-  return parseSelector(selector);
+  return selector ? selector.split(',').map(sel => parseSelector(sel)).join(',') : null;
 };
 const SelectorEngine = {
   find(selector, element = document.documentElement) {
@@ -2073,7 +2072,6 @@ const Default$8 = {
   // if false, we use the backdrop helper without adding any element to the dom
   rootElement: 'body' // give the choice to place backdrop under different elements
 };
-
 const DefaultType$8 = {
   className: 'string',
   clickCallback: '(function|null)',
@@ -2198,7 +2196,6 @@ const Default$7 = {
   autofocus: true,
   trapElement: null // The element to trap focus inside of
 };
-
 const DefaultType$7 = {
   autofocus: 'boolean',
   trapElement: 'element'
@@ -2925,7 +2922,10 @@ const DefaultAllowlist = {
   br: [],
   col: [],
   code: [],
+  dd: [],
   div: [],
+  dl: [],
+  dt: [],
   em: [],
   hr: [],
   h1: [],
@@ -4023,7 +4023,7 @@ const CLASS_NAME_SHOW$1 = 'show';
 const CLASS_DROPDOWN = 'dropdown';
 const SELECTOR_DROPDOWN_TOGGLE = '.dropdown-toggle';
 const SELECTOR_DROPDOWN_MENU = '.dropdown-menu';
-const NOT_SELECTOR_DROPDOWN_TOGGLE = ':not(.dropdown-toggle)';
+const NOT_SELECTOR_DROPDOWN_TOGGLE = `:not(${SELECTOR_DROPDOWN_TOGGLE})`;
 const SELECTOR_TAB_PANEL = '.list-group, .nav, [role="tablist"]';
 const SELECTOR_OUTER = '.nav-item, .list-group-item';
 const SELECTOR_INNER = `.nav-link${NOT_SELECTOR_DROPDOWN_TOGGLE}, .list-group-item${NOT_SELECTOR_DROPDOWN_TOGGLE}, [role="tab"]${NOT_SELECTOR_DROPDOWN_TOGGLE}`;

MP-ADM/Scripts/bootstrap.js

@@ -1,6 +1,6 @@
 /*!
-  * Bootstrap v5.3.1 (https://getbootstrap.com/)
-  * Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Bootstrap v5.3.3 (https://getbootstrap.com/)
+  * Copyright 2011-2024 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
 (function (global, factory) {
@@ -229,7 +229,6 @@
   const reflow = element => {
     element.offsetHeight; // eslint-disable-line no-unused-expressions
   };
-
   const getjQuery = () => {
     if (window.jQuery && !document.body.hasAttribute('data-bs-no-jquery')) {
       return window.jQuery;
@@ -667,7 +666,7 @@
    * Constants
    */
 
-  const VERSION = '5.3.1';
+  const VERSION = '5.3.3';
 
   /**
    * Class definition
@@ -750,7 +749,7 @@
       }
       selector = hrefAttribute && hrefAttribute !== '#' ? hrefAttribute.trim() : null;
     }
-    return parseSelector(selector);
+    return selector ? selector.split(',').map(sel => parseSelector(sel)).join(',') : null;
   };
   const SelectorEngine = {
     find(selector, element = document.documentElement) {
@@ -2096,7 +2095,6 @@
     // if false, we use the backdrop helper without adding any element to the dom
     rootElement: 'body' // give the choice to place backdrop under different elements
   };
-
   const DefaultType$8 = {
     className: 'string',
     clickCallback: '(function|null)',
@@ -2221,7 +2219,6 @@
     autofocus: true,
     trapElement: null // The element to trap focus inside of
   };
-
   const DefaultType$7 = {
     autofocus: 'boolean',
     trapElement: 'element'
@@ -2948,7 +2945,10 @@
     br: [],
     col: [],
     code: [],
+    dd: [],
     div: [],
+    dl: [],
+    dt: [],
     em: [],
     hr: [],
     h1: [],
@@ -4046,7 +4046,7 @@
   const CLASS_DROPDOWN = 'dropdown';
   const SELECTOR_DROPDOWN_TOGGLE = '.dropdown-toggle';
   const SELECTOR_DROPDOWN_MENU = '.dropdown-menu';
-  const NOT_SELECTOR_DROPDOWN_TOGGLE = ':not(.dropdown-toggle)';
+  const NOT_SELECTOR_DROPDOWN_TOGGLE = `:not(${SELECTOR_DROPDOWN_TOGGLE})`;
   const SELECTOR_TAB_PANEL = '.list-group, .nav, [role="tablist"]';
   const SELECTOR_OUTER = '.nav-item, .list-group-item';
   const SELECTOR_INNER = `.nav-link${NOT_SELECTOR_DROPDOWN_TOGGLE}, .list-group-item${NOT_SELECTOR_DROPDOWN_TOGGLE}, [role="tab"]${NOT_SELECTOR_DROPDOWN_TOGGLE}`;

MP-ADM/Scripts/jquery-3.7.1.js

@@ -1,12 +1,12 @@
 /*!
- * jQuery JavaScript Library v3.7.0
+ * jQuery JavaScript Library v3.7.1
  * https://jquery.com/
  *
  * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2023-05-11T18:29Z
+ * Date: 2023-08-28T13:37Z
  */
 ( function( global, factory ) {
 
@@ -147,7 +147,7 @@ function toType( obj ) {
 
 
 
-var version = "3.7.0",
+var version = "3.7.1",
 
 	rhtmlSuffix = /HTML$/i,
 
@@ -411,9 +411,14 @@ jQuery.extend( {
 				// Do not traverse comment nodes
 				ret += jQuery.text( node );
 			}
-		} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+		}
+		if ( nodeType === 1 || nodeType === 11 ) {
 			return elem.textContent;
-		} else if ( nodeType === 3 || nodeType === 4 ) {
+		}
+		if ( nodeType === 9 ) {
+			return elem.documentElement.textContent;
+		}
+		if ( nodeType === 3 || nodeType === 4 ) {
 			return elem.nodeValue;
 		}
 
@@ -1126,12 +1131,17 @@ function setDocument( node ) {
 		documentElement.msMatchesSelector;
 
 	// Support: IE 9 - 11+, Edge 12 - 18+
-	// Accessing iframe documents after unload throws "permission denied" errors (see trac-13936)
-	// Support: IE 11+, Edge 17 - 18+
-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-	// two documents; shallow comparisons work.
-	// eslint-disable-next-line eqeqeq
-	if ( preferredDoc != document &&
+	// Accessing iframe documents after unload throws "permission denied" errors
+	// (see trac-13936).
+	// Limit the fix to IE & Edge Legacy; despite Edge 15+ implementing `matches`,
+	// all IE 9+ and Edge Legacy versions implement `msMatchesSelector` as well.
+	if ( documentElement.msMatchesSelector &&
+
+		// Support: IE 11+, Edge 17 - 18+
+		// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+		// two documents; shallow comparisons work.
+		// eslint-disable-next-line eqeqeq
+		preferredDoc != document &&
 		( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {
 
 		// Support: IE 9 - 11+, Edge 12 - 18+
@@ -2694,12 +2704,12 @@ jQuery.find = find;
 jQuery.expr[ ":" ] = jQuery.expr.pseudos;
 jQuery.unique = jQuery.uniqueSort;
 
-// These have always been private, but they used to be documented
-// as part of Sizzle so let's maintain them in the 3.x line
-// for backwards compatibility purposes.
+// These have always been private, but they used to be documented as part of
+// Sizzle so let's maintain them for now for backwards compatibility purposes.
 find.compile = compile;
 find.select = select;
 find.setDocument = setDocument;
+find.tokenize = tokenize;
 
 find.escape = jQuery.escapeSelector;
 find.getText = jQuery.text;
@@ -5913,7 +5923,7 @@ function domManip( collection, args, callback, ignored ) {
 			if ( hasScripts ) {
 				doc = scripts[ scripts.length - 1 ].ownerDocument;
 
-				// Reenable scripts
+				// Re-enable scripts
 				jQuery.map( scripts, restoreScript );
 
 				// Evaluate executable scripts on first document insertion
@@ -6370,7 +6380,7 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 				trChild = document.createElement( "div" );
 
 				table.style.cssText = "position:absolute;left:-11111px;border-collapse:separate";
-				tr.style.cssText = "border:1px solid";
+				tr.style.cssText = "box-sizing:content-box;border:1px solid";
 
 				// Support: Chrome 86+
 				// Height set through cssText does not get applied.
@@ -6382,7 +6392,7 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 				// In our bodyBackground.html iframe,
 				// display for all div elements is set to "inline",
 				// which causes a problem only in Android 8 Chrome 86.
-				// Ensuring the div is display: block
+				// Ensuring the div is `display: block`
 				// gets around this issue.
 				trChild.style.display = "block";
 
@@ -10550,7 +10560,9 @@ jQuery.fn.extend( {
 	},
 
 	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+		return this
+			.on( "mouseenter", fnOver )
+			.on( "mouseleave", fnOut || fnOver );
 	}
 } );
 

MP-ADM/Scripts/jquery-3.7.1.slim.js

@@ -1,12 +1,12 @@
 /*!
- * jQuery JavaScript Library v3.7.0 -ajax,-ajax/jsonp,-ajax/load,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-deprecated/ajax-event-alias,-effects,-effects/animatedSelector,-effects/Tween
+ * jQuery JavaScript Library v3.7.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-deprecated/ajax-event-alias,-effects,-effects/animatedSelector,-effects/Tween
  * https://jquery.com/
  *
  * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2023-05-11T18:29Z
+ * Date: 2023-08-28T13:37Z
  */
 ( function( global, factory ) {
 
@@ -147,7 +147,7 @@ function toType( obj ) {
 
 
 
-var version = "3.7.0 -ajax,-ajax/jsonp,-ajax/load,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-deprecated/ajax-event-alias,-effects,-effects/animatedSelector,-effects/Tween",
+var version = "3.7.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-deprecated/ajax-event-alias,-effects,-effects/animatedSelector,-effects/Tween",
 
 	rhtmlSuffix = /HTML$/i,
 
@@ -411,9 +411,14 @@ jQuery.extend( {
 				// Do not traverse comment nodes
 				ret += jQuery.text( node );
 			}
-		} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+		}
+		if ( nodeType === 1 || nodeType === 11 ) {
 			return elem.textContent;
-		} else if ( nodeType === 3 || nodeType === 4 ) {
+		}
+		if ( nodeType === 9 ) {
+			return elem.documentElement.textContent;
+		}
+		if ( nodeType === 3 || nodeType === 4 ) {
 			return elem.nodeValue;
 		}
 
@@ -1126,12 +1131,17 @@ function setDocument( node ) {
 		documentElement.msMatchesSelector;
 
 	// Support: IE 9 - 11+, Edge 12 - 18+
-	// Accessing iframe documents after unload throws "permission denied" errors (see trac-13936)
-	// Support: IE 11+, Edge 17 - 18+
-	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
-	// two documents; shallow comparisons work.
-	// eslint-disable-next-line eqeqeq
-	if ( preferredDoc != document &&
+	// Accessing iframe documents after unload throws "permission denied" errors
+	// (see trac-13936).
+	// Limit the fix to IE & Edge Legacy; despite Edge 15+ implementing `matches`,
+	// all IE 9+ and Edge Legacy versions implement `msMatchesSelector` as well.
+	if ( documentElement.msMatchesSelector &&
+
+		// Support: IE 11+, Edge 17 - 18+
+		// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+		// two documents; shallow comparisons work.
+		// eslint-disable-next-line eqeqeq
+		preferredDoc != document &&
 		( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {
 
 		// Support: IE 9 - 11+, Edge 12 - 18+
@@ -2694,12 +2704,12 @@ jQuery.find = find;
 jQuery.expr[ ":" ] = jQuery.expr.pseudos;
 jQuery.unique = jQuery.uniqueSort;
 
-// These have always been private, but they used to be documented
-// as part of Sizzle so let's maintain them in the 3.x line
-// for backwards compatibility purposes.
+// These have always been private, but they used to be documented as part of
+// Sizzle so let's maintain them for now for backwards compatibility purposes.
 find.compile = compile;
 find.select = select;
 find.setDocument = setDocument;
+find.tokenize = tokenize;
 
 find.escape = jQuery.escapeSelector;
 find.getText = jQuery.text;
@@ -5913,7 +5923,7 @@ function domManip( collection, args, callback, ignored ) {
 			if ( hasScripts ) {
 				doc = scripts[ scripts.length - 1 ].ownerDocument;
 
-				// Reenable scripts
+				// Re-enable scripts
 				jQuery.map( scripts, restoreScript );
 
 				// Evaluate executable scripts on first document insertion
@@ -6370,7 +6380,7 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 				trChild = document.createElement( "div" );
 
 				table.style.cssText = "position:absolute;left:-11111px;border-collapse:separate";
-				tr.style.cssText = "border:1px solid";
+				tr.style.cssText = "box-sizing:content-box;border:1px solid";
 
 				// Support: Chrome 86+
 				// Height set through cssText does not get applied.
@@ -6382,7 +6392,7 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 				// In our bodyBackground.html iframe,
 				// display for all div elements is set to "inline",
 				// which causes a problem only in Android 8 Chrome 86.
-				// Ensuring the div is display: block
+				// Ensuring the div is `display: block`
 				// gets around this issue.
 				trChild.style.display = "block";
 
@@ -8451,7 +8461,9 @@ jQuery.fn.extend( {
 	},
 
 	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+		return this
+			.on( "mouseenter", fnOver )
+			.on( "mouseleave", fnOut || fnOver );
 	}
 } );
 

MP-ADM/Web.Release.config

@@ -3,20 +3,14 @@
 <!-- Per altre informazioni sull'utilizzo della trasformazione web.config, vedere https://go.microsoft.com/fwlink/?LinkId=125889 -->
 
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    Nell'esempio seguente, la trasformazione "SetAttributes" modifica il valore di
-    "connectionString" in modo da utilizzare "ReleaseSQLServer" solo quando il localizzatore "Match"
-    individua un attributo "name" con valore "MyDB".
-
-    <connectionStrings>
-      <add name="MyDB"
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
-    </connectionStrings>
-  -->
-  <system.web>
-    <compilation xdt:Transform="RemoveAttributes(debug)" />
-    <!--
+    <appSettings>
+        <add key="RedisConn" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="RedisConnAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="redisDb" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+    </appSettings>
+    <system.web>
+        <compilation xdt:Transform="RemoveAttributes(debug)" />
+        <!--
 
       Nell'esempio seguente, la trasformazione "Replace" sostituisce l'intera
       sezione <customErrors> del file web.config.
@@ -28,5 +22,5 @@
         <error statusCode="500" redirect="InternalError.htm" />
       </customErrors>
     -->
-  </system.web>
+    </system.web>
 </configuration>

MP-ADM/Web.config

@@ -14,8 +14,8 @@
     </configSections>
     <appSettings>
         <!--Redis conn-->
-        <add key="RedisConn" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
-        <add key="RedisConnAdmin" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
+        <add key="RedisConn" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
+        <add key="RedisConnAdmin" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
         <add key="redisDb" value="5" />
         <add key="aspnet:RequestQueueLimitPerSession" value="50" />
         <add key="aspnet:AllowConcurrentRequestsPerSession" value="true" />
@@ -32,9 +32,19 @@
         <add key="MoonProConnectionStringIS" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_ColCom;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="MoonProConnectionStringArca" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="MoonProConnectionStringES3" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+        <add key="MoonProConnectionStringFluxData" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+        <!--<add key="DbConfConnectionString" value="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+      <add key="MoonProConnectionString" value="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+      <add key="MoonProConnectionStringIS" value="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod_IS_ColCom;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+      <add key="MoonProConnectionStringArca" value="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+      <add key="MoonProConnectionStringES3" value="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+      <add key="MoonProConnectionStringFluxData" value="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+      <add key="PermessiConnectionString" value="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+      <add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+      <add key="VocabolarioConnectionString" value="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />-->
     </appSettings>
     <connectionStrings>
         <add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
@@ -43,6 +53,14 @@
         <add name="MapoDb.Properties.Settings.C_TRACKConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
         <add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
         <add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+        <add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
+        <!--<add name="MoonProConnectionString" connectionString="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+      <add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+      <add name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString" connectionString="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod_IS_ColCom;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+      <add name="MapoDb.Properties.Settings.C_TRACKConnectionString" connectionString="Data Source=SQL2022PROD;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+      <add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString" connectionString="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
+      <add name="ErrorLog" connectionString="Data Source=SQL2022PROD;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+      <add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2022PROD;Initial Catalog=Lvf_MoonPro_Prod_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True" providerName="System.Data.SqlClient" />-->
     </connectionStrings>
     <system.web>
         <compilation debug="true" targetFramework="4.6.2" />
@@ -291,7 +309,7 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.3" newVersion="6.0.0.3" />
+                <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -319,11 +337,11 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="DnsClient" publicKeyToken="4574bb5573c51424" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.7.0.0" newVersion="1.7.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-1.8.0.0" newVersion="1.8.0.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -365,7 +383,7 @@
             <add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler" />
             <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler" />
             <remove name="Session" />
-            <add name="Session" type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode" />
+            <add name="Session" type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode,managedHandler" />
         </modules>
         <validation validateIntegratedModeConfiguration="false" />
     </system.webServer>

MP-ADM/WebMasterPages/MoonPro.master

@@ -12,7 +12,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" lang="it" xml:lang="it">
 <head runat="server">
-    <title>MP-ADM: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
+    <title>MP-ADM</title>
     <link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" />
     <link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />

MP-ADM/WebUserControls/mod_barcode.ascx.cs

@@ -382,7 +382,7 @@ namespace MP_ADM.WebUserControls
                         DS_ProdTempi.PromesseODLDataTable tabPODL = new DS_ProdTempi.PromesseODLDataTable();
                         if (memLayer.ML.cdvb("mpAdm_TcFromPODL"))
                         {
-                            // controllos e richiesto ricerca preliminare x articolo + macchina
+                            // controllo se richiesto ricerca preliminare x articolo + macchina
                             if (memLayer.ML.cdvb("mpAdm_TcByMachine"))
                             {
                                 // recupero TC promessa da ultimo per articolo/macchina
@@ -673,7 +673,7 @@ namespace MP_ADM.WebUserControls
         #region Public Methods
 
         /// <summary>
-        /// effettua al ettura da sessione del comando cliccato e lo inserisce come fosse barcode
+        /// effettua la lettura da sessione del comando cliccato e lo inserisce come fosse barcode
         /// </summary>
         public void loadBtnClickComando()
         {

MP-ADM/packages.config

@@ -3,32 +3,35 @@
   <package id="AIM" version="1.1.1" targetFramework="net462" />
   <package id="AjaxControlToolkit" version="20.1.0" targetFramework="net462" />
   <package id="Antlr" version="3.5.0.2" targetFramework="net461" />
-  <package id="AspNet.ScriptManager.jQuery" version="3.7.0" targetFramework="net462" />
+  <package id="AspNet.ScriptManager.jQuery" version="3.7.1" targetFramework="net462" />
   <package id="AspNet.ScriptManager.jQuery.UI.Combined" version="1.12.1" targetFramework="net461" />
-  <package id="bootstrap" version="5.3.1" targetFramework="net462" />
+  <package id="bootstrap" version="5.3.3" targetFramework="net462" />
   <package id="Crc32.NET" version="1.2.0" targetFramework="net462" />
-  <package id="DnsClient" version="1.7.0" targetFramework="net462" />
+  <package id="DnsClient" version="1.8.0" targetFramework="net462" />
   <package id="elmah" version="1.2.2" targetFramework="net461" />
   <package id="elmah.corelibrary" version="1.2.2" targetFramework="net461" />
   <package id="FontAwesome" version="4.7.0" targetFramework="net461" />
   <package id="IronSnappy" version="1.3.1" targetFramework="net462" />
-  <package id="jQuery" version="3.7.0" targetFramework="net462" />
+  <package id="jQuery" version="3.7.1" targetFramework="net462" />
   <package id="jQuery.UI.Combined" version="1.12.1" targetFramework="net461" />
   <package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net461" />
   <package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net461" />
   <package id="Microsoft.AspNet.FriendlyUrls.Core.it" version="1.0.2" targetFramework="net461" />
   <package id="Microsoft.AspNet.ScriptManager.MSAjax" version="5.0.0" targetFramework="net461" />
   <package id="Microsoft.AspNet.ScriptManager.WebForms" version="5.0.0" targetFramework="net461" />
-  <package id="Microsoft.AspNet.SessionState.SessionStateModule" version="1.1.0" targetFramework="net462" />
+  <package id="Microsoft.AspNet.SessionState.SessionStateModule" version="2.0.0" targetFramework="net462" />
   <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net461" />
   <package id="Microsoft.AspNet.Web.Optimization.it" version="1.1.3" targetFramework="net461" />
   <package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net461" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
-  <package id="Microsoft.CodeAnalysis.NetAnalyzers" version="6.0.0" targetFramework="net462" developmentDependency="true" />
+  <package id="Microsoft.CodeAnalysis.NetAnalyzers" version="8.0.0" targetFramework="net462" developmentDependency="true" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
-  <package id="Microsoft.NETCore.Platforms" version="6.0.5" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.1" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.1" targetFramework="net462" />
+  <package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net462" />
   <package id="Microsoft.Web.Infrastructure" version="2.0.0" targetFramework="net462" />
-  <package id="Microsoft.Web.RedisSessionStateProvider" version="5.0.0" targetFramework="net462" />
+  <package id="Microsoft.Web.RedisSessionStateProvider" version="5.0.4" targetFramework="net462" />
+  <package id="Microsoft.Win32.Registry" version="5.0.0" targetFramework="net462" />
   <package id="Modernizr" version="2.8.3" targetFramework="net461" />
   <package id="MongoDB.Bson" version="2.17.0" targetFramework="net462" />
   <package id="MongoDB.Driver" version="2.17.0" targetFramework="net462" />
@@ -36,35 +39,35 @@
   <package id="MongoDB.Libmongocrypt" version="1.5.4" targetFramework="net462" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
-  <package id="NLog" version="5.2.4" targetFramework="net462" />
+  <package id="NLog" version="5.3.3" targetFramework="net462" />
   <package id="PDFsharp" version="1.50.5147" targetFramework="net462" />
   <package id="Pipelines.Sockets.Unofficial" version="2.2.8" targetFramework="net462" />
   <package id="popper.js" version="1.16.1" targetFramework="net462" />
   <package id="SharpCompress" version="0.38.0" targetFramework="net462" />
   <package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
-  <package id="StackExchange.Redis" version="2.6.122" targetFramework="net462" />
+  <package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
   <package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
   <package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
-  <package id="System.Configuration.ConfigurationManager" version="6.0.0" targetFramework="net462" />
-  <package id="System.Diagnostics.PerformanceCounter" version="6.0.1" targetFramework="net462" />
+  <package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
+  <package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
-  <package id="System.IO.Pipelines" version="6.0.3" targetFramework="net462" />
+  <package id="System.IO.Pipelines" version="8.0.0" targetFramework="net462" />
   <package id="System.Memory" version="4.5.5" targetFramework="net462" />
   <package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net462" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
-  <package id="System.Security.AccessControl" version="6.0.0" targetFramework="net462" />
+  <package id="System.Security.AccessControl" version="6.0.1" targetFramework="net462" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
-  <package id="System.Security.Cryptography.Pkcs" version="6.0.3" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="8.0.0" targetFramework="net462" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
-  <package id="System.Security.Permissions" version="6.0.0" targetFramework="net462" />
+  <package id="System.Security.Permissions" version="8.0.0" targetFramework="net462" />
   <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net462" />
   <package id="System.Text.Encoding.CodePages" version="8.0.0" targetFramework="net462" />
-  <package id="System.Threading.Channels" version="6.0.0" targetFramework="net462" />
+  <package id="System.Threading.Channels" version="8.0.0" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="WebGrease" version="1.6.0" targetFramework="net461" />
   <package id="ZstdSharp.Port" version="0.8.1" targetFramework="net462" />

MP-IO/MP-IO.csproj

@@ -402,7 +402,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MagData\MagData.csproj">
-      <Project>{973245E4-02C0-4ED1-A81B-1727C5F4CA59}</Project>
+      <Project>{973245e4-02c0-4ed1-a81b-1727c5f4ca59}</Project>
       <Name>MagData</Name>
     </ProjectReference>
     <ProjectReference Include="..\MapoDb\MapoDb.csproj">

MP-IO/MP-IO.csproj.user

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>C:\Users\samuele.steamw\source\MoonPro.net\MP-IO\Properties\PublishProfiles\IIS03.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>C:\Users\samuele.steamw\source\MoonPro.net\MP-IO\Properties\PublishProfiles\IIS01.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <ProjectView>ShowAllFiles</ProjectView>
     <Use64BitIISExpress />

MP-IO/Properties/PublishProfiles/IIS01.pubxml.user

@@ -7,5 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAABHE5oPoHlG6fwYbvPGkksuAAAAAASAAACgAAAAEAAAALhOWzlQAPxJ2VE8lisaR9gYAAAAkDFsctmhzdLpUmOVleVAckCWeuODp7F1FAAAAAxKlaqhbiV+t3IJ+FqzhN+bBKS/</EncryptedPassword>
+    <History>True|2025-06-04T11:11:35.2130452Z||;True|2025-06-04T13:05:51.8038152+02:00||;</History>
+    <LastFailureDetails />
   </PropertyGroup>
 </Project>

MP-IO/Web.Release.config

@@ -4,11 +4,11 @@
 
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
     <appSettings>
-        <add key="RedisConn" value="localhost,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
-        <add key="RedisConnAdmin" value="localhost,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
-        <add key="redisDb" value="1" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
-        <add key="RedisConnSPEC" value="localhost,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
-        <add key="RedisConnSPECAdmin" value="localhost,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="RedisConn" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="RedisConnAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="redisDb" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="RedisConnSPEC" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="RedisConnSPECAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
     </appSettings>
   <system.web>
     <compilation xdt:Transform="RemoveAttributes(debug)" />

MP-IO/Web.config

@@ -14,17 +14,17 @@
     </configSections>
     <appSettings>
         <!--Redis conn-->
-        <add key="RedisConn" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
-        <add key="RedisConnAdmin" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
+        <add key="RedisConn" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
+        <add key="RedisConnAdmin" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
         <add key="redisDb" value="5" />
-        <add key="RedisConnSPEC" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
-        <add key="RedisConnSPECAdmin" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
+        <add key="RedisConnSPEC" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
+        <add key="RedisConnSPECAdmin" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
         <add key="aspnet:RequestQueueLimitPerSession" value="50" />
         <add key="aspnet:AllowConcurrentRequestsPerSession" value="true" />
         <!--altri parametri-->
         <add key="CodModulo" value="MoonPro" />
         <add key="cacheOnRedis" value="true" />
-        <add key="maxAgeAppConf_min" value="5" />
+        <add key="maxAgeAppConf_min" value="30" />
         <add key="_logDir" value="~/logs/" />
         <add key="logMitigSec" value="30" />
         <add key="vetoRedisCheckLimit" value="100" />
@@ -40,6 +40,7 @@
         <!--stringhe connessione-->
         <add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+        <add key="MoonProConnectionStringFluxData" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="MagDataConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
@@ -50,6 +51,9 @@
         <add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
         <add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
         <add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+        <add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
+          connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True"
+          providerName="System.Data.SqlClient" />
     </connectionStrings>
     <system.web>
         <customErrors mode="Off" />

MP-IO/sendReboot.aspx.cs

@@ -3,55 +3,57 @@ using System;
 
 namespace MP_IO
 {
-  public partial class sendReboot : System.Web.UI.Page
-  {
-    /// <summary>
-    /// caricamento pagina
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected void Page_Load(object sender, EventArgs e)
+    public partial class sendReboot : System.Web.UI.Page
     {
-      // legge i get x registrare che una macchina è stata riavviata
-      string idxMacchina = "";
-      string IPv4 = "";
-      string agent = "";
-      string macAddr = "";
-      try
-      {
-        idxMacchina = Request.QueryString["idxMacchina"];
-      }
-      catch
-      { }
-      try
-      {
-        macAddr = Request.QueryString["mac"]; // opzionale, mac address!!!
-      }
-      catch
-      { }
-      try
-      {
-        // recupero IP del client remoto
-        IPv4 = Request.UserHostName;
-        agent = Request.UserAgent;
-      }
-      catch
-      { }
-      try
-      {
-        // ora salvo che la macchina è stata (ri)avviata...
-        MapoDb.MapoDb MapoDbObj = new MapoDb.MapoDb();
-        MapoDbObj.registraStartup(idxMacchina, IPv4, agent, macAddr);
-      }
-      catch (Exception exc)
-      {
-        if (memLayer.ML.CRI("_logLevel") > 5)
+        /// <summary>
+        /// caricamento pagina
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
         {
-          string errore = string.Format("Errore: {0}{1}", Environment.NewLine, exc);
-          logger.lg.scriviLog(errore, tipoLog.EXCEPTION);
-          lblOut.Text = errore;
+            // legge i get x registrare che una macchina è stata riavviata
+            string idxMacchina = "";
+            string IPv4 = "";
+            string agent = "";
+            string macAddr = "";
+            try
+            {
+                idxMacchina = Request.QueryString["idxMacchina"];
+            }
+            catch
+            { }
+            try
+            {
+                macAddr = Request.QueryString["mac"]; // opzionale, mac address!!!
+            }
+            catch
+            { }
+            try
+            {
+                // recupero IP del client remoto
+                IPv4 = Request.UserHostName;
+                agent = Request.UserAgent;
+            }
+            catch
+            { }
+            try
+            {
+                // ora salvo che la macchina è stata (ri)avviata...
+                MapoDb.MapoDb MapoDbObj = new MapoDb.MapoDb();
+                // hard coded num2keep valori reboot
+                int num2keep = 10;
+                MapoDbObj.registraStartup(idxMacchina, IPv4, agent, macAddr, num2keep);
+            }
+            catch (Exception exc)
+            {
+                if (memLayer.ML.CRI("_logLevel") > 5)
+                {
+                    string errore = string.Format("Errore: {0}{1}", Environment.NewLine, exc);
+                    logger.lg.scriviLog(errore, tipoLog.EXCEPTION);
+                    lblOut.Text = errore;
+                }
+            }
         }
-      }
     }
-  }
 }

MP-IO/status.aspx

@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-    <title></title>
+    <title>MP-IO</title>
 </head>
 <body>
     <form id="form1" runat="server">

MP-MAG/Web.Release.config

@@ -3,17 +3,11 @@
 <!-- For more information on using Web.config transformation visit https://go.microsoft.com/fwlink/?LinkId=301874 -->
 
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    Nell'esempio riportato di seguito la trasformazione "SetAttributes" modifica il valore di
-    "connectionString" in modo da utilizzare "ReleaseSQLServer" solo quando il localizzatore "Match"
-    rileva un attributo "name" con valore "MyDB".
-
-    <connectionStrings>
-      <add name="MyDB"
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
+    <appSettings>
+        <add key="RedisConn" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="RedisConnAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="redisDb" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+    </appSettings>
   <system.web>
     <compilation xdt:Transform="RemoveAttributes(debug)" />
     <!--

MP-SITE/example-NLog.config

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
-      autoReload="true"
-      throwExceptions="false"
-      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log" >
-
-
-  <!-- optional, add some variabeles
-  https://github.com/nlog/NLog/wiki/Configuration-file#variables
-  -->
-  <variable name="myvar" value="myvalue"/>
-
-  <!-- 
-  See https://github.com/nlog/nlog/wiki/Configuration-file 
-  for information on customizing logging rules and outputs.
-   -->
-
-  <targets async="true">
-    <target xsi:type="File"
-            name="SteamWareLib"
-            fileName="${basedir}/logs/${shortdate}-SteamWare.log"
-            layout="${longdate} ${uppercase:${level}} ${message}"
-            /> 
-  </targets>
-
-  <rules>
-    <logger name="SteamWare.*" minlevel="Debug" writeTo="SteamWareLib" />
-  </rules>
-</nlog>

MP-SITE/example-app.config

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration xmlns="http://schemas.microsoft.com/.NetConfiguration/v2.0">
-  <connectionStrings>
-    <add name="SteamWare.Properties.Settings.loggerConnectionString" connectionString="Data Source=SQL2012DEV;Initial Catalog=Flamma_SC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.SteamWare_VocabolarioConnectionString" connectionString="Data Source=SQL2012DEV;Initial Catalog=SteamWare_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.DS_AuthConnectionString" connectionString="Data Source=SQL2012DEV;Initial Catalog=SteamWare_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.AnagraficaBremboConnectionString" connectionString="Data Source=SQL2012DEV;Initial Catalog=AnagraficaBrembo;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.SteamWare_BremboConnectionString" connectionString="Data Source=SQL2012DEV;Initial Catalog=SteamWare_Brembo;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.Flamma_AnagraficaConnectionString" connectionString="Data Source=SQL2012DEV;Initial Catalog=Flamma_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.AnagraficaConnectionString" connectionString="Data Source=SQL2012DEV;Initial Catalog=SteamWare_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.SEL_fatture_SteamWareConnectionString" connectionString="Data Source=SQLSTEAM;Initial Catalog=SEL_fatture_SteamWare;User ID=sa;Password=keyhammer;Encrypt=False;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.Equa_AnagraficaConnectionString" connectionString="Data Source=SQL2012DEV;Initial Catalog=Equa_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.GMWConnectionString" connectionString="Data Source=SQL2012DEV;Initial Catalog=GMW;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
-    <add name="SteamWare.Properties.Settings.DbConfConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
-  </connectionStrings>
-</configuration>

MP-SITE/example-config-table.txt

@@ -1,30 +0,0 @@
-# chiave  valore  valoreStd note
-_adminEmail	samuele@steamware.net,info@steamware.net	samuele@steamware.net,info@steamware.net	info@steamware.net
-_allowForceUser	true	true	abilita login forzato
-_commonPages	menu	menu	pagina comune
-_emailPwd	drmfsls16	drmfsls16	drmfsls16
-_emailUser	steamwarebot@gmail.com	steamwarebot@gmail.com	steamwarebot@gmail.com
-_enableSSL	true	true	true
-_fromEmail	webmaster@admodelling.org	webmaster@admodelling.org	email mittente eventuali msg
-_righeDataGrid	30	30	Num righe datagrid std
-_righeDataGridAnagr	20	20	Num righe datagrid anagrafiche
-_righeDataGridLong	30	30	Num righe datagrid long
-_righeDataGridMed	15	15	Num righe datagrid med
-_righeDataGridShort	10	10	Num righe datagrid short
-_smtpCli	smtp.gmail.com	smtp.gmail.com	smtp.gmail.com
-_useAIMSmtp	false	false	impiego client posta elettronica alternativo
-_useAuthSmtp	true	true	true
-AuthCookieName	admodellingAuth	admodellingAuth	Cookie applicativo
-autoConfCmd	true	true	Conferma automatica comandi barcode
-baseUrl	http://site_name	http://iis02/site_name	URL base del sito
-cacheValSec	60	60	Validità cache dati in gestore Barcode
-cookieDayExp	365	365	Periodo validità cookie
-cookieUsed	admodellingAuth	admodellingAuth,CTrack_CodOpr,CTrack_CodPost	Elenco dei cookie impiegati
-enableCookie	true	true	Abilitazione uso cookie
-enableLogOut	true	false	Abilita button logout COMPLETO in alto a sx
-enablePlain	true	true	Abilitazione decode plain
-maxAuth	1000	1000	num auth minimo per NON consumare tokens
-serializeSession	true	true	Serializzazione valori in sessione (REDIS)
-SiteName	iis02/site_name	iis02/site_name	Nome sito
-enableDumpDiag	false	false	abilitazione dumb diagnostico x eccezioni di default
-doShrinkFolder	true	true	Imposta compressione area LOGS

MP-Site/MP-Site.csproj

@@ -290,8 +290,6 @@
     <Content Include="DettaglioMacchina.aspx" />
     <Content Include="diagApp.aspx" />
     <Content Include="erroreComunicazione.aspx" />
-    <Content Include="example-config-table.txt" />
-    <Content Include="example-favicon.ico" />
     <Content Include="excelAllMacchineDatiConfermati.aspx" />
     <Content Include="excelAllMacchineExportEventi.aspx" />
     <Content Include="excelAllMacchineExportStati.aspx" />
@@ -326,6 +324,7 @@
     <Content Include="images\elimina_s.gif" />
     <Content Include="images\elimina_s.png" />
     <Content Include="images\empty.png" />
+    <Content Include="images\favicon.png" />
     <Content Include="images\LogoMapoNoText.png" />
     <Content Include="images\logoMoOnPro.png" />
     <Content Include="images\logoSteamware.png" />
@@ -373,8 +372,6 @@
     <Content Include="Scripts\esm\popper.js.map" />
     <Content Include="Scripts\esm\popper-utils.min.js.map" />
     <Content Include="Scripts\esm\popper-utils.js.map" />
-    <Content Include="example-NLog.config" />
-    <Content Include="example-app.config" />
     <Content Include="Core\Compression\Zstandard\lib\osx\libzstd.dylib" />
     <Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
     <Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />

MP-Site/MP-Site.csproj.user

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>

MP-Site/Web.Release.config

@@ -3,30 +3,12 @@
 <!-- Per altre informazioni sull'utilizzo della trasformazione web.config, vedere https://go.microsoft.com/fwlink/?LinkId=125889 -->
 
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    Nell'esempio seguente, la trasformazione "SetAttributes" modifica il valore di 
-    "connectionString" in modo da utilizzare "ReleaseSQLServer" solo quando il localizzatore "Match" 
-    individua un attributo "name" con valore "MyDB".
-    
-    <connectionStrings>
-      <add name="MyDB" 
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True" 
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
+    <appSettings>
+        <add key="RedisConn" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="RedisConnAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="redisDb" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+    </appSettings>
   <system.web>
     <compilation xdt:Transform="RemoveAttributes(debug)" />
-    <!--
-      
-      Nell'esempio seguente, la trasformazione "Replace" sostituisce l'intera 
-      sezione <customErrors> del file web.config.
-      Poiché è presente un'unica sezione customErrors nel 
-      nodo <system.web>, non è necessario utilizzare l'attributo "xdt:Locator".
-      
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
   </system.web>
 </configuration>

MP-Site/Web.config

@@ -14,8 +14,8 @@
     </configSections>
     <appSettings>
         <!--Redis conn-->
-        <add key="RedisConn" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
-        <add key="RedisConnAdmin" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
+        <add key="RedisConn" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
+        <add key="RedisConnAdmin" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
         <add key="redisDb" value="5" />
         <add key="aspnet:RequestQueueLimitPerSession" value="50" />
         <add key="aspnet:AllowConcurrentRequestsPerSession" value="true" />
@@ -34,6 +34,7 @@
         <!--DB 2016-->
         <add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+        <add key="MoonProConnectionStringFluxData" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Jetco_Anagrafica_prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
@@ -42,6 +43,9 @@
         <add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
         <add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
         <add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+        <add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
+          connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True"
+          providerName="System.Data.SqlClient" />
     </connectionStrings>
     <system.web>
         <httpHandlers>

MP-Site/WebMasterPages/MAPO_refresh.master

@@ -6,7 +6,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-    <title>MP.SITE: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
+    <title>MP-SITE</title>
     <%--vecchie libs esterne da deprecare--%>
     <%--<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />--%>
     <%--<script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.js" type="text/javascript"></script>

MP-Site/WebUserControls/mod_infoAggiuntive.ascx.cs

@@ -78,8 +78,8 @@ namespace MP_SITE.WebUserControls
                     }
                 }
                 dataFrom = rigaOdl.DataInizio;
-                lblOdl.Text = idxPOdl > 0 ? $"PODL{idxPOdl:00000000} | " : "[NO PODL] ";
-                lblOdl.Text += $"ODL{idxOdl:00000000}";
+                lblOdl.Text = idxPOdl > 0 ? $"PODL{idxPOdl:000000} | " : "[NO PODL] ";
+                lblOdl.Text += $"ODL{idxOdl:000000}";
                 lblOdlPer.Text = $"start: {dataFrom:dd/MM/yy HH:mm}";
             }
             catch

MP-Site/WebUserControls/mod_statoMacchina.ascx.cs

@@ -392,7 +392,7 @@ namespace MP_SITE.WebUserControls
                 // leggo valori da MSE...
                 valMacchina.Text = tabMSE[0].Nome;
                 valCodArticolo.Text = tabMSE[0].CodArticolo;
-                valPODL.Text = tabMSE[0].idxPODL > 0 ? $"PODL{tabMSE[0].idxPODL:00000000}" : "PODL -";
+                valPODL.Text = tabMSE[0].idxPODL > 0 ? $"PODL{tabMSE[0].idxPODL:000000}" : "PODL -";
                 valODL.Text = tabMSE[0].idxODL > 0 ? $"ODL{tabMSE[0].idxODL}" : "ODL -";
                 // carico ultimo stato che sia durato almeno 6 sec (0.1 min)
                 int idxStato = 0;

MP-TAB/Web.Release.config

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-	<appSettings>
-		<add key="forceHttps" value="false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
-	</appSettings>
-	<system.web>
-		<compilation xdt:Transform="RemoveAttributes(debug)" />
-	</system.web>
+    <appSettings>
+        <add key="RedisConn" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="RedisConnAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="redisDb" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+        <add key="forceHttps" value="false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+    </appSettings>
+    <system.web>
+        <compilation xdt:Transform="RemoveAttributes(debug)" />
+    </system.web>
 </configuration>

MP-TAB/Web.config

@@ -61,6 +61,7 @@
         <!--stringhe connessione SQL2016-->
         <add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+        <add key="MoonProConnectionStringFluxData" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
@@ -74,6 +75,9 @@
         <add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
         <add name="SteamWare.Properties.Settings.DbConfConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
         <add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+        <add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
+          connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True"
+          providerName="System.Data.SqlClient" />
     </connectionStrings>
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

MP-TAB/WebUserControls/mod_confProd.ascx.cs

@@ -437,11 +437,11 @@ namespace MoonProTablet.WebUserControls
             if (confRett)
             {
                 // confermo al netto dei pezzi lasciati...
-                fatto = DataLayerObj.confermaProdMacchinaFull(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), numPzConfermati - numPzLasciati, numPzLasciati, numPzScarto2Rec, dtReqUpdate);
+                fatto = DataLayerObj.confermaProdMacchinaFull(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), numPzConfermati - numPzLasciati, numPzLasciati, numPzScarto2Rec, dtReqUpdate, DataLayerObj.MatrOpr);
             }
             else
             {
-                fatto = DataLayerObj.confermaProdMacchina(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), numPzConfermati, numPzScarto2Rec, dtReqUpdate);
+                fatto = DataLayerObj.confermaProdMacchina(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), numPzConfermati, numPzScarto2Rec, dtReqUpdate, DataLayerObj.MatrOpr);
             }
             return fatto;
         }

MP-TAB/WebUserControls/mod_dettMacchina.ascx

@@ -21,7 +21,7 @@
                                     </div>
                                     <div class="col-8 px-1 small text-end">
                                         <asp:Label runat="server" ID="lblBadge" Text='<%# Eval("CodArticolo","art: {0}") %>' />
-                                        <asp:Label runat="server" ID="lblODC" Text='<%# Eval("idxODL","ODL{0:00000000}") + " | " + Eval("idxPODL","PODL{0:00000000}") + " | " + keyRichiesta %>' />
+                                        <asp:Label runat="server" ID="lblODC" Text='<%# Eval("idxODL","ODL{0:000000}") + " | " + Eval("idxPODL","PODL{0:000000}") + " | " + keyRichiesta %>' />
                                     </div>
                                     <div class='col-12 px-1 <%# Eval("Semaforo") %>'>
                                         <div class="d-flex justify-content-between">

MP-TAB/WebUserControls/mod_mappaStato.ascx

@@ -23,10 +23,10 @@
                                             </div>
                                             <div class="row small">
                                                 <div class="col-6 text-start">
-                                                    <asp:Label runat="server" ID="lblPODL" Text='<%# Eval("idxPODL"," PODL{0:00000000}") %>' />
+                                                    <asp:Label runat="server" ID="lblPODL" Text='<%# Eval("idxPODL"," PODL{0:000000}") %>' />
                                                 </div>
                                                 <div class="col-6 text-end">
-                                                    <asp:Label runat="server" ID="lblODL" Text='<%# Eval("idxODL","ODL{0:00000000}") %>' />
+                                                    <asp:Label runat="server" ID="lblODL" Text='<%# Eval("idxODL","ODL{0:000000}") %>' />
                                                 </div>
                                             </div>
                                         </div>

MapoDb/DS_DossPar.Designer.cs

@@ -1340,7 +1340,7 @@ SELECT IdxDossier, IdxMacchina, DtRif, IdxODL, CodArticolo, DataType, Valore FRO
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.SqlClient.SqlConnection();
-            this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonProConnectionString;
+            this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonPro_FluxDataConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1796,7 +1796,7 @@ SELECT IdxMacchina, CodFlux, EnabDoss FROM ConfFlux WHERE (CodFlux = @CodFlux) A
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.SqlClient.SqlConnection();
-            this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonProConnectionString;
+            this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonPro_FluxDataConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

MapoDb/DS_DossPar.xsd

@@ -2,14 +2,15 @@
 <xs:schema id="DS_DossPar" targetNamespace="http://tempuri.org/DS_DossPar.xsd" xmlns:mstns="http://tempuri.org/DS_DossPar.xsd" xmlns="http://tempuri.org/DS_DossPar.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified">
   <xs:annotation>
     <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
-      <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+      <DataSource DefaultConnectionIndex="1" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
         <Connections>
           <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="MoonProConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="MoonProConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.MapoDb.Properties.Settings.GlobalReference.Default.MoonProConnectionString" Provider="System.Data.SqlClient" />
+          <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="MoonPro_FluxDataConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="MoonPro_FluxDataConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.MapoDb.Properties.Settings.GlobalReference.Default.MoonPro_FluxDataConnectionString" Provider="System.Data.SqlClient" />
         </Connections>
         <Tables>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="DossiersTableAdapter" GeneratorDataComponentClassName="DossiersTableAdapter" Name="Dossiers" UserDataComponentName="DossiersTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.Dossiers" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.Dossiers" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>DELETE FROM [Dossiers] WHERE (([IdxDossier] = @Original_IdxDossier) AND ([IdxMacchina] = @Original_IdxMacchina) AND ([DtRif] = @Original_DtRif) AND ([IdxODL] = @Original_IdxODL) AND ([CodArticolo] = @Original_CodArticolo) AND ([DataType] = @Original_DataType))</CommandText>
@@ -77,7 +78,7 @@ SELECT IdxDossier, IdxMacchina, DtRif, IdxODL, CodArticolo, DataType, Valore FRO
               <Mapping SourceColumn="Valore" DataSetColumn="Valore" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_DOSS_getLastByArt" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getLastByArt" GetMethodModifier="Public" GetMethodName="getLastByArt" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getLastByArt" UserSourceName="getLastByArt">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectType="Unknown" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getLastByArt" GetMethodModifier="Public" GetMethodName="getLastByArt" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getLastByArt" UserSourceName="getLastByArt">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_DOSS_getLastByArt</CommandText>
@@ -88,7 +89,7 @@ SELECT IdxDossier, IdxMacchina, DtRif, IdxODL, CodArticolo, DataType, Valore FRO
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_DOSS_getLastByMacch" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getLastByMacc" GetMethodModifier="Public" GetMethodName="getLastByMacc" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getLastByMacc" UserSourceName="getLastByMacc">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectType="Unknown" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getLastByMacc" GetMethodModifier="Public" GetMethodName="getLastByMacc" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getLastByMacc" UserSourceName="getLastByMacc">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_DOSS_getLastByMacch</CommandText>
@@ -99,7 +100,7 @@ SELECT IdxDossier, IdxMacchina, DtRif, IdxODL, CodArticolo, DataType, Valore FRO
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_DOSS_getLastByPODL" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getLastByPODL" GetMethodModifier="Public" GetMethodName="getLastByPODL" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getLastByPODL" UserSourceName="getLastByPODL">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectType="Unknown" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getLastByPODL" GetMethodModifier="Public" GetMethodName="getLastByPODL" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getLastByPODL" UserSourceName="getLastByPODL">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_DOSS_getLastByPODL</CommandText>
@@ -113,7 +114,7 @@ SELECT IdxDossier, IdxMacchina, DtRif, IdxODL, CodArticolo, DataType, Valore FRO
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ConfFluxTableAdapter" GeneratorDataComponentClassName="ConfFluxTableAdapter" Name="ConfFlux" UserDataComponentName="ConfFluxTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.ConfFlux" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.ConfFlux" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>DELETE FROM [ConfFlux] WHERE (([IdxMacchina] = @Original_IdxMacchina) AND ([CodFlux] = @Original_CodFlux) AND ([EnabDoss] = @Original_EnabDoss))</CommandText>
@@ -179,30 +180,30 @@ SELECT IdxMacchina, CodFlux, EnabDoss FROM ConfFlux WHERE (CodFlux = @CodFlux) A
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxDossier" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="IdxDossierColumn" msprop:Generator_ColumnPropNameInRow="IdxDossier" msprop:Generator_UserColumnName="IdxDossier" msprop:Generator_ColumnVarNameInTable="columnIdxDossier" type="xs:int" />
-              <xs:element name="IdxMacchina" msprop:Generator_UserColumnName="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina">
+              <xs:element name="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_UserColumnName="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="DtRif" msprop:Generator_UserColumnName="DtRif" msprop:Generator_ColumnPropNameInTable="DtRifColumn" msprop:Generator_ColumnPropNameInRow="DtRif" msprop:Generator_ColumnVarNameInTable="columnDtRif" type="xs:dateTime" />
-              <xs:element name="IdxODL" msprop:Generator_UserColumnName="IdxODL" msprop:Generator_ColumnPropNameInTable="IdxODLColumn" msprop:Generator_ColumnPropNameInRow="IdxODL" msprop:Generator_ColumnVarNameInTable="columnIdxODL" type="xs:int" />
-              <xs:element name="CodArticolo" msprop:Generator_UserColumnName="CodArticolo" msprop:Generator_ColumnPropNameInTable="CodArticoloColumn" msprop:Generator_ColumnPropNameInRow="CodArticolo" msprop:Generator_ColumnVarNameInTable="columnCodArticolo">
+              <xs:element name="DtRif" msprop:Generator_ColumnPropNameInTable="DtRifColumn" msprop:Generator_ColumnPropNameInRow="DtRif" msprop:Generator_UserColumnName="DtRif" msprop:Generator_ColumnVarNameInTable="columnDtRif" type="xs:dateTime" />
+              <xs:element name="IdxODL" msprop:Generator_ColumnPropNameInTable="IdxODLColumn" msprop:Generator_ColumnPropNameInRow="IdxODL" msprop:Generator_UserColumnName="IdxODL" msprop:Generator_ColumnVarNameInTable="columnIdxODL" type="xs:int" />
+              <xs:element name="CodArticolo" msprop:Generator_ColumnPropNameInTable="CodArticoloColumn" msprop:Generator_ColumnPropNameInRow="CodArticolo" msprop:Generator_UserColumnName="CodArticolo" msprop:Generator_ColumnVarNameInTable="columnCodArticolo">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="DataType" msprop:Generator_UserColumnName="DataType" msprop:Generator_ColumnPropNameInTable="DataTypeColumn" msprop:Generator_ColumnPropNameInRow="DataType" msprop:Generator_ColumnVarNameInTable="columnDataType">
+              <xs:element name="DataType" msprop:Generator_ColumnPropNameInTable="DataTypeColumn" msprop:Generator_ColumnPropNameInRow="DataType" msprop:Generator_UserColumnName="DataType" msprop:Generator_ColumnVarNameInTable="columnDataType">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Valore" msprop:Generator_UserColumnName="Valore" msprop:Generator_ColumnPropNameInTable="ValoreColumn" msprop:Generator_ColumnPropNameInRow="Valore" msprop:Generator_ColumnVarNameInTable="columnValore">
+              <xs:element name="Valore" msprop:Generator_ColumnPropNameInTable="ValoreColumn" msprop:Generator_ColumnPropNameInRow="Valore" msprop:Generator_UserColumnName="Valore" msprop:Generator_ColumnVarNameInTable="columnValore">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
@@ -212,24 +213,24 @@ SELECT IdxMacchina, CodFlux, EnabDoss FROM ConfFlux WHERE (CodFlux = @CodFlux) A
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ConfFlux" msprop:Generator_RowEvHandlerName="ConfFluxRowChangeEventHandler" msprop:Generator_RowDeletedName="ConfFluxRowDeleted" msprop:Generator_RowDeletingName="ConfFluxRowDeleting" msprop:Generator_RowEvArgName="ConfFluxRowChangeEvent" msprop:Generator_TablePropName="ConfFlux" msprop:Generator_RowChangedName="ConfFluxRowChanged" msprop:Generator_RowChangingName="ConfFluxRowChanging" msprop:Generator_TableClassName="ConfFluxDataTable" msprop:Generator_RowClassName="ConfFluxRow" msprop:Generator_TableVarName="tableConfFlux" msprop:Generator_UserTableName="ConfFlux">
+        <xs:element name="ConfFlux" msprop:Generator_RowClassName="ConfFluxRow" msprop:Generator_RowEvHandlerName="ConfFluxRowChangeEventHandler" msprop:Generator_RowDeletedName="ConfFluxRowDeleted" msprop:Generator_RowDeletingName="ConfFluxRowDeleting" msprop:Generator_RowEvArgName="ConfFluxRowChangeEvent" msprop:Generator_TablePropName="ConfFlux" msprop:Generator_RowChangedName="ConfFluxRowChanged" msprop:Generator_UserTableName="ConfFlux" msprop:Generator_RowChangingName="ConfFluxRowChanging" msprop:Generator_TableClassName="ConfFluxDataTable" msprop:Generator_TableVarName="tableConfFlux">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_UserColumnName="IdxMacchina">
+              <xs:element name="IdxMacchina" msprop:Generator_UserColumnName="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CodFlux" msprop:Generator_ColumnPropNameInRow="CodFlux" msprop:Generator_ColumnPropNameInTable="CodFluxColumn" msprop:Generator_ColumnVarNameInTable="columnCodFlux" msprop:Generator_UserColumnName="CodFlux">
+              <xs:element name="CodFlux" msprop:Generator_UserColumnName="CodFlux" msprop:Generator_ColumnPropNameInTable="CodFluxColumn" msprop:Generator_ColumnPropNameInRow="CodFlux" msprop:Generator_ColumnVarNameInTable="columnCodFlux">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="EnabDoss" msprop:Generator_ColumnPropNameInRow="EnabDoss" msprop:Generator_ColumnPropNameInTable="EnabDossColumn" msprop:Generator_ColumnVarNameInTable="columnEnabDoss" msprop:Generator_UserColumnName="EnabDoss" type="xs:boolean" />
+              <xs:element name="EnabDoss" msprop:Generator_UserColumnName="EnabDoss" msprop:Generator_ColumnPropNameInTable="EnabDossColumn" msprop:Generator_ColumnPropNameInRow="EnabDoss" msprop:Generator_ColumnVarNameInTable="columnEnabDoss" type="xs:boolean" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

MapoDb/DS_ProdTempi.Designer.cs

@@ -9864,6 +9864,8 @@ namespace MapoDb {
             
             private global::System.Data.DataColumn columnDataTo;
             
+            private global::System.Data.DataColumn columnPz2RecRilav;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public StatoProdDataTable() {
@@ -9977,6 +9979,14 @@ namespace MapoDb {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn Pz2RecRilavColumn {
+                get {
+                    return this.columnPz2RecRilav;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -10014,7 +10024,7 @@ namespace MapoDb {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public StatoProdRow AddStatoProdRow(string idxMacchina, int IdxOdl, int PzTotODL, int PzConfScarto, int PzConfBuoni, int PzRichODL, int Pz2RecTot, int Pz2RecScarto, System.DateTime DataFrom, System.DateTime DataTo) {
+            public StatoProdRow AddStatoProdRow(string idxMacchina, int IdxOdl, int PzTotODL, int PzConfScarto, int PzConfBuoni, int PzRichODL, int Pz2RecTot, int Pz2RecScarto, System.DateTime DataFrom, System.DateTime DataTo, int Pz2RecRilav) {
                 StatoProdRow rowStatoProdRow = ((StatoProdRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         idxMacchina,
@@ -10026,7 +10036,8 @@ namespace MapoDb {
                         Pz2RecTot,
                         Pz2RecScarto,
                         DataFrom,
-                        DataTo};
+                        DataTo,
+                        Pz2RecRilav};
                 rowStatoProdRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowStatoProdRow);
                 return rowStatoProdRow;
@@ -10059,6 +10070,7 @@ namespace MapoDb {
                 this.columnPz2RecScarto = base.Columns["Pz2RecScarto"];
                 this.columnDataFrom = base.Columns["DataFrom"];
                 this.columnDataTo = base.Columns["DataTo"];
+                this.columnPz2RecRilav = base.Columns["Pz2RecRilav"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10084,6 +10096,8 @@ namespace MapoDb {
                 base.Columns.Add(this.columnDataFrom);
                 this.columnDataTo = new global::System.Data.DataColumn("DataTo", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnDataTo);
+                this.columnPz2RecRilav = new global::System.Data.DataColumn("Pz2RecRilav", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPz2RecRilav);
                 this.columnidxMacchina.ReadOnly = true;
                 this.columnidxMacchina.MaxLength = 50;
                 this.columnIdxOdl.ReadOnly = true;
@@ -10095,6 +10109,7 @@ namespace MapoDb {
                 this.columnPz2RecScarto.ReadOnly = true;
                 this.columnDataFrom.ReadOnly = true;
                 this.columnDataTo.ReadOnly = true;
+                this.columnPz2RecRilav.ReadOnly = true;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -15756,6 +15771,22 @@ namespace MapoDb {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public int Pz2RecRilav {
+                get {
+                    try {
+                        return ((int)(this[this.tableStatoProd.Pz2RecRilavColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'Pz2RecRilav\' in table \'StatoProd\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableStatoProd.Pz2RecRilavColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IsidxMacchinaNull() {
@@ -15875,6 +15906,18 @@ namespace MapoDb {
             public void SetDataToNull() {
                 this[this.tableStatoProd.DataToColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsPz2RecRilavNull() {
+                return this.IsNull(this.tableStatoProd.Pz2RecRilavColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetPz2RecRilavNull() {
+                this[this.tableStatoProd.Pz2RecRilavColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -29230,6 +29273,7 @@ SELECT IdxMacchina, T1, T2, T3 FROM TurniMacchina WHERE (IdxMacchina = @IdxMacch
             tableMapping.ColumnMappings.Add("Pz2RecScarto", "Pz2RecScarto");
             tableMapping.ColumnMappings.Add("DataFrom", "DataFrom");
             tableMapping.ColumnMappings.Add("DataTo", "DataTo");
+            tableMapping.ColumnMappings.Add("Pz2RecRilav", "Pz2RecRilav");
             this._adapter.TableMappings.Add(tableMapping);
         }
         

MapoDb/DS_ProdTempi.xss

@@ -4,32 +4,32 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="133" ViewPortY="964" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:TempiCicloRilevati" ZOrder="15" X="20" Y="81" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:ODL" ZOrder="2" X="588" Y="452" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:AnagArticoli" ZOrder="1" X="20" Y="343" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:ODL" ZOrder="3" X="588" Y="452" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagArticoli" ZOrder="2" X="20" Y="343" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:DatiMacchine" ZOrder="21" X="949" Y="353" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:PostazioniMapo" ZOrder="24" X="950" Y="39" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:stp_PzProd_getByMacchina" ZOrder="8" X="23" Y="754" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:stp_PzProd_getByMacchina" ZOrder="9" X="23" Y="754" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:DatiConfermati" ZOrder="23" X="585" Y="50" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:CalendFesteFerie" ZOrder="13" X="346" Y="364" Height="115" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="5" X="31" Y="976" Height="97" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="46" SplitterPosition="46" />
+    <Shape ID="DesignTable:CalendFesteFerie" ZOrder="14" X="346" Y="364" Height="115" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="6" X="31" Y="976" Height="97" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="46" SplitterPosition="46" />
     <Shape ID="DesignTable:DatiProduzione" ZOrder="20" X="554" Y="922" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchina" ZOrder="11" X="949" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchina" ZOrder="12" X="949" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:stp_repDonati_getLastStatoDurataMacchina" ZOrder="22" X="957" Y="1072" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchinaPeriodo" ZOrder="12" X="26" Y="1152" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchinaPeriodo" ZOrder="13" X="26" Y="1152" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:TurniMacchina" ZOrder="16" X="363" Y="94" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:MappaStatoExpl" ZOrder="10" X="950" Y="1208" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:ResProdDett_splitODL" ZOrder="7" X="940" Y="2192" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:MappaStatoExpl" ZOrder="11" X="950" Y="1208" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:ResProdDett_splitODL" ZOrder="8" X="940" Y="2192" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:ResProdDett_splitGG" ZOrder="17" X="27" Y="2218" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:ResProdTot" ZOrder="18" X="544" Y="2122" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:RegistroControlli" ZOrder="3" X="536" Y="1403" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:RegistroScarti" ZOrder="4" X="25" Y="1371" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:PromesseODL" ZOrder="9" X="946" Y="1728" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:RegistroControlli" ZOrder="4" X="536" Y="1403" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:RegistroScarti" ZOrder="5" X="25" Y="1371" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PromesseODL" ZOrder="10" X="946" Y="1728" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:ElencoConfermeProd" ZOrder="19" X="26" Y="1839" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:StatoProd" ZOrder="14" X="541" Y="1777" Height="286" Width="284" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:Macchine2Slave" ZOrder="6" X="333" Y="559" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:StatoProd" ZOrder="1" X="541" Y="1777" Height="305" Width="283" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:Macchine2Slave" ZOrder="7" X="333" Y="559" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

MapoDb/DS_applicazione.xsd

@@ -5,6 +5,7 @@
       <DataSource DefaultConnectionIndex="1" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
         <Connections>
           <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="MoonProConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="MoonProConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.MapoDb.Properties.Settings.GlobalReference.Default.MoonProConnectionString" Provider="System.Data.SqlClient" />
+          <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="MoonPro_FluxDataConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="MoonPro_FluxDataConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.MapoDb.Properties.Settings.GlobalReference.Default.MoonPro_FluxDataConnectionString" Provider="System.Data.SqlClient" />
         </Connections>
         <Tables>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Macchine2FamiglieMacchineTableAdapter" GeneratorDataComponentClassName="Macchine2FamiglieMacchineTableAdapter" Name="Macchine2FamiglieMacchine" UserDataComponentName="Macchine2FamiglieMacchineTableAdapter">
@@ -2228,6 +2229,17 @@ SELECT idxReboot, IdxMacchina, IPv4, Agent, DataOraBoot, macAddr FROM RemoteRebo
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_RRL_KeepLatest" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="KeepLatest" Modifier="Public" Name="KeepLatest" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="KeepLatest">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_RRL_KeepLatest</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@num2keep" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
             </Sources>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ParetoDurateTableAdapter" GeneratorDataComponentClassName="ParetoDurateTableAdapter" Name="ParetoDurate" UserDataComponentName="ParetoDurateTableAdapter">
@@ -2475,7 +2487,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew, Disegno FROM Anag
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="FluxLogTableAdapter" GeneratorDataComponentClassName="FluxLogTableAdapter" Name="FluxLog" UserDataComponentName="FluxLogTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.FluxLog" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.FluxLog" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>DELETE FROM [dbo].[FluxLog] WHERE (([IdxMacchina] = @Original_IdxMacchina) AND ([dtEvento] = @Original_dtEvento) AND ([CodFlux] = @Original_CodFlux) AND ([Valore] = @Original_Valore) AND ([Cnt] = @Original_Cnt))</CommandText>
@@ -2535,7 +2547,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
               <Mapping SourceColumn="Cnt" DataSetColumn="Cnt" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_FL_getFilt" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFilt" GetMethodModifier="Public" GetMethodName="getFilt" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFilt" UserSourceName="getFilt">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.stp_FL_getFilt" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFilt" GetMethodModifier="Public" GetMethodName="getFilt" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFilt" UserSourceName="getFilt">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_FL_getFilt</CommandText>
@@ -2549,7 +2561,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_FL_getFiltCount" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="getFiltCount" Modifier="Public" Name="getFiltCount" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="getFiltCount">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.stp_FL_getFiltCount" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="getFiltCount" Modifier="Public" Name="getFiltCount" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="getFiltCount">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_FL_getFiltCount</CommandText>
@@ -2564,7 +2576,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_FL_getFiltOrdered" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFiltOrd" GetMethodModifier="Public" GetMethodName="getFiltOrd" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFiltOrd" UserSourceName="getFiltOrd">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.stp_FL_getFiltOrdered" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFiltOrd" GetMethodModifier="Public" GetMethodName="getFiltOrd" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFiltOrd" UserSourceName="getFiltOrd">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_FL_getFiltOrdered</CommandText>
@@ -2579,7 +2591,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_FL_getFiltPaged" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFiltPaged" GetMethodModifier="Public" GetMethodName="getFiltPaged" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFiltPaged" UserSourceName="getFiltPaged">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.stp_FL_getFiltPaged" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFiltPaged" GetMethodModifier="Public" GetMethodName="getFiltPaged" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFiltPaged" UserSourceName="getFiltPaged">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_FL_getFiltPaged</CommandText>
@@ -2596,7 +2608,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_FL_getFirstByMacc" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFirstByMacc" GetMethodModifier="Public" GetMethodName="getFirstByMacc" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFirstByMacc" UserSourceName="getFirstByMacc">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.stp_FL_getFirstByMacc" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFirstByMacc" GetMethodModifier="Public" GetMethodName="getFirstByMacc" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFirstByMacc" UserSourceName="getFirstByMacc">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_FL_getFirstByMacc</CommandText>
@@ -2608,7 +2620,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_FL_InsNew" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="InsNew" Modifier="Public" Name="InsNew" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="InsNew">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.stp_FL_InsNew" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="InsNew" Modifier="Public" Name="InsNew" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="InsNew">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_FL_InsNew</CommandText>
@@ -2623,7 +2635,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_FL_TakeSnapshot" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="takeSnapshot" Modifier="Public" Name="takeSnapshot" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="takeSnapshot">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.stp_FL_TakeSnapshot" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="takeSnapshot" Modifier="Public" Name="takeSnapshot" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="takeSnapshot">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_FL_TakeSnapshot</CommandText>
@@ -2635,7 +2647,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_FL_TakeSnapshotLast" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="TakeSnapshotLast" Modifier="Public" Name="TakeSnapshotLast" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="TakeSnapshotLast">
+              <DbSource ConnectionRef="MoonPro_FluxDataConnectionString (Settings)" DbObjectName="MoonPro_FluxData.dbo.stp_FL_TakeSnapshotLast" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="TakeSnapshotLast" Modifier="Public" Name="TakeSnapshotLast" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="TakeSnapshotLast">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.stp_FL_TakeSnapshotLast</CommandText>
@@ -3030,6 +3042,79 @@ FROM v_AlarmLog</CommandText>
               </DbSource>
             </Sources>
           </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="DecNumArticoliTableAdapter" GeneratorDataComponentClassName="DecNumArticoliTableAdapter" Name="DecNumArticoli" UserDataComponentName="DecNumArticoliTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.DecNumArticoli" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM [dbo].[FluxLog] WHERE (([IdxMacchina] = @Original_IdxMacchina) AND ([dtEvento] = @Original_dtEvento) AND ([CodFlux] = @Original_CodFlux) AND ([Valore] = @Original_Valore) AND ([Cnt] = @Original_Cnt))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="IdxMacchina" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_dtEvento" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dtEvento" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodFlux" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodFlux" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Valore" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Valore" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Cnt" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <InsertCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>INSERT INTO [dbo].[FluxLog] ([IdxMacchina], [dtEvento], [CodFlux], [Valore], [Cnt]) VALUES (@IdxMacchina, @dtEvento, @CodFlux, @Valore, @Cnt);
+SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = @CodFlux) AND (IdxMacchina = @IdxMacchina) AND (dtEvento = @dtEvento)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="IdxMacchina" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@dtEvento" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dtEvento" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodFlux" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodFlux" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Valore" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Valore" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT        CodArticolo, NumART
+FROM            DecNumArticoli</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE [dbo].[FluxLog] SET [IdxMacchina] = @IdxMacchina, [dtEvento] = @dtEvento, [CodFlux] = @CodFlux, [Valore] = @Valore, [Cnt] = @Cnt WHERE (([IdxMacchina] = @Original_IdxMacchina) AND ([dtEvento] = @Original_dtEvento) AND ([CodFlux] = @Original_CodFlux) AND ([Valore] = @Original_Valore) AND ([Cnt] = @Original_Cnt));
+SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = @CodFlux) AND (IdxMacchina = @IdxMacchina) AND (dtEvento = @dtEvento)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="IdxMacchina" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@dtEvento" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dtEvento" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodFlux" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodFlux" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Valore" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Valore" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="IdxMacchina" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_dtEvento" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dtEvento" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodFlux" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodFlux" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Valore" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Valore" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Cnt" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="CodArticolo" DataSetColumn="CodArticolo" />
+              <Mapping SourceColumn="NumART" DataSetColumn="NumART" />
+            </Mappings>
+            <Sources>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_getArtDecNum" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getByKey" GetMethodModifier="Public" GetMethodName="getByKey" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getByKey" UserSourceName="getByKey">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_getArtDecNum</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodArt" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </Sources>
+          </TableAdapter>
         </Tables>
         <Sources />
       </DataSource>
@@ -3912,6 +3997,20 @@ FROM v_AlarmLog</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="DecNumArticoli" msprop:Generator_RowEvHandlerName="DecNumArticoliRowChangeEventHandler" msprop:Generator_RowDeletedName="DecNumArticoliRowDeleted" msprop:Generator_RowDeletingName="DecNumArticoliRowDeleting" msprop:Generator_RowEvArgName="DecNumArticoliRowChangeEvent" msprop:Generator_TablePropName="DecNumArticoli" msprop:Generator_RowChangedName="DecNumArticoliRowChanged" msprop:Generator_UserTableName="DecNumArticoli" msprop:Generator_RowChangingName="DecNumArticoliRowChanging" msprop:Generator_RowClassName="DecNumArticoliRow" msprop:Generator_TableClassName="DecNumArticoliDataTable" msprop:Generator_TableVarName="tableDecNumArticoli">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="CodArticolo" msprop:Generator_ColumnPropNameInTable="CodArticoloColumn" msprop:Generator_ColumnPropNameInRow="CodArticolo" msprop:Generator_UserColumnName="CodArticolo" msprop:Generator_ColumnVarNameInTable="columnCodArticolo">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="NumART" msprop:Generator_ColumnPropNameInTable="NumARTColumn" msprop:Generator_ColumnPropNameInRow="NumART" msprop:Generator_UserColumnName="NumART" msprop:Generator_ColumnVarNameInTable="columnNumART" type="xs:int" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:choice>
     </xs:complexType>
     <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -4045,33 +4144,37 @@ FROM v_AlarmLog</CommandText>
       <xs:selector xpath=".//mstns:AlarmLog" />
       <xs:field xpath="mstns:AlarmLogId" />
     </xs:unique>
-    <xs:keyref name="FK_AnagTags_DiarioDichiarazioni" refer="AnagTags_Constraint1" msprop:rel_Generator_UserParentTable="AnagTags" msprop:rel_Generator_UserChildTable="DiarioDichiarazioni" msprop:rel_Generator_RelationVarName="relationFK_AnagTags_DiarioDichiarazioni" msprop:rel_Generator_ChildPropName="GetDiarioDichiarazioniRows" msprop:rel_Generator_ParentPropName="AnagTagsRow" msprop:rel_Generator_UserRelationName="FK_AnagTags_DiarioDichiarazioni">
+    <xs:unique name="DecNumArticoli_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:DecNumArticoli" />
+      <xs:field xpath="mstns:CodArticolo" />
+    </xs:unique>
+    <xs:keyref name="FK_AnagTags_DiarioDichiarazioni" refer="AnagTags_Constraint1" msprop:rel_Generator_UserParentTable="AnagTags" msprop:rel_Generator_UserChildTable="DiarioDichiarazioni" msprop:rel_Generator_RelationVarName="relationFK_AnagTags_DiarioDichiarazioni" msprop:rel_Generator_ChildPropName="GetDiarioDichiarazioniRows" msprop:rel_Generator_UserRelationName="FK_AnagTags_DiarioDichiarazioni" msprop:rel_Generator_ParentPropName="AnagTagsRow">
       <xs:selector xpath=".//mstns:DiarioDichiarazioni" />
       <xs:field xpath="mstns:TagCode" />
     </xs:keyref>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserParentTable="FamiglieMacchine" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_ParentPropName="FamiglieMacchineRow" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_FamiglieMacchine" />
-      <msdata:Relationship name="FK_Macchine2FamiglieMacchine_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserParentTable="Macchine" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_Macchine" />
-      <msdata:Relationship name="FK_TransizioneStati_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="TransizioneStati" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserParentTable="FamiglieMacchine" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_RelationVarName="relationFK_TransizioneStati_FamiglieMacchine" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_ParentPropName="FamiglieMacchineRow" msprop:Generator_UserRelationName="FK_TransizioneStati_FamiglieMacchine" />
-      <msdata:Relationship name="FK_StatoMacchine_Macchine" msdata:parent="Macchine" msdata:child="StatoMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserParentTable="Macchine" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_RelationVarName="relationFK_StatoMacchine_Macchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_UserRelationName="FK_StatoMacchine_Macchine" />
-      <msdata:Relationship name="FK_TransizioneStati_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="TransizioneStati" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_ParentPropName="AnagraficaStatiRow" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaStati" />
-      <msdata:Relationship name="FK_StatoMacchine_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="StatoMacchine" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaStati" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_ParentPropName="AnagraficaStatiRow" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaStati" />
-      <msdata:Relationship name="FK_EventList_Macchine" msdata:parent="Macchine" msdata:child="EventList" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserParentTable="Macchine" msprop:Generator_UserChildTable="EventList" msprop:Generator_RelationVarName="relationFK_EventList_Macchine" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_UserRelationName="FK_EventList_Macchine" />
-      <msdata:Relationship name="FK_TransizioneStati_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneStati" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaEventi" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaEventi" />
-      <msdata:Relationship name="FK_EventList_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="EventList" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_UserChildTable="EventList" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaEventi" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_UserRelationName="FK_EventList_AnagraficaEventi" />
-      <msdata:Relationship name="FK_DiarioDiBordo_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="DiarioDiBordo" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaStati" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_ParentPropName="AnagraficaStatiRow" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaStati" />
-      <msdata:Relationship name="FK_DiarioDiBordo_Macchine" msdata:parent="Macchine" msdata:child="DiarioDiBordo" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserParentTable="Macchine" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_Macchine" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_UserRelationName="FK_DiarioDiBordo_Macchine" />
-      <msdata:Relationship name="FK_TransizioneEventi_AnagraficaEventi1" msdata:parent="AnagraficaEventi" msdata:child="TransizioneEventi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_UserChildTable="TransizioneEventi" msprop:Generator_RelationVarName="relationFK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_ChildPropName="GetTransizioneEventiRows" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_UserRelationName="FK_TransizioneEventi_AnagraficaEventi1" />
-      <msdata:Relationship name="FK_Macchine2FamigliaIngressi_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserParentTable="Macchine" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_Macchine" />
-      <msdata:Relationship name="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserParentTable="FamigliaTipoIngressi" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" />
-      <msdata:Relationship name="FK_TransizioneIngressi_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_UserRelationName="FK_TransizioneIngressi_AnagraficaEventi" />
-      <msdata:Relationship name="FK_TransizioneIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserParentTable="FamigliaTipoIngressi" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" msprop:Generator_UserRelationName="FK_TransizioneIngressi_FamigliaTipoIngressi" />
-      <msdata:Relationship name="FK_DiarioDiBordo_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="DiarioDiBordo" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaOperatori" />
-      <msdata:Relationship name="FK_EventList_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="EventList" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_UserChildTable="EventList" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaOperatori" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" msprop:Generator_UserRelationName="FK_EventList_AnagraficaOperatori" />
-      <msdata:Relationship name="FK_StatoMacchine_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="StatoMacchine" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaOperatori" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaOperatori" />
-      <msdata:Relationship name="AnagArticoli_DiarioDiBordo" msdata:parent="AnagArticoli" msdata:child="DiarioDiBordo" msdata:parentkey="CodArticolo" msdata:childkey="CodArticolo" msprop:Generator_UserParentTable="AnagArticoli" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_RelationVarName="relationAnagArticoli_DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_ParentPropName="AnagArticoliRow" msprop:Generator_UserRelationName="AnagArticoli_DiarioDiBordo" />
+      <msdata:Relationship name="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserParentTable="FamiglieMacchine" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_ParentPropName="FamiglieMacchineRow" />
+      <msdata:Relationship name="FK_Macchine2FamiglieMacchine_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserParentTable="Macchine" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_ParentPropName="MacchineRow" />
+      <msdata:Relationship name="FK_TransizioneStati_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="TransizioneStati" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserParentTable="FamiglieMacchine" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_RelationVarName="relationFK_TransizioneStati_FamiglieMacchine" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_FamiglieMacchine" msprop:Generator_ParentPropName="FamiglieMacchineRow" />
+      <msdata:Relationship name="FK_StatoMacchine_Macchine" msdata:parent="Macchine" msdata:child="StatoMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserParentTable="Macchine" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_RelationVarName="relationFK_StatoMacchine_Macchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_Macchine" msprop:Generator_ParentPropName="MacchineRow" />
+      <msdata:Relationship name="FK_TransizioneStati_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="TransizioneStati" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" />
+      <msdata:Relationship name="FK_StatoMacchine_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="StatoMacchine" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaStati" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" />
+      <msdata:Relationship name="FK_EventList_Macchine" msdata:parent="Macchine" msdata:child="EventList" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserParentTable="Macchine" msprop:Generator_UserChildTable="EventList" msprop:Generator_RelationVarName="relationFK_EventList_Macchine" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_Macchine" msprop:Generator_ParentPropName="MacchineRow" />
+      <msdata:Relationship name="FK_TransizioneStati_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneStati" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaEventi" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
+      <msdata:Relationship name="FK_EventList_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="EventList" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_UserChildTable="EventList" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaEventi" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
+      <msdata:Relationship name="FK_DiarioDiBordo_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="DiarioDiBordo" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaStati" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" />
+      <msdata:Relationship name="FK_DiarioDiBordo_Macchine" msdata:parent="Macchine" msdata:child="DiarioDiBordo" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserParentTable="Macchine" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_Macchine" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_Macchine" msprop:Generator_ParentPropName="MacchineRow" />
+      <msdata:Relationship name="FK_TransizioneEventi_AnagraficaEventi1" msdata:parent="AnagraficaEventi" msdata:child="TransizioneEventi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_UserChildTable="TransizioneEventi" msprop:Generator_RelationVarName="relationFK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_ChildPropName="GetTransizioneEventiRows" msprop:Generator_UserRelationName="FK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
+      <msdata:Relationship name="FK_Macchine2FamigliaIngressi_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserParentTable="Macchine" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_ParentPropName="MacchineRow" />
+      <msdata:Relationship name="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserParentTable="FamigliaTipoIngressi" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" />
+      <msdata:Relationship name="FK_TransizioneIngressi_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_UserRelationName="FK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
+      <msdata:Relationship name="FK_TransizioneIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserParentTable="FamigliaTipoIngressi" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_UserRelationName="FK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" />
+      <msdata:Relationship name="FK_DiarioDiBordo_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="DiarioDiBordo" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" />
+      <msdata:Relationship name="FK_EventList_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="EventList" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_UserChildTable="EventList" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaOperatori" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" />
+      <msdata:Relationship name="FK_StatoMacchine_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="StatoMacchine" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaOperatori" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" />
+      <msdata:Relationship name="AnagArticoli_DiarioDiBordo" msdata:parent="AnagArticoli" msdata:child="DiarioDiBordo" msdata:parentkey="CodArticolo" msdata:childkey="CodArticolo" msprop:Generator_UserParentTable="AnagArticoli" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_RelationVarName="relationAnagArticoli_DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="AnagArticoli_DiarioDiBordo" msprop:Generator_ParentPropName="AnagArticoliRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

MapoDb/DS_applicazione.xss

@@ -4,41 +4,42 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="830" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-9" ViewPortY="824" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Macchine2FamiglieMacchine" ZOrder="30" X="553" Y="715" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:FamiglieMacchine" ZOrder="32" X="519" Y="1007" Height="115" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:Macchine" ZOrder="11" X="619" Y="324" Height="324" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:TransizioneStati" ZOrder="28" X="870" Y="916" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:StatoMacchine" ZOrder="12" X="4" Y="770" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:AnagraficaStati" ZOrder="16" X="303" Y="454" Height="210" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:EventList" ZOrder="3" X="920" Y="145" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:AnagraficaEventi" ZOrder="37" X="1285" Y="228" Height="134" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:DiarioDiBordo" ZOrder="23" X="230" Y="-18" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:TransizioneEventi" ZOrder="34" X="1279" Y="409" Height="210" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:KeepAlive" ZOrder="20" X="1316" Y="1006" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:Macchine2FamigliaIngressi" ZOrder="22" X="596" Y="1155" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:FamigliaTipoIngressi" ZOrder="6" X="897" Y="1162" Height="115" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:TransizioneIngressi" ZOrder="14" X="601" Y="1610" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:AnagraficaOperatori" ZOrder="33" X="965" Y="641" Height="229" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:AnagraficaOperatori2ins" ZOrder="19" X="1339" Y="1371" Height="172" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:DatiMacchine" ZOrder="21" X="1316" Y="670" Height="324" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:MicroStatoMacchina" ZOrder="15" X="5" Y="1161" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:LinkMenuJQM" ZOrder="17" X="15" Y="266" Height="210" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:RemoteRebootLog" ZOrder="29" X="603" Y="1298" Height="229" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:ParetoDurate" ZOrder="25" X="5" Y="14" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:SignalLog" ZOrder="24" X="18" Y="523" Height="191" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:AnagArticoli" ZOrder="27" X="627" Y="31" Height="191" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:MSFD" ZOrder="18" X="974" Y="1361" Height="343" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:FluxLog" ZOrder="2" X="4" Y="1406" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:AnagraficaGruppi" ZOrder="13" X="331" Y="1133" Height="191" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:RigheMacchine" ZOrder="10" X="1293" Y="22" Height="97" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
-    <Shape ID="DesignTable:AnagTags" ZOrder="9" X="336" Y="1347" Height="172" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:DiarioDichiarazioni" ZOrder="4" X="325" Y="1566" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:AlarmLog" ZOrder="1" X="1" Y="1672" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Macchine2FamiglieMacchine" ZOrder="31" X="553" Y="715" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:FamiglieMacchine" ZOrder="33" X="519" Y="1007" Height="115" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Macchine" ZOrder="13" X="619" Y="324" Height="324" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:TransizioneStati" ZOrder="30" X="870" Y="916" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:StatoMacchine" ZOrder="14" X="4" Y="770" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:AnagraficaStati" ZOrder="18" X="303" Y="454" Height="210" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:EventList" ZOrder="5" X="920" Y="145" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:AnagraficaEventi" ZOrder="38" X="1285" Y="228" Height="134" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:DiarioDiBordo" ZOrder="25" X="230" Y="-18" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TransizioneEventi" ZOrder="35" X="1279" Y="409" Height="210" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:KeepAlive" ZOrder="22" X="1316" Y="1006" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Macchine2FamigliaIngressi" ZOrder="24" X="596" Y="1155" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:FamigliaTipoIngressi" ZOrder="8" X="897" Y="1162" Height="115" Width="265" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:TransizioneIngressi" ZOrder="16" X="601" Y="1610" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:AnagraficaOperatori" ZOrder="34" X="965" Y="641" Height="229" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:AnagraficaOperatori2ins" ZOrder="21" X="1339" Y="1371" Height="172" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:DatiMacchine" ZOrder="23" X="1316" Y="670" Height="324" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:MicroStatoMacchina" ZOrder="17" X="5" Y="1161" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:LinkMenuJQM" ZOrder="19" X="15" Y="266" Height="210" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:RemoteRebootLog" ZOrder="1" X="603" Y="1298" Height="248" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:ParetoDurate" ZOrder="27" X="5" Y="14" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:SignalLog" ZOrder="26" X="18" Y="523" Height="191" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:AnagArticoli" ZOrder="29" X="627" Y="31" Height="191" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:MSFD" ZOrder="20" X="974" Y="1361" Height="343" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:FluxLog" ZOrder="4" X="4" Y="1406" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:AnagraficaGruppi" ZOrder="15" X="331" Y="1133" Height="191" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:RigheMacchine" ZOrder="12" X="1293" Y="22" Height="97" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:AnagTags" ZOrder="11" X="336" Y="1347" Height="172" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:DiarioDichiarazioni" ZOrder="6" X="325" Y="1566" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:AlarmLog" ZOrder="3" X="1" Y="1672" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:DecNumArticoli" ZOrder="2" X="823" Y="1868" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:FK_AnagTags_DiarioDichiarazioni" ZOrder="8" LineWidth="11">
+    <Connector ID="DesignRelation:FK_AnagTags_DiarioDichiarazioni" ZOrder="10" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>456</X>
@@ -50,7 +51,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Macchine2FamiglieMacchine_FamiglieMacchine" ZOrder="51" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Macchine2FamiglieMacchine_FamiglieMacchine" ZOrder="52" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>667</X>
@@ -62,7 +63,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Macchine2FamiglieMacchine_Macchine" ZOrder="50" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Macchine2FamiglieMacchine_Macchine" ZOrder="51" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>699</X>
@@ -74,7 +75,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TransizioneStati_FamiglieMacchine" ZOrder="49" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TransizioneStati_FamiglieMacchine" ZOrder="50" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>768</X>
@@ -86,7 +87,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_StatoMacchine_Macchine" ZOrder="36" LineWidth="11">
+    <Connector ID="DesignRelation:FK_StatoMacchine_Macchine" ZOrder="37" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>636</X>
@@ -102,7 +103,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaStati" ZOrder="48" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaStati" ZOrder="49" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>444</X>
@@ -118,7 +119,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_StatoMacchine_AnagraficaStati" ZOrder="47" LineWidth="11">
+    <Connector ID="DesignRelation:FK_StatoMacchine_AnagraficaStati" ZOrder="48" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>537</X>
@@ -138,7 +139,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_EventList_Macchine" ZOrder="46" LineWidth="11">
+    <Connector ID="DesignRelation:FK_EventList_Macchine" ZOrder="47" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>879</X>
@@ -150,7 +151,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaEventi" ZOrder="35" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaEventi" ZOrder="36" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1285</X>
@@ -174,7 +175,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_EventList_AnagraficaEventi" ZOrder="45" LineWidth="11">
+    <Connector ID="DesignRelation:FK_EventList_AnagraficaEventi" ZOrder="46" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1285</X>
@@ -186,7 +187,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_DiarioDiBordo_AnagraficaStati" ZOrder="44" LineWidth="11">
+    <Connector ID="DesignRelation:FK_DiarioDiBordo_AnagraficaStati" ZOrder="45" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>356</X>
@@ -198,7 +199,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_DiarioDiBordo_Macchine" ZOrder="43" LineWidth="11">
+    <Connector ID="DesignRelation:FK_DiarioDiBordo_Macchine" ZOrder="44" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>619</X>
@@ -210,7 +211,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TransizioneEventi_AnagraficaEventi1" ZOrder="42" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TransizioneEventi_AnagraficaEventi1" ZOrder="43" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1444</X>
@@ -222,7 +223,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Macchine2FamigliaIngressi_Macchine" ZOrder="31" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Macchine2FamigliaIngressi_Macchine" ZOrder="32" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>716</X>
@@ -234,7 +235,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" ZOrder="41" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" ZOrder="42" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>897</X>
@@ -246,7 +247,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TransizioneIngressi_AnagraficaEventi" ZOrder="5" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TransizioneIngressi_AnagraficaEventi" ZOrder="7" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1285</X>
@@ -266,7 +267,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TransizioneIngressi_FamigliaTipoIngressi" ZOrder="7" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TransizioneIngressi_FamigliaTipoIngressi" ZOrder="9" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>933</X>
@@ -286,7 +287,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_DiarioDiBordo_AnagraficaOperatori" ZOrder="40" LineWidth="11">
+    <Connector ID="DesignRelation:FK_DiarioDiBordo_AnagraficaOperatori" ZOrder="41" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>965</X>
@@ -302,7 +303,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_EventList_AnagraficaOperatori" ZOrder="39" LineWidth="11">
+    <Connector ID="DesignRelation:FK_EventList_AnagraficaOperatori" ZOrder="40" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1108</X>
@@ -314,7 +315,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_StatoMacchine_AnagraficaOperatori" ZOrder="38" LineWidth="11">
+    <Connector ID="DesignRelation:FK_StatoMacchine_AnagraficaOperatori" ZOrder="39" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>982</X>
@@ -330,7 +331,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:AnagArticoli_DiarioDiBordo" ZOrder="26" LineWidth="11">
+    <Connector ID="DesignRelation:AnagArticoli_DiarioDiBordo" ZOrder="28" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>627</X>

MapoDb/DataLayer.cs

@@ -22,6 +22,11 @@ namespace MapoDb
     {
         #region Public Fields
 
+        /// <summary>
+        /// Valori config da tabella corrente
+        /// </summary>
+        public DS_Utility.ConfigDataTable ListConfig = new DS_Utility.ConfigDataTable();
+
         /// <summary>
         /// Oggetto MapoDb impiegato da DataLayer x i suoi accessi ai dati
         /// </summary>
@@ -47,6 +52,7 @@ namespace MapoDb
         public DS_ProdTempiTableAdapters.stp_repDonati_getDatiProdMacchinaTableAdapter taDatiProdMacch;
         public DS_ProdTempiTableAdapters.stp_repDonati_getDatiProdMacchinaPeriodoTableAdapter taDatiProdMacchPer;
         public DS_ProdTempiTableAdapters.stp_repDonati_getLastStatoDurataMacchinaTableAdapter taDatiStatoMacch;
+        public DS_applicazioneTableAdapters.DecNumArticoliTableAdapter taDecNA;
         public DS_applicazioneTableAdapters.DiarioDichiarazioniTableAdapter taDiarioDich;
         public DS_DossParTableAdapters.DossiersTableAdapter taDOSS;
         public DS_applicazioneTableAdapters.EventListTableAdapter taEventi;
@@ -109,10 +115,8 @@ namespace MapoDb
             // init oggetto MapoDb
             MapoDbObj = new MapoDb();
 
-#if false
-            // init message channel...
-            BroadastMsgPipe = new MessagePipe(connRedis, Constants.BROADCAST_M_PIPE);
-#endif
+            // init config..
+            ListConfig = taConfig.GetData();
         }
 
         /// <summary>
@@ -269,6 +273,16 @@ namespace MapoDb
             return mHash($"MachineConfFlux:{idxMacchina}");
         }
 
+        /// <summary>
+        /// Hash dati di configurazione IOB in formato YAML x la macchina specificata
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <returns></returns>
+        public static string ConfYamlHash(string idxMacchina)
+        {
+            return mHash($"IOB:{idxMacchina}:ConfYaml");
+        }
+
         /// <summary>
         /// Hash dati tabella AnagStati macchina
         /// </summary>
@@ -380,7 +394,7 @@ namespace MapoDb
         }
 
         /// <summary> Hash dati relativi all'associazione macchina <--> IOB </summary> <param
-        /// name="IdxMacchina">Macchina PRINCIPALE</param> <returns></returns>
+        /// name="IdxMacchina">Macchina</param> <returns></returns>
         public static string hIobDict(string IdxMacchina)
         {
             return mHash($"IOB:{IdxMacchina}:CurrInfo");
@@ -393,6 +407,16 @@ namespace MapoDb
             return mHash(string.Format("hM2IOB:{0}", IdxMacchina));
         }
 
+        /// <summary>
+        /// Hash dati relativi a macchina + IOB + conf speciali
+        /// </summary>
+        /// <param name="IdxMacchina">Macchina</param>
+        /// <returns></returns>
+        public static string hMachineIobConf(string IdxMacchina)
+        {
+            return mHash($"IOB:{IdxMacchina}:MachIobConf");
+        }
+
         /// <summary>
         /// Hash dati Macchine Multi SM Ingressi
         /// </summary>
@@ -715,12 +739,13 @@ namespace MapoDb
         /// <param name="idxMacchina">macchina</param>
         /// <param name="doConfirm">effettuare conferma qty</param>
         /// <param name="qtyFromLast">imposta la qty prox ODL da ODL che si chiude</param>
+        /// <param name="matrOpr">matricola operatore</param>
         /// <param name="roundStep">
         /// STEP x cui arrotondare la quantità prox ODL (corrente come riferimento)
         /// </param>
         /// <param name="keyRichiesta">Cod ext da associare all'ODL</param>
         /// <returns></returns>
-        public string AutoStartOdl(string idxMacchina, bool doConfirm, bool qtyFromLast, int roundStep = 100, string keyRichiesta = "")
+        public string AutoStartOdl(string idxMacchina, bool doConfirm, bool qtyFromLast, int matrOpr, int roundStep = 100, string keyRichiesta = "")
         {
             string answ = "KO";
             DateTime adesso = DateTime.Now;
@@ -791,23 +816,23 @@ namespace MapoDb
                                 if (confRett)
                                 {
                                     // confermo al netto dei pezzi lasciati...
-                                    fatto = confermaProdMacchinaFull(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, 0, qtyScarto, adesso);
+                                    fatto = confermaProdMacchinaFull(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, 0, qtyScarto, adesso, matrOpr);
                                     if (memLayer.ML.CRB("SlaveConfirmPzProd"))
                                     {
                                         foreach (var machine in slaveList)
                                         {
-                                            confermaProdMacchinaFull(machine.IdxMacchinaSlave, memLayer.ML.CRI("modoConfProd"), qtyConf, 0, qtyScarto, adesso);
+                                            confermaProdMacchinaFull(machine.IdxMacchinaSlave, memLayer.ML.CRI("modoConfProd"), qtyConf, 0, qtyScarto, adesso, matrOpr);
                                         }
                                     }
                                 }
                                 else
                                 {
-                                    fatto = confermaProdMacchina(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, qtyScarto, adesso);
+                                    fatto = confermaProdMacchina(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, qtyScarto, adesso, matrOpr);
                                     if (memLayer.ML.CRB("SlaveConfirmPzProd"))
                                     {
                                         foreach (var machine in slaveList)
                                         {
-                                            confermaProdMacchina(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, qtyScarto, adesso);
+                                            confermaProdMacchina(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, qtyScarto, adesso, matrOpr);
                                         }
                                     }
                                 }
@@ -821,10 +846,11 @@ namespace MapoDb
                                 Log.Info($"Eccezione in ConfermaProduzione{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
                             }
                         }
-                        // attendo 100 msec
-                        Thread.Sleep(100);
+                        // 2025.02.19 portato da 100 a 1000 ms attesa x evitare che ODL sia avviato PRIMA della conferma
+                        // attendo 1000 msec x chiudere ODL
+                        Thread.Sleep(1000);
                         // chiamo splitOdl
-                        MapoDbObj.taODL.autoStart(currData[0].IdxODL, 0, idxMacchina, currData[0].TCRichAttr, currData[0].PzPallet, $"Nuovo ODL da forceSplitOdl", true, qtyNew, keyRichiesta);
+                        MapoDbObj.taODL.autoStart(currData[0].IdxODL, 0, idxMacchina, currData[0].TCRichAttr, currData[0].PzPallet, $"Nuovo ODL da forceSplitOdl.autoStart", true, qtyNew, keyRichiesta);
                         // elimino eventuale ODL precedente...
                         string rKey = memLayer.ML.redHash($"ODL:{idxMacchina}");
                         memLayer.ML.setRSV(rKey, "");
@@ -875,6 +901,7 @@ namespace MapoDb
                                 ts = string.Format("{0:yyMMdd}T{0:HHmmss.fff}Z", DateTime.Now);
                                 outData = $"TS:{ts}|MATR:{MatrOpr}|ODL:{newOdl}";
                                 addTask4Machine(machine.IdxMacchinaSlave, taskType.fixStopSetup, outData);
+                                addTask4Machine(machine.IdxMacchinaSlave, taskType.forceResetPzCount, outData);
 
                                 // invio task caricamento dati ODL
                                 addTask4Machine(machine.IdxMacchinaSlave, taskType.setArt, setArtVal);
@@ -1172,13 +1199,13 @@ namespace MapoDb
         /// <param name="numPzScarto">qta pezzi SCARTO da confermare</param>
         /// <param name="DataOraApp">DataOra in cui registrare approvazione</param>
         /// <returns></returns>
-        public bool confermaProdMacchina(string idxMacchina, int modoConfProd, int numPzConfermati, int numPzScarto, DateTime DataOraApp)
+        public bool confermaProdMacchina(string idxMacchina, int modoConfProd, int numPzConfermati, int numPzScarto, DateTime DataOraApp, int matrOpr)
         {
             bool answ = false;
             try
             {
                 DS_ProdTempi.stp_PzProd_getByMacchinaRow rigaProd = taPzProd2conf.GetData(idxMacchina.ToString())[0];
-                taPzProd2conf.stp_ConfermaProduzCompleta(idxMacchina, MatrOpr, rigaProd.DataFrom, DataOraApp, numPzConfermati, numPzScarto, modoConfProd, DataOraApp, true);
+                taPzProd2conf.stp_ConfermaProduzCompleta(idxMacchina, matrOpr, rigaProd.DataFrom, DataOraApp, numPzConfermati, numPzScarto, modoConfProd, DataOraApp, true);
                 // indico eseguito!
                 answ = true;
             }
@@ -1202,13 +1229,13 @@ namespace MapoDb
         /// <param name="numPzScarto">qta pezzi SCARTO da confermare</param>
         /// <param name="DataOraApp">DataOra in cui registrare approvazione</param>
         /// <returns></returns>
-        public bool confermaProdMacchinaFull(string idxMacchina, int modoConfProd, int numPzConfermati, int numPzLasciati, int numPzScarto, DateTime DataOraApp)
+        public bool confermaProdMacchinaFull(string idxMacchina, int modoConfProd, int numPzConfermati, int numPzLasciati, int numPzScarto, DateTime DataOraApp, int matrOpr)
         {
             bool answ = false;
             try
             {
                 DS_ProdTempi.stp_PzProd_getByMacchinaRow rigaProd = taPzProd2conf.GetData(idxMacchina.ToString())[0];
-                taPzProd2conf.stp_ConfermaProduzCompletaFull(idxMacchina, MatrOpr, rigaProd.DataFrom, DataOraApp, numPzConfermati, numPzLasciati, numPzScarto, modoConfProd, DataOraApp, true);
+                taPzProd2conf.stp_ConfermaProduzCompletaFull(idxMacchina, matrOpr, rigaProd.DataFrom, DataOraApp, numPzConfermati, numPzLasciati, numPzScarto, modoConfProd, DataOraApp, true);
                 // indico eseguito!
                 answ = true;
             }
@@ -1448,7 +1475,7 @@ namespace MapoDb
                 {
                     DataLayer man = new DataLayer();
                     rawData = memLayer.ML.getRSV(redKey);
-                    if (!string.IsNullOrEmpty(rawData))
+                    if (!string.IsNullOrEmpty(rawData) && rawData.Length > 2)
                     {
                         var redisResult = JsonConvert.DeserializeObject<List<DateTime>>(rawData);
                         resultList = redisResult != null ? redisResult : new List<DateTime>();
@@ -1722,10 +1749,11 @@ namespace MapoDb
         /// <param name="idxMacchina">macchina</param>
         /// <param name="idxPODL">IDX PODL da processare</param>
         /// <param name="doConfirm">effettuare conferma qty</param>
+        /// <param name="matrOpr">effettuare conferma qty</param>
         /// <param name="dtEve">data-ora di avvio (opzionale)</param>
         /// <param name="dtCurr">data-ora attuale (opzionale)</param>
         /// <returns></returns>
-        public string ForceStartPOdl(string idxMacchina, int idxPODL, bool doConfirm, string dtEve = "", string dtCurr = "")
+        public string ForceStartPOdl(string idxMacchina, int idxPODL, bool doConfirm, int matrOpr = 0, string dtEve = "", string dtCurr = "")
         {
             string answ = "KO";
             int CurrProdStatus = 0;
@@ -1853,7 +1881,7 @@ namespace MapoDb
                                 // eventuale chiusura vecchio ODL, 2 sec prima...
                                 if (currODLData.Count > 0)
                                 {
-                                    doCloseCurrODL(idxMacchina, doConfirm, qtyConf, currODLData, dtEvent.AddSeconds(-2));
+                                    doCloseCurrODL(idxMacchina, doConfirm, qtyConf, currODLData, dtEvent.AddSeconds(-2), matrOpr);
                                 }
                                 // avvio PODL: creo nuovo ODL da promessa ed associo
                                 taODL.inizioSetupPromessa(idxPODL, MatrOpr, POdlRow.IdxMacchina, POdlRow.TCAssegnato, POdlRow.PzPallet, POdlRow.Note, dtEvent);
@@ -1869,7 +1897,7 @@ namespace MapoDb
                                 // eventuale chiusura vecchio ODL
                                 if (currODLData.Count > 0)
                                 {
-                                    doCloseCurrODL(idxMacchina, doConfirm, qtyConf, currODLData, dtEvent.AddSeconds(-2));
+                                    doCloseCurrODL(idxMacchina, doConfirm, qtyConf, currODLData, dtEvent.AddSeconds(-2), matrOpr);
                                 }
                                 // duplico PODL... inserisco nuovo record...
                                 taPODL.insertQuery(POdlRow.KeyRichiesta, POdlRow.KeyBCode, true, POdlRow.CodArticolo, POdlRow.CodGruppo, POdlRow.IdxMacchina, POdlRow.NumPezzi, POdlRow.TCAssegnato, POdlRow.DueDate, POdlRow.Priorita, POdlRow.PzPallet, POdlRow.Note);
@@ -1892,7 +1920,7 @@ namespace MapoDb
                                 // eventuale chiusura vecchio ODL, 2 sec prima...
                                 if (currODLData.Count > 0)
                                 {
-                                    doCloseCurrODL(idxMacchina, doConfirm, qtyConf, currODLData, dtEvent.AddSeconds(-2));
+                                    doCloseCurrODL(idxMacchina, doConfirm, qtyConf, currODLData, dtEvent.AddSeconds(-2), matrOpr);
                                 }
                                 // avvio PODL: creo nuovo ODL da promessa ed associo
                                 taODL.inizioSetupPromessa(idxPODL, MatrOpr, POdlRow.IdxMacchina, POdlRow.TCAssegnato, POdlRow.PzPallet, POdlRow.Note, dtEvent);
@@ -1922,6 +1950,34 @@ namespace MapoDb
             return answ;
         }
 
+        /// <summary>
+        /// Recupera ArtNum dato CodArt (per impianti che accettano solo INT in scrittura)
+        /// </summary>
+        /// <param name="CodArt">
+        /// CodArt richiesto, se vuoto restituisce TUTTI i valori in tabella di decodifica
+        /// </param>
+        /// <returns>Dizionario contenente le righe delle codifiche attive Articolo/Numero</returns>
+        public Dictionary<string, int> getArtNum(string codArt)
+        {
+            Dictionary<string, int> answ = new Dictionary<string, int>();
+            DS_applicazione.DecNumArticoliDataTable rawData;
+            // se vuoto --> leggo tabella
+            if (string.IsNullOrEmpty(codArt))
+            {
+                rawData = taDecNA.GetData();
+            }
+            // se non vuoto --> chiamo stored x recuperare info
+            else
+            {
+                rawData = taDecNA.getByKey(codArt);
+            }
+            foreach (var item in rawData)
+            {
+                answ.Add(item.CodArticolo, item.NumART);
+            }
+            return answ;
+        }
+
         /// <summary>
         /// GET elenco parametri correnti x IOB
         /// </summary>
@@ -2326,7 +2382,7 @@ namespace MapoDb
             // ...oppure dritto su DB
             else
             {
-                answ = MapoDbObj.isMulti(idxMacchina);
+                answ = MapoDbObj.isSlave(idxMacchina);
             }
             return answ;
         }
@@ -2512,13 +2568,18 @@ namespace MapoDb
         /// <param name="dtEve"></param>
         /// <param name="dtCurr"></param>
         /// <param name="contatore"></param>
+        /// <param name="disabKA"></param>
         /// <returns></returns>
-        public string processFluxLog(string idxMacchina, string flux, string valore, string dtEve, string dtCurr, int contatore)
+        public string processFluxLog(string idxMacchina, string flux, string valore, string dtEve, string dtCurr, int contatore, bool disabKA)
         {
             // instanzio un nuovo oggetto MapoDb
             MapoDb connDb = new MapoDb();
-            // scrivo keep alive!!! (se necessario, altrimenti è in cache...)
-            connDb.scriviKeepAlive(idxMacchina, DateTime.Now);
+            // se non vietato...
+            if (!disabKA)
+            {
+                // scrivo keep alive!!! (se necessario, altrimenti è in cache...)
+                connDb.scriviKeepAlive(idxMacchina, DateTime.Now);
+            }
             // registro conteggio impiego chiamate REDIS
             if (memLayer.ML.CRB("IOB_RedEnab"))
             {
@@ -4036,7 +4097,25 @@ namespace MapoDb
         }
 
         /// <summary>
-        /// Salvataggio su della mappa di memoria dell'IOB x ulteriori impieghi
+        /// Salvataggio YAML completo di configurazione dell'IOB
+        /// </summary>
+        /// <param name="idxMacchina"></param>
+        /// <param name="iobConfFull"></param>
+        /// <returns></returns>
+        public bool setIobConfYaml(string idxMacchina, string iobConfFull)
+        {
+            bool answ = false;
+            // se ho un area memoria valida...
+            if (!string.IsNullOrEmpty(iobConfFull))
+            {
+                // salvo!
+                memLayer.ML.setRSV(ConfYamlHash(idxMacchina), iobConfFull);
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Salvataggio della mappa di memoria dell'IOB x ulteriori impieghi
         /// </summary>
         /// <param name="idxMacchina"></param>
         /// <param name="currMemMap"></param>
@@ -4265,6 +4344,7 @@ namespace MapoDb
             taAnagTags = new DS_applicazioneTableAdapters.AnagTagsTableAdapter();
             taAs400 = new DS_IntServTableAdapters.ProduzioneAs400TableAdapter();
             taArcaGiac = new DS_ArcaTableAdapters.GiacenzeTableAdapter();
+            taDecNA = new DS_applicazioneTableAdapters.DecNumArticoliTableAdapter();
             taCalFF = new DS_ProdTempiTableAdapters.CalendFesteFerieTableAdapter();
             taComm = new DS_UtilityTableAdapters.CommentiTableAdapter();
             taConfFlux = new DS_DossParTableAdapters.ConfFluxTableAdapter();
@@ -4329,6 +4409,7 @@ namespace MapoDb
             string connectionStringIS = memLayer.ML.confReadString("MoonProConnectionStringIS");
             string connectionStringArca = memLayer.ML.confReadString("MoonProConnectionStringArca");
             string connectionStringES3 = memLayer.ML.confReadString("MoonProConnectionStringES3");
+            string connectionStringFluxData = memLayer.ML.confReadString("MoonProConnectionStringFluxData");
             string connectionStringMAG = memLayer.ML.confReadString("MoonProConnectionStringMAG");
             // connections del db
             taAG.Connection.ConnectionString = connectionString;
@@ -4339,10 +4420,11 @@ namespace MapoDb
             taAnagTags.Connection.ConnectionString = connectionString;
             taAs400.Connection.ConnectionString = connectionStringIS;
             taArcaGiac.Connection.ConnectionString = connectionStringArca;
+            taDecNA.Connection.ConnectionString = connectionString;
             taCalFF.Connection.ConnectionString = connectionString;
             taConfig.Connection.ConnectionString = connectionString;
             taComm.Connection.ConnectionString = connectionString;
-            taConfFlux.Connection.ConnectionString = connectionString;
+            taConfFlux.Connection.ConnectionString = connectionStringFluxData;
             taDatiConf.Connection.ConnectionString = connectionString;
             taDatiMacchine.Connection.ConnectionString = connectionString;
             taDatiProd.Connection.ConnectionString = connectionString;
@@ -4350,9 +4432,9 @@ namespace MapoDb
             taDatiProdMacchPer.Connection.ConnectionString = connectionString;
             taDatiStatoMacch.Connection.ConnectionString = connectionString;
             taDiarioDich.Connection.ConnectionString = connectionString;
-            taDOSS.Connection.ConnectionString = connectionString;
+            taDOSS.Connection.ConnectionString = connectionStringFluxData;
             taEventi.Connection.ConnectionString = connectionString;
-            taFL.Connection.ConnectionString = connectionString;
+            taFL.Connection.ConnectionString = connectionStringFluxData;
             taIS_TrDati.Connection.ConnectionString = connectionStringIS;
             taIstK.Connection.ConnectionString = connectionStringIS;
             taKeepAlive.Connection.ConnectionString = connectionString;
@@ -4569,7 +4651,7 @@ namespace MapoDb
             }
         }
 
-        private bool doCloseCurrODL(string idxMacchina, bool doConfirm, int qtyConf, DS_ProdTempi.ODLDataTable currODLData, DateTime dtEvento)
+        private bool doCloseCurrODL(string idxMacchina, bool doConfirm, int qtyConf, DS_ProdTempi.ODLDataTable currODLData, DateTime dtEvento, int matrOpr)
         {
             DateTime adesso = DateTime.Now;
             bool fatto = false;
@@ -4581,9 +4663,6 @@ namespace MapoDb
             inputComandoMapo resCmd = scriviRigaEventoBarcode(idxMacchina, idxEvento, currODLData[0].CodArticolo, "ODL-CLOSE-ATTR", 0, "", dtEvento, adesso);
             if (doConfirm)
             {
-                //// attendo 100 msec
-                //Thread.Sleep(100);
-
                 // modifico la dataEvento
                 dtEvento.AddMilliseconds(200);
                 // chiamo conferma produzione...
@@ -4595,11 +4674,11 @@ namespace MapoDb
                     if (confRett)
                     {
                         // confermo al netto dei pezzi lasciati...
-                        fatto = confermaProdMacchinaFull(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, 0, 0, dtEvento);
+                        fatto = confermaProdMacchinaFull(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, 0, 0, dtEvento, matrOpr);
                     }
                     else
                     {
-                        fatto = confermaProdMacchina(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, 0, dtEvento);
+                        fatto = confermaProdMacchina(idxMacchinaSel, memLayer.ML.CRI("modoConfProd"), qtyConf, 0, dtEvento, matrOpr);
                     }
                     if (!fatto)
                     {
@@ -4611,8 +4690,6 @@ namespace MapoDb
                     Log.Info($"Eccezione in doCloseCurrODL{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
                 }
             }
-            //// attendo 100 msec
-            //Thread.Sleep(100);
             dtEvento.AddMilliseconds(200);
             // chiamo chiusura
             MapoDbObj.taODL.forceClose(currODLData[0].IdxODL, idxMacchina, dtEvento);

MapoDb/MapoDb.cs

@@ -3,6 +3,7 @@ using MapoSDK;
 using SteamWare;
 using System;
 using System.Data;
+using System.Linq;
 
 namespace MapoDb
 {
@@ -562,8 +563,9 @@ namespace MapoDb
         /// <param name="IPv4"></param>
         /// <param name="agent"></param>
         /// <param name="macAddr">mac address (inviato dalla macchina)</param>
+        /// <param name="num2keep">num record da mantenere x reboot</param>
         /// <returns></returns>
-        public inputComandoMapo registraStartup(string idxMacchina, string IPv4, string agent, string macAddr)
+        public inputComandoMapo registraStartup(string idxMacchina, string IPv4, string agent, string macAddr, int num2keep)
         {
             if (memLayer.ML.CRI("_logLevel") > 6)
             {
@@ -572,7 +574,7 @@ namespace MapoDb
             // formatto output
             inputComandoMapo answ = new inputComandoMapo();
             // scrivo remote reboot alive!
-            scriviRemoteReboot(idxMacchina, IPv4, agent, macAddr);
+            scriviRemoteReboot(idxMacchina, IPv4, agent, macAddr, num2keep);
             // scrivo PRIMO keep alive
             scriviPrimoKeepAlive(idxMacchina, DateTime.Now);
 
@@ -658,15 +660,18 @@ namespace MapoDb
         }
 
         /// <summary>
-        /// Registra un evento di RemoteReboot sulla tabella
+        /// Registra un evento di RemoteReboot sulla tabella ed effettua pulizia dei duplicati
         /// </summary>
         /// <param name="IdxMacchina"></param>
         /// <param name="IPv4"></param>
         /// <param name="macAddr"></param>
+        /// <param name="num2keep">num record da mantenere x reboot</param>
         /// <returns></returns>
-        public void scriviRemoteReboot(string IdxMacchina, string IPv4, string agent, string macAddr)
+        public void scriviRemoteReboot(string IdxMacchina, string IPv4, string agent, string macAddr, int num2keep)
         {
             taRRL.Insert(IdxMacchina, IPv4, agent, DateTime.Now, macAddr);
+            // chiama stored x ripulire dati
+            taRRL.KeepLatest(num2keep);
         }
 
         /// <summary>

MapoDb/MapoDb.csproj

@@ -268,7 +268,7 @@
     <Compile Include="DS_ProdTempi.cs">
       <DependentUpon>DS_ProdTempi.xsd</DependentUpon>
     </Compile>
-    <Compile Include="DS_ProdTempi1.Designer.cs">
+    <Compile Include="DS_ProdTempi.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>DS_ProdTempi.xsd</DependentUpon>
@@ -385,7 +385,7 @@
     <None Include="DS_ProdTempi.xsd">
       <SubType>Designer</SubType>
       <Generator>MSDataSetGenerator</Generator>
-      <LastGenOutput>DS_ProdTempi1.Designer.cs</LastGenOutput>
+      <LastGenOutput>DS_ProdTempi.Designer.cs</LastGenOutput>
     </None>
     <None Include="DS_ProdTempi.xss">
       <DependentUpon>DS_ProdTempi.xsd</DependentUpon>