Merge branch 'release/FixDxf_ErrorTrap'

Completato fix updater x Nexus

.editorconfig

@@ -41,3 +41,6 @@ dotnet_diagnostic.CA1716.severity = none
 
 # CA2227: Le proprietà delle raccolte devono essere di sola lettura
 dotnet_diagnostic.CA2227.severity = none
+
+# CA1805: Do not initialize unnecessarily
+dotnet_diagnostic.CA1805.severity = none

.gitlab-ci.yml

@@ -27,9 +27,9 @@ variables:
    - |
       $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C
       if ($hasSource -eq 0) {
-         C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
+         C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
       } else {
-         C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
+         C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
       }
       echo $hasSource
 
@@ -41,6 +41,15 @@ variables:
       $contenuto = Get-Content -path 'VersGen\VersGen.cs' -Raw
       $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL
       $newContenuto | Set-Content -Path 'VersGen\VersGen.cs'
+      
+# helper x fix manifest xml
+.manifest-fix: &manifest-fix
+   - |
+      echo "Set manifest.xml for branch: $CI_COMMIT_BRANCH"
+      $contenuto = Get-Content -path 'NKC_WF\Resources\manifest.xml' -Raw
+      $newContenuto = $contenuto -replace '{{BRANCHNAME}}', $CI_COMMIT_BRANCH
+      $newContenuto = $newContenuto -replace '0.0.0.0', $env:NEW_REL
+      $newContenuto | Set-Content -Path 'NKC_WF\Resources\manifest.xml'
 
 # helper creazione hash files
 .hashBuild: &hashBuild
@@ -75,11 +84,11 @@ variables:
       $File2Send = Get-ChildItem($env:PROJ_NAME + "\Release\*")
       ForEach ($File in $File2Send) {
         $FileName = Split-Path $File -leaf
-        mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/$FileName
-        mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/ARCHIVE/$VersNumb/$FileName
+        mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/$FileName
+        mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/ARCHIVE/$VersNumb/$FileName
       }
-      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/manifest.xml
-      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/ChangeLog.html
+      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/manifest.xml
+      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:PROJ_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/ChangeLog.html
 
 stages:
  - build
@@ -138,6 +147,7 @@ install:
    - *nuget-fix
    - '& "$env:NUGET_PATH" restore NKC_WF.sln -Verbosity quiet' 
    - *version-fix
+   - *manifest-fix
  script: 
    -  '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=master.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/NKC" /p:PackageAsSingleFile=True /verbosity:minimal /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj'
    # qui il deploy su nexus...

AppData/DS_App.Designer.cs

@@ -29453,7 +29453,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[29];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[32];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
             this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_BatchList";
@@ -29510,130 +29510,146 @@ namespace AppData.DS_AppTableAdapters {
             this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[9].Connection = this.Connection;
-            this._commandCollection[9].CommandText = "dbo.stp_Batch_getByKey";
+            this._commandCollection[9].CommandText = "dbo.stp_Batch_getApprovedByTakt";
             this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[10].Connection = this.Connection;
-            this._commandCollection[10].CommandText = "dbo.stp_Batch_getByStatus";
+            this._commandCollection[10].CommandText = "dbo.stp_Batch_getByKey";
             this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchVal", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShowSplit", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartValid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[11] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[11].Connection = this.Connection;
-            this._commandCollection[11].CommandText = "dbo.stp_Batch_getCurrentByMachine";
+            this._commandCollection[11].CommandText = "dbo.stp_Batch_getByStatus";
             this._commandCollection[11].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchVal", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShowSplit", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartValid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[12] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[12].Connection = this.Connection;
-            this._commandCollection[12].CommandText = "dbo.stp_Batch_getDescendantByKey";
+            this._commandCollection[12].CommandText = "dbo.stp_Batch_getCurrentByMachine";
             this._commandCollection[12].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[13] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[13].Connection = this.Connection;
-            this._commandCollection[13].CommandText = "dbo.stp_Batch_getForBunkMan";
+            this._commandCollection[13].CommandText = "dbo.stp_Batch_getDescendantByKey";
             this._commandCollection[13].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MaxPosition", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[14] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[14].Connection = this.Connection;
-            this._commandCollection[14].CommandText = "dbo.stp_Batch_getLastByTakt";
+            this._commandCollection[14].CommandText = "dbo.stp_Batch_getForBunkMan";
             this._commandCollection[14].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MaxPosition", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[15] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[15].Connection = this.Connection;
-            this._commandCollection[15].CommandText = "dbo.stp_Batch_getNextAvailable";
+            this._commandCollection[15].CommandText = "dbo.stp_Batch_getLastByTakt";
             this._commandCollection[15].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[16] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[16].Connection = this.Connection;
-            this._commandCollection[16].CommandText = "dbo.stp_Batch_getRunning";
+            this._commandCollection[16].CommandText = "dbo.stp_Batch_getNestRunning";
             this._commandCollection[16].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[17] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[17].Connection = this.Connection;
-            this._commandCollection[17].CommandText = "dbo.stp_Batch_getSched";
+            this._commandCollection[17].CommandText = "dbo.stp_Batch_getNextAvailable";
             this._commandCollection[17].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[18] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[18].Connection = this.Connection;
-            this._commandCollection[18].CommandText = "dbo.stp_Batch_getSplitByKey";
+            this._commandCollection[18].CommandText = "dbo.stp_Batch_getRunning";
             this._commandCollection[18].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[19] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[19].Connection = this.Connection;
-            this._commandCollection[19].CommandText = "dbo.stp_Batch_makeDescendantByKey";
+            this._commandCollection[19].CommandText = "dbo.stp_Batch_getSched";
             this._commandCollection[19].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCodAnces", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[20] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[20].Connection = this.Connection;
-            this._commandCollection[20].CommandText = "dbo.stp_Batch_redoPartValid";
+            this._commandCollection[20].CommandText = "dbo.stp_Batch_getSplitByKey";
             this._commandCollection[20].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[21] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[21].Connection = this.Connection;
-            this._commandCollection[21].CommandText = "dbo.stp_Batch_refuseNesting";
+            this._commandCollection[21].CommandText = "dbo.stp_Batch_invalidateRunning";
             this._commandCollection[21].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[22] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[22].Connection = this.Connection;
-            this._commandCollection[22].CommandText = "dbo.stp_Batch_resetAllNesting";
+            this._commandCollection[22].CommandText = "dbo.stp_Batch_makeDescendantByKey";
             this._commandCollection[22].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[22].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[22].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[22].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCodAnces", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[23] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[23].Connection = this.Connection;
-            this._commandCollection[23].CommandText = "dbo.stp_Batch_resetPartUnValid";
+            this._commandCollection[23].CommandText = "dbo.stp_Batch_redoPartValid";
             this._commandCollection[23].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[23].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[23].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[24] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[24].Connection = this.Connection;
-            this._commandCollection[24].CommandText = "dbo.stp_zzz_resetProdCall";
+            this._commandCollection[24].CommandText = "dbo.stp_Batch_refuseNesting";
             this._commandCollection[24].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[24].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[24].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[24].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[25] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[25].Connection = this.Connection;
-            this._commandCollection[25].CommandText = "dbo.stp_Batch_resetTree";
+            this._commandCollection[25].CommandText = "dbo.stp_Batch_resetAllNesting";
             this._commandCollection[25].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[25].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[25].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[25].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[26] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[26].Connection = this.Connection;
-            this._commandCollection[26].CommandText = "dbo.stp_Batch_updatePlaceCod";
+            this._commandCollection[26].CommandText = "dbo.stp_Batch_resetPartUnValid";
             this._commandCollection[26].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[26].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[26].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[26].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[27] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[27].Connection = this.Connection;
-            this._commandCollection[27].CommandText = "dbo.stp_Batch_updateSchedPrior";
+            this._commandCollection[27].CommandText = "dbo.stp_zzz_resetProdCall";
             this._commandCollection[27].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[27].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[27].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[27].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SchedPrio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._commandCollection[28] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[28].Connection = this.Connection;
-            this._commandCollection[28].CommandText = "dbo.stp_Batch_updateStatus";
+            this._commandCollection[28].CommandText = "dbo.stp_Batch_resetTree";
             this._commandCollection[28].CommandType = global::System.Data.CommandType.StoredProcedure;
             this._commandCollection[28].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[28].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[28].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[28].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._commandCollection[28].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[28].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[29] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[29].Connection = this.Connection;
+            this._commandCollection[29].CommandText = "dbo.stp_Batch_updatePlaceCod";
+            this._commandCollection[29].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[30] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[30].Connection = this.Connection;
+            this._commandCollection[30].CommandText = "dbo.stp_Batch_updateSchedPrior";
+            this._commandCollection[30].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SchedPrio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[31] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[31].Connection = this.Connection;
+            this._commandCollection[31].CommandText = "dbo.stp_Batch_updateStatus";
+            this._commandCollection[31].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -29664,8 +29680,25 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
-        public virtual DS_App.BatchListDataTable getByKey(global::System.Nullable<int> BatchID) {
+        public virtual DS_App.BatchListDataTable getApprovedByTakt(string Takt) {
             this.Adapter.SelectCommand = this.CommandCollection[9];
+            if ((Takt == null)) {
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(Takt));
+            }
+            DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_App.BatchListDataTable getByKey(global::System.Nullable<int> BatchID) {
+            this.Adapter.SelectCommand = this.CommandCollection[10];
             if ((BatchID.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -29682,7 +29715,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getByStatus(global::System.Nullable<int> Status, string SearchVal, global::System.Nullable<bool> ShowSplit, global::System.Nullable<int> PartValid) {
-            this.Adapter.SelectCommand = this.CommandCollection[10];
+            this.Adapter.SelectCommand = this.CommandCollection[11];
             if ((Status.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Status.Value));
             }
@@ -29717,7 +29750,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getCurrentByMachine(string PlaceCod) {
-            this.Adapter.SelectCommand = this.CommandCollection[11];
+            this.Adapter.SelectCommand = this.CommandCollection[12];
             if ((PlaceCod == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -29734,7 +29767,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getDescendByKey(global::System.Nullable<int> BatchID) {
-            this.Adapter.SelectCommand = this.CommandCollection[12];
+            this.Adapter.SelectCommand = this.CommandCollection[13];
             if ((BatchID.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -29751,7 +29784,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getForBunkMan(global::System.Nullable<int> MaxPosition) {
-            this.Adapter.SelectCommand = this.CommandCollection[13];
+            this.Adapter.SelectCommand = this.CommandCollection[14];
             if ((MaxPosition.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(MaxPosition.Value));
             }
@@ -29768,7 +29801,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getLastByTakt(string Takt) {
-            this.Adapter.SelectCommand = this.CommandCollection[14];
+            this.Adapter.SelectCommand = this.CommandCollection[15];
             if ((Takt == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -29780,12 +29813,23 @@ namespace AppData.DS_AppTableAdapters {
             return dataTable;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_App.BatchListDataTable getNestRunning() {
+            this.Adapter.SelectCommand = this.CommandCollection[16];
+            DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getNextAvailable(string PlaceCod) {
-            this.Adapter.SelectCommand = this.CommandCollection[15];
+            this.Adapter.SelectCommand = this.CommandCollection[17];
             if ((PlaceCod == null)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -29802,7 +29846,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getRunning() {
-            this.Adapter.SelectCommand = this.CommandCollection[16];
+            this.Adapter.SelectCommand = this.CommandCollection[18];
             DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -29813,7 +29857,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getSched() {
-            this.Adapter.SelectCommand = this.CommandCollection[17];
+            this.Adapter.SelectCommand = this.CommandCollection[19];
             DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
             this.Adapter.Fill(dataTable);
             return dataTable;
@@ -29824,7 +29868,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
         public virtual DS_App.BatchListDataTable getSplitByKey(global::System.Nullable<int> BatchID) {
-            this.Adapter.SelectCommand = this.CommandCollection[18];
+            this.Adapter.SelectCommand = this.CommandCollection[20];
             if ((BatchID.HasValue == true)) {
                 this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -30072,11 +30116,33 @@ namespace AppData.DS_AppTableAdapters {
             return returnValue;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        public virtual int invalidateRunning() {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[21];
+            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
+                        != global::System.Data.ConnectionState.Open)) {
+                command.Connection.Open();
+            }
+            int returnValue;
+            try {
+                returnValue = command.ExecuteNonQuery();
+            }
+            finally {
+                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+                    command.Connection.Close();
+                }
+            }
+            return returnValue;
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int makeDescendantByKey(global::System.Nullable<int> BatchID, string PlaceCodAnces) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[19];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[22];
             if ((BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -30110,7 +30176,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int redoPartValid(string Takt) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[20];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[23];
             if ((Takt == null)) {
                 command.Parameters[1].Value = global::System.DBNull.Value;
             }
@@ -30138,7 +30204,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int refuseNesting(global::System.Nullable<int> BatchID, string userName) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[21];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[24];
             if ((BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -30172,7 +30238,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int resetNesting(global::System.Nullable<int> BatchID) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[22];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[25];
             if ((BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -30200,7 +30266,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int resetPartUnValid() {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[23];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[26];
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -30222,7 +30288,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int resetProdCall() {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[24];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[27];
             global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
             if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
@@ -30244,7 +30310,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int resetTree(global::System.Nullable<int> Original_BatchID) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[25];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[28];
             if ((Original_BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(Original_BatchID.Value));
             }
@@ -30272,7 +30338,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updatePlaceCod(global::System.Nullable<int> Original_BatchID, string PlaceCod) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[26];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[29];
             if ((Original_BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(Original_BatchID.Value));
             }
@@ -30306,7 +30372,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateSchedPrior(global::System.Nullable<int> BatchID, global::System.Nullable<int> SchedPrio) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[27];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[30];
             if ((BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(BatchID.Value));
             }
@@ -30340,7 +30406,7 @@ namespace AppData.DS_AppTableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
         [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
         public virtual int updateStatus(global::System.Nullable<int> BatchID, global::System.Nullable<int> Status, string EnvNum, global::System.Nullable<decimal> TotalTime) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[28];
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[31];
             if ((BatchID.HasValue == true)) {
                 command.Parameters[1].Value = ((int)(BatchID.Value));
             }

AppData/DS_App.xsd

@@ -134,6 +134,17 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_getApprovedByTakt" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getApprovedByTakt" GetMethodModifier="Public" GetMethodName="getApprovedByTakt" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getApprovedByTakt" UserSourceName="getApprovedByTakt">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_Batch_getApprovedByTakt</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="@Takt" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_getByKey" 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">
@@ -203,6 +214,16 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_getNestRunning" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getNestRunning" GetMethodModifier="Public" GetMethodName="getNestRunning" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getNestRunning" UserSourceName="getNestRunning">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_Batch_getNestRunning</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" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_getNextAvailable" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getNextAvailable" GetMethodModifier="Public" GetMethodName="getNextAvailable" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getNextAvailable" UserSourceName="getNextAvailable">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
@@ -245,6 +266,16 @@ FROM v_BatchList</CommandText>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_invalidateRunning" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="invalidateRunning" Modifier="Public" Name="invalidateRunning" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy18" UserSourceName="invalidateRunning">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_Batch_invalidateRunning</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" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="Sauder_NKCConnectionString (Settings)" DbObjectName="Sauder_NKC.dbo.stp_Batch_makeDescendantByKey" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="makeDescendantByKey" Modifier="Public" Name="makeDescendantByKey" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy8" UserSourceName="makeDescendantByKey">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">

AppData/DS_App.xss

@@ -4,7 +4,7 @@
      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="-24" ViewPortY="1372" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-24" ViewPortY="-53" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:BatchList" ZOrder="5" X="325" Y="437" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:StackList" ZOrder="6" X="618" Y="961" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />

Jenkinsfile

@@ -186,8 +186,8 @@ pipeline {
             
             // lancio upload con nuget!
             echo 'Start upload with nuget push'
-            bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted"
-            bat "e:\\nuget.exe push NKC_SDK.${env.packVers}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
+            bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted"
+            bat "e:\\nuget.exe push NKC_SDK.${env.packVers}.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted"
           }
           else
           {
@@ -277,16 +277,16 @@ def sendSlack(status, colorCode) {
 
 // funzione x fix pacchetti nuget da NOSTRO repo Nexus con proxy
 def fixNuget(solutionFile) {
-  // bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-group"
+  // bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-group"
   // solo la prima volta va aggiunta...
   hasSource = bat "e:\\nuget sources list | find \"Steamware\" /C"
   if (hasSource == "0")
   {
-    bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
+    bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source https://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
   }
   else
   {
-    bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
+    bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source https://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
   }
   bat "e:\\nuget.exe restore ${solutionFile}"
 }

NKC_WF/BasePage.cs

@@ -48,7 +48,7 @@ namespace NKC_WF
         /// <param name="message"></param>
         public void lgFatal(string message, Exception exc)
         {
-            logger.lg.scriviLog(message, tipoLog.FATAL);
+            logger.lg.scriviLog($"{message}{Environment.NewLine}{exc}", tipoLog.FATAL);
         }
 
         /// <summary>

NKC_WF/BaseUserControl.cs

@@ -22,7 +22,7 @@ namespace NKC_WF
         /// <summary>
         /// Codice macchina (da v2)
         /// </summary>
-        public string PlaceCod = "WRK001";
+        public string PlaceCod = "VIRTNE";
 
         #endregion Public Fields
 
@@ -206,7 +206,7 @@ namespace NKC_WF
         /// <param name="message"></param>
         public void lgFatal(string message, Exception exc)
         {
-            logger.lg.scriviLog(message, tipoLog.FATAL);
+            logger.lg.scriviLog($"{message}{Environment.NewLine}{exc}", tipoLog.FATAL);
         }
 
         /// <summary>

NKC_WF/Compressor.cs

@@ -5,6 +5,7 @@ namespace NKC_WF
 {
     public static class Compressor
     {
+        #region Public Methods
 
         public static byte[] Compress(byte[] data)
         {
@@ -18,22 +19,28 @@ namespace NKC_WF
 
         public static byte[] Decompress(byte[] data)
         {
+            byte[] answ = new byte[1];
             MemoryStream input = new MemoryStream();
             input.Write(data, 0, data.Length);
             input.Position = 0;
             GZipStream gzip = new GZipStream(input,
                               CompressionMode.Decompress, true);
-            MemoryStream output = new MemoryStream();
-            byte[] buff = new byte[64];
-            int read = -1;
-            read = gzip.Read(buff, 0, buff.Length);
-            while (read > 0)
+            using (MemoryStream output = new MemoryStream())
             {
-                output.Write(buff, 0, read);
+                byte[] buff = new byte[64];
+                int read = -1;
                 read = gzip.Read(buff, 0, buff.Length);
+                while (read > 0)
+                {
+                    output.Write(buff, 0, read);
+                    read = gzip.Read(buff, 0, buff.Length);
+                }
+                gzip.Close();
+                answ = output.ToArray();
             }
-            gzip.Close();
-            return output.ToArray();
+            return answ;
         }
+
+        #endregion Public Methods
     }
-}
+}

NKC_WF/Controllers/BatchProcController.cs

@@ -576,7 +576,7 @@ namespace NKC_WF.Controllers
                     answ = "WRONG DATA (expected baseNestAnsw object)";
                 }
             }
-            catch (Exception exc)
+            catch
             {
                 answ = "NO";
             }

NKC_WF/ErrorPages/400.aspx.cs

@@ -1,4 +1,5 @@
-using System;
+using SteamWare;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
@@ -9,6 +10,8 @@ namespace NKC_WF.ErrorPages
 {
     public partial class _400 : BasePage
     {
+        #region Protected Methods
+
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!Page.IsPostBack)
@@ -21,5 +24,7 @@ namespace NKC_WF.ErrorPages
             cmp_errorDetail.ErrorExpl = traduci("Err400Expl");
             cmp_errorDetail.UserName = string.IsNullOrEmpty(User.Identity.Name) ? "N.A." : User.Identity.Name;
         }
+
+        #endregion Protected Methods
     }
 }

NKC_WF/ErrorPages/Oops.aspx.cs

@@ -6,17 +6,21 @@ namespace NKC_WF.ErrorPages
 {
     public partial class Oops : BasePage
     {
+        #region Protected Methods
+
         protected void Page_Load(object sender, EventArgs e)
         {
-            if(!Page.IsPostBack)
+            if (!Page.IsPostBack)
             {
                 var thisMaster = ((SiteContent)this.Master);
                 thisMaster.showSearch = false;
                 thisMaster.enableAnonym = true;
             }
             cmp_errorDetail.ErrorTitle = traduci("SomeErrorOccurred");
-            cmp_errorDetail.ErrorExpl = string.IsNullOrEmpty(memLayer.ML.QSS("aspxerrorpath"))?"N.A.": traduci(memLayer.ML.QSS("aspxerrorpath"));
+            cmp_errorDetail.ErrorExpl = string.IsNullOrEmpty(memLayer.ML.QSS("aspxerrorpath")) ? "N.A." : traduci(memLayer.ML.QSS("aspxerrorpath"));
             cmp_errorDetail.UserName = string.IsNullOrEmpty(User.Identity.Name) ? "N.A." : User.Identity.Name;
         }
+
+        #endregion Protected Methods
     }
 }

NKC_WF/NKC_WF.csproj

@@ -30,7 +30,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <TypeScriptToolsVersion>3.4</TypeScriptToolsVersion>
+    <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -100,8 +100,8 @@
     <Reference Include="MongoDB.Driver.Core, Version=2.13.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MongoDB.Driver.Core.2.13.1\lib\net452\MongoDB.Driver.Core.dll</HintPath>
     </Reference>
-    <Reference Include="MongoDB.Libmongocrypt, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MongoDB.Libmongocrypt.1.2.2\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
+    <Reference Include="MongoDB.Libmongocrypt, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MongoDB.Libmongocrypt.1.2.3\lib\netstandard2.0\MongoDB.Libmongocrypt.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -118,8 +118,8 @@
     <Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
       <HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.0\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
     </Reference>
-    <Reference Include="SharpCompress, Version=0.28.3.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpCompress.0.28.3\lib\netstandard2.0\SharpCompress.dll</HintPath>
+    <Reference Include="SharpCompress, Version=0.29.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpCompress.0.29.0\lib\netstandard2.0\SharpCompress.dll</HintPath>
     </Reference>
     <Reference Include="Snappy.NET, Version=1.1.1.8, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
@@ -127,11 +127,11 @@
     <Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
       <HintPath>..\packages\StackExchange.Redis.2.2.62\lib\net461\StackExchange.Redis.dll</HintPath>
     </Reference>
-    <Reference Include="SteamWare, Version=5.1.2108.1912, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.5.1.2108.1912\lib\net462\SteamWare.dll</HintPath>
+    <Reference Include="SteamWare, Version=5.1.2109.1713, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.5.1.2109.1713\lib\net462\SteamWare.dll</HintPath>
     </Reference>
-    <Reference Include="SteamWare.Logger, Version=5.1.2108.1912, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamWare.Logger.5.1.2108.1912\lib\net462\SteamWare.Logger.dll</HintPath>
+    <Reference Include="SteamWare.Logger, Version=5.1.2109.1713, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamWare.Logger.5.1.2109.1713\lib\net462\SteamWare.Logger.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -1894,9 +1894,9 @@
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>61257</DevelopmentServerPort>
+          <DevelopmentServerPort>44388</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>https://localhost:44388/</IISUrl>
+          <IISUrl>https://localhost:44393/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
@@ -1922,8 +1922,8 @@
     <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets'))" />
-    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets'))" />
     <Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.3\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.3\build\MongoDB.Libmongocrypt.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -1951,6 +1951,6 @@
   <Import Project="..\packages\Microsoft.NetCore.Analyzers.3.3.2\build\Microsoft.NetCore.Analyzers.targets" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.3.3.2\build\Microsoft.NetCore.Analyzers.targets')" />
   <Import Project="..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.3.3.2\build\Microsoft.NetFramework.Analyzers.targets')" />
   <Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.3.3.2\build\Microsoft.CodeAnalysis.FxCopAnalyzers.targets')" />
-  <Import Project="..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.2\build\MongoDB.Libmongocrypt.targets')" />
   <Import Project="..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.13.1\build\MongoDB.Driver.Core.targets')" />
+  <Import Project="..\packages\MongoDB.Libmongocrypt.1.2.3\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.3\build\MongoDB.Libmongocrypt.targets')" />
 </Project>

NKC_WF/Resources/manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.0.0.0</version>
-  <url>http://seriate.steamware.net:8083/SWS/NKC/{{BRANCHNAME}}/{{PACKNAME}}.zip</url>
-  <changelog>http://seriate.steamware.net:8083/SWS/NKC/{{BRANCHNAME}}/ChangeLog.html</changelog>
-  <mandatory>false</mandatory>
+    <version>0.0.0.0</version>
+    <url>https://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/LAST/NKC.zip</url>
+    <changelog>https://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/LAST/ChangeLog.html</changelog>
+    <mandatory>false</mandatory>
 </item>

NKC_WF/Web.config

@@ -6,430 +6,431 @@
 <configuration>
     <configSections>
         <sectionGroup name="elmah">
-            <section name="security" requirePermission="false" type="Elmah.SecuritySectionHandler, Elmah"/>
-            <section name="errorLog" requirePermission="false" type="Elmah.ErrorLogSectionHandler, Elmah"/>
-            <section name="errorMail" requirePermission="false" type="Elmah.ErrorMailSectionHandler, Elmah"/>
-            <section name="errorFilter" requirePermission="false" type="Elmah.ErrorFilterSectionHandler, Elmah"/>
+            <section name="security" requirePermission="false" type="Elmah.SecuritySectionHandler, Elmah" />
+            <section name="errorLog" requirePermission="false" type="Elmah.ErrorLogSectionHandler, Elmah" />
+            <section name="errorMail" requirePermission="false" type="Elmah.ErrorMailSectionHandler, Elmah" />
+            <section name="errorFilter" requirePermission="false" type="Elmah.ErrorFilterSectionHandler, Elmah" />
         </sectionGroup>
     </configSections>
     <system.web>
-        <compilation targetFramework="4.6.2" debug="true"/>
-        <httpRuntime targetFramework="4.6.2"/>
+        <compilation targetFramework="4.6.2" debug="true" />
+        <httpRuntime targetFramework="4.6.2" />
         <pages>
             <namespaces>
-                <add namespace="System.Web.Optimization"/>
+                <add namespace="System.Web.Optimization" />
             </namespaces>
             <controls>
-                <add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt"/>
+                <add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt" />
 
-                <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit"/>
+                <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
             </controls>
         </pages>
         <sessionState mode="Custom" customProvider="MySessionStateStore">
             <providers>
                 <add name="MySessionStateStore" type="Microsoft.Web.Redis.RedisSessionStateProvider" host="127.0.0.1" accessKey="" ssl="false"
-                    applicationName="NKC" databaseId="2" timeout="480"/>
+                    applicationName="NKC" databaseId="2" timeout="480" />
             </providers>
         </sessionState>
         <httpModules>
-            <add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah"/>
-            <add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah"/>
-            <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah"/>
+            <add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" />
+            <add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" />
+            <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" />
         </httpModules>
         <!--Nascondo gli erroracci-->
         <!--<customErrors mode="On" defaultRedirect="~/site/Default" />-->
         <!--<customErrors mode="On" defaultRedirect="~/" />-->
         <!--<customErrors mode="On" defaultRedirect="~/ErrorPages/Oops.aspx">-->
         <customErrors mode="RemoteOnly" defaultRedirect="~/ErrorPages/Oops.aspx">
-            <error statusCode="400" redirect="~/ErrorPages/400.aspx"/>
-            <error statusCode="401" redirect="~/ErrorPages/401.aspx"/>
-            <error statusCode="403" redirect="~/ErrorPages/403.aspx"/>
-            <error statusCode="404" redirect="~/ErrorPages/404.aspx"/>
-            <error statusCode="500" redirect="~/ErrorPages/500.aspx"/>
-            <error statusCode="503" redirect="~/ErrorPages/503.aspx"/>
+            <error statusCode="400" redirect="~/ErrorPages/400.aspx" />
+            <error statusCode="401" redirect="~/ErrorPages/401.aspx" />
+            <error statusCode="403" redirect="~/ErrorPages/403.aspx" />
+            <error statusCode="404" redirect="~/ErrorPages/404.aspx" />
+            <error statusCode="500" redirect="~/ErrorPages/500.aspx" />
+            <error statusCode="503" redirect="~/ErrorPages/503.aspx" />
         </customErrors>
         <!--Mostro gli erroracci-->
         <!--<customErrors mode="Off" />-->
     </system.web>
     <appSettings>
         <!--Configurazioni generali-->
-        <add key="intUpdatePagina_ms" value="120000"/>
-        <add key="appName" value="NKC"/>
-        <add key="CodModulo" value="NKC"/>
-        <add key="copyRight" value="Egaltech &amp; Steamware "/>
-        <add key="authSenzaDominio" value="true"/>
-        <add key="_safePages" value="Test#Home#Default"/>
-        <add key="_righeDataGridAnagr" value="20"/>
-        <add key="BaseUrl" value="http://IIS02/NKC"/>
+        <add key="intUpdatePagina_ms" value="120000" />
+        <add key="appName" value="NKC" />
+        <add key="CodModulo" value="NKC" />
+        <add key="copyRight" value="Egaltech &amp; Steamware " />
+        <add key="authSenzaDominio" value="true" />
+        <add key="_safePages" value="Test#Home#Default" />
+        <add key="_righeDataGridAnagr" value="20" />
+        <add key="BaseUrl" value="http://IIS02/NKC" />
         <!--Updater area-->
-        <add key="downloadPath" value="c:\Steamware\installers\"/>
-        <add key="appVers" value="master"/>
+        <add key="downloadPath" value="c:\Steamware\installers\" />
+        <add key="appVers" value="master" />
         <!--area logger-->
-        <add key="_logDir" value="~/logs/"/>
-        <add key="enableDumpDiag" value="false"/>
-        <add key="doShrinkFolder" value="true"/>
-        <add key="_logLevel" value="6"/>
-        <add key="_logMaxMb" value="30"/>
-        <add key="logMitigSec" value="30"/>
+        <add key="_logDir" value="~/logs/" />
+        <add key="enableDumpDiag" value="false" />
+        <add key="doShrinkFolder" value="true" />
+        <add key="_logLevel" value="6" />
+        <add key="_logMaxMb" value="30" />
+        <add key="logMitigSec" value="30" />
         <!--Impostazione gestione serializzazione variabili in sessione (es per Redis)-->
-        <add key="serializeSession" value="true"/>
-        <add key="errorPageRedirect" value="./Reset?Action=CDV"/>
-        <add key="maxAgeAppConf_min" value="5"/>
+        <add key="serializeSession" value="true" />
+        <add key="errorPageRedirect" value="./Reset?Action=CDV" />
+        <add key="maxAgeAppConf_min" value="5" />
         <!--minima durata x validità in stima PARTS singole -->
-        <add key="minValidEstSec" value="2"/>
+        <add key="minValidEstSec" value="2" />
         <!--Configurazioni Redis-->
-        <add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password"/>
-        <add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true"/>
-        <add key="redisDb" value="2"/>
-        <add key="cacheDataTTL" value="2"/>
+        <add key="cacheOnRedis" value="true" />
+        <add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password" />
+        <add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true" />
+        <add key="redisDb" value="2" />
+        <add key="cacheDataTTL" value="2" />
         <!--MongoDB-->
-        <add key="mdbConnString" value="mongodb://W2019-MONGODB:27017"/>
-        <add key="enableMongo" value="true"/>
+        <add key="mdbConnString" value="mongodb://W2019-MONGODB:27017" />
+        <add key="enableMongo" value="true" />
         <!--Configurazioni DB per classi referenziate AppData e Steamware dll-->
-        <add key="NKC_WFConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
-        <add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
+        <add key="NKC_WFConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+        <add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="VocabolarioConnectionString"
-            value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
+            value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="UtenteCdcConnectionString"
-            value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
+            value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
         <add key="PermessiConnectionString"
-            value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
+            value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
     </appSettings>
     <connectionStrings>
         <add name="AppData.Properties.Settings.Sauder_NKCConnectionString"
             connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
-            providerName="System.Data.SqlClient"/>
+            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"/>
+            providerName="System.Data.SqlClient" />
     </connectionStrings>
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
-                <assemblyIdentity name="DnsClient" publicKeyToken="4574BB5573C51424" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.3.2.0" newVersion="1.3.2.0"/>
+                <assemblyIdentity name="DnsClient" publicKeyToken="4574BB5573C51424" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.3.2.0" newVersion="1.3.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
+                <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
+                <assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
+                <assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
+                <assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0"/>
+                <assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
+                <assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
+                <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0"/>
+                <assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
+                <assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
+                <assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
+                <assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
+                <assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
+                <assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Net.Sockets" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
+                <assemblyIdentity name="System.Net.Sockets" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
+                <assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Net.Http" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
+                <assemblyIdentity name="System.Net.Http" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
+                <assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
+                <assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0"/>
+                <assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
+                <assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
+                <assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
+                <assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
+                <assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
+                <assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
+                <assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0"/>
+                <assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
+                <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
+                <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
+                <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
-                <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
+                <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
+                <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
+                <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1"/>
+                <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
+                <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
+                <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
+                <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0"/>
+                <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
-                <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+                <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
-                <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+                <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-                <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
+                <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
+                <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-0.28.3.0" newVersion="0.28.3.0"/>
+                <assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-0.29.0.0" newVersion="0.29.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
+                <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
+                <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0"/>
+                <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="DnsClient" publicKeyToken="4574bb5573c51424" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0"/>
+                <assemblyIdentity name="DnsClient" publicKeyToken="4574bb5573c51424" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1"/>
+                <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10"/>
+                <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10" />
             </dependentAssembly>
         </assemblyBinding>
     </runtime>
     <system.webServer>
         <modules>
-            <remove name="Session"/>
+            <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="ErrorLog" type="Elmah.ErrorLogModule, Elmah" preCondition="managedHandler"/>
-            <add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler"/>
-            <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler"/>
+                preCondition="integratedMode" />
+            <add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" preCondition="managedHandler" />
+            <add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler" />
+            <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler" />
         </modules>
-        <validation validateIntegratedModeConfiguration="false"/>
+        <validation validateIntegratedModeConfiguration="false" />
         <handlers>
-            <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
-            <remove name="OPTIONSVerbHandler"/>
-            <remove name="TRACEVerbHandler"/>
+            <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+            <remove name="OPTIONSVerbHandler" />
+            <remove name="TRACEVerbHandler" />
             <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler"
-                preCondition="integratedMode,runtimeVersionv4.0"/>
+                preCondition="integratedMode,runtimeVersionv4.0" />
         </handlers>
         <staticContent>
-            <clientCache cacheControlCustom="public" cacheControlMode="UseMaxAge" cacheControlMaxAge="1.00:00:00"/>
-            <remove fileExtension=".woff"/>
-            <remove fileExtension=".woff2"/>
-            <mimeMap fileExtension=".woff" mimeType="application/x-font-woff"/>
-            <mimeMap fileExtension=".woff2" mimeType="application/font-woff2"/>
+            <clientCache cacheControlCustom="public" cacheControlMode="UseMaxAge" cacheControlMaxAge="1.00:00:00" />
+            <remove fileExtension=".woff" />
+            <remove fileExtension=".woff2" />
+            <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
+            <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
         </staticContent>
     </system.webServer>
     <elmah>
@@ -437,21 +438,21 @@
         See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
         more information on remote access and securing ELMAH.
     -->
-        <errorLog type="Elmah.SqlErrorLog, Elmah" connectionStringName="ErrorLog"/>
-        <security allowRemoteAccess="false"/>
+        <errorLog type="Elmah.SqlErrorLog, Elmah" connectionStringName="ErrorLog" />
+        <security allowRemoteAccess="false" />
     </elmah>
     <!--Autorizzaione di windows FORZATA solo sulla subdir SITE-->
     <location path="site">
         <system.web>
             <authorization>
-                <deny users="?"/>
+                <deny users="?" />
             </authorization>
         </system.web>
     </location>
     <location path="elmah.axd" inheritInChildApplications="false">
         <system.web>
             <httpHandlers>
-                <add verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah"/>
+                <add verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" />
             </httpHandlers>
             <!--
         See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
@@ -465,17 +466,17 @@
         </system.web>
         <system.webServer>
             <handlers>
-                <add name="ELMAH" verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" preCondition="integratedMode"/>
+                <add name="ELMAH" verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah" preCondition="integratedMode" />
             </handlers>
         </system.webServer>
     </location>
     <system.codedom>
         <compilers>
             <compiler extension=".cs" language="c#;cs;csharp" warningLevel="4" compilerOptions="/langversion:7.0 /nowarn:1659;1699;1701;612;618"
-                type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+                type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
             <compiler extension=".vb" language="vb;vbs;visualbasic;vbscript" warningLevel="4"
                 compilerOptions="/langversion:default /nowarn:41008,40000,40008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"
-                type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+                type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
         </compilers>
     </system.codedom>
 </configuration>

NKC_WF/WebUserControls/cmp_batchDetailSplit.ascx.cs

@@ -12,15 +12,6 @@ namespace NKC_WF.WebUserControls
 {
     public partial class cmp_batchDetailSplit : BaseUserControl
     {
-        #region Protected Fields
-
-        /// <summary>
-        /// Master Place (hard-coded)
-        /// </summary>
-        protected string PlaceCod = "VIRTNE";
-
-        #endregion Protected Fields
-
         #region Protected Properties
 
         protected bool BatchIsAncestor
@@ -59,20 +50,6 @@ namespace NKC_WF.WebUserControls
             }
         }
 
-        public bool isSplitted
-        {
-            get
-            {
-                bool answ = false;
-                bool.TryParse(hfIsSplit.Value, out answ);
-                return answ;
-            }
-            set
-            {
-                hfIsSplit.Value = $"{value}";
-            }
-        }
-
         protected int lastValRatio
         {
             get
@@ -192,6 +169,20 @@ namespace NKC_WF.WebUserControls
             }
         }
 
+        public bool isSplitted
+        {
+            get
+            {
+                bool answ = false;
+                bool.TryParse(hfIsSplit.Value, out answ);
+                return answ;
+            }
+            set
+            {
+                hfIsSplit.Value = $"{value}";
+            }
+        }
+
         #endregion Public Properties
 
         #region Private Methods

NKC_WF/WebUserControls/cmp_errorDetail.ascx.cs

@@ -11,96 +11,7 @@ namespace NKC_WF.WebUserControls
 {
     public partial class cmp_errorDetail : BaseUserControl
     {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-        }
-
-        public string ErrorTitle
-        {
-            get
-            {
-                return lblErrorTitle.Text;
-            }
-            set
-            {
-                lblErrorTitle.Text = value;
-            }
-        }
-        public string ErrorExpl
-        {
-            get
-            {
-                return lblErrorExpl.Text;
-            }
-            set
-            {
-                lblErrorExpl.Text = value;
-            }
-        }
-
-        public string LastError
-        {
-            get
-            {
-                string answ = "N.A.";
-                if (!string.IsNullOrEmpty(memLayer.ML.QSS("aspxerrorpath")))
-                {
-                    answ = traduci(memLayer.ML.QSS("aspxerrorpath"));
-                }
-                return answ;
-            }
-        }
-        public string LastErrorCode
-        {
-            get
-            {
-                string answ = "N.A.";
-                if (!string.IsNullOrEmpty(memLayer.ML.QSS("aspxerrorpath")))
-                {
-                    answ = memLayer.ML.QSS("aspxerrorpath");
-                }
-                return answ;
-            }
-        }
-
-        public string UserName
-        {
-            get
-            {
-                return lblUserName.Text;
-            }
-            set
-            {
-                lblUserName.Text = value;
-            }
-        }
-
-        protected void lbtTryReset_Click(object sender, EventArgs e)
-        {
-            doRedirect();
-        }
-
-        private void doRedirect()
-        {
-            // svuoto session e cache per rileggere i dati da Db
-            Session.RemoveAll();
-            try
-            {
-                // aggiorno vocabolario
-                DataWrap.DW.resetVocabolario();
-                // reset dati in cache x DbConfig...
-                memLayer.ML.resetAppConf();
-            }
-            catch
-            { }
-            // ulteriore reset sessione
-            Session.Clear();
-            // attendo...
-            Thread.Sleep(500);
-            // reload!
-            memLayer.ML.setSessionVal("nextPage", "default");
-            Response.Redirect("~/default");
-        }
+        #region Protected Properties
 
         protected int countDown
         {
@@ -116,6 +27,60 @@ namespace NKC_WF.WebUserControls
             }
         }
 
+        #endregion Protected Properties
+
+        #region Public Properties
+
+        public string ErrorExpl
+        {
+            get
+            {
+                return lblErrorExpl.Text;
+            }
+            set
+            {
+                lblErrorExpl.Text = value;
+            }
+        }
+
+        public string ErrorTitle
+        {
+            get
+            {
+                return lblErrorTitle.Text;
+            }
+            set
+            {
+                lblErrorTitle.Text = value;
+            }
+        }
+
+        public string LastError
+        {
+            get
+            {
+                string answ = "N.A.";
+                if (!string.IsNullOrEmpty(memLayer.ML.QSS("aspxerrorpath")))
+                {
+                    answ = traduci(memLayer.ML.QSS("aspxerrorpath"));
+                }
+                return answ;
+            }
+        }
+
+        public string LastErrorCode
+        {
+            get
+            {
+                string answ = "N.A.";
+                if (!string.IsNullOrEmpty(memLayer.ML.QSS("aspxerrorpath")))
+                {
+                    answ = memLayer.ML.QSS("aspxerrorpath");
+                }
+                return answ;
+            }
+        }
+
         public string timeAdv
         {
             get
@@ -124,6 +89,72 @@ namespace NKC_WF.WebUserControls
             }
         }
 
+        public string UserName
+        {
+            get
+            {
+                return lblUserName.Text;
+            }
+            set
+            {
+                lblUserName.Text = value;
+            }
+        }
+
+        #endregion Public Properties
+
+        #region Private Methods
+
+        private void doRedirect()
+        {
+            // loggo!
+            lgError($"ERROR PAGE --> REDIRECT to default{Environment.NewLine}Curr Url: {Request.Url.AbsoluteUri}{Environment.NewLine}UserName: {UserName}{Environment.NewLine}Error Origin: {LastErrorCode}{Environment.NewLine}ErrorExpl: {ErrorExpl}");
+            // svuoto session e cache per rileggere i dati da Db
+            Session.RemoveAll();
+            try
+            {
+                // aggiorno vocabolario
+                DataWrap.DW.resetVocabolario();
+                // reset dati in cache x DbConfig...
+                memLayer.ML.resetAppConf();
+            }
+            catch
+            { }
+            // ulteriore reset sessione
+            Session.Clear();
+            // attendo...
+            Thread.Sleep(500);
+            // cerco ins essione SE non ci fosse un redirect appena fatto... se non c'è tento di tornare alla pagina, altrimenti alla default...
+            string reloadKey = "NKC:SERV:ERRORS:RELOADPAGE";
+            string rawData = memLayer.ML.getRSV(reloadKey);
+            string nextPage = "default";
+            if (string.IsNullOrEmpty(rawData))
+            {
+                // imposto pagina
+                nextPage = LastErrorCode;
+                lgInfo($"Tentativo redirect a ultima pagina: {nextPage}");
+                //imposto in redis x 20 sec...
+                memLayer.ML.setRSV(reloadKey, nextPage, 20);
+            }
+
+            // reload!
+            memLayer.ML.setSessionVal("nextPage", nextPage);
+            Response.Redirect($"~/{nextPage}");
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        protected void lbtTryReset_Click(object sender, EventArgs e)
+        {
+            doRedirect();
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
+
         protected void timerRedirect_Tick(object sender, EventArgs e)
         {
             // decremento contatore
@@ -133,5 +164,7 @@ namespace NKC_WF.WebUserControls
             }
             countDown--;
         }
+
+        #endregion Protected Methods
     }
 }

NKC_WF/WebUserControls/cmp_fileUpload.ascx

@@ -4,6 +4,8 @@
 <asp:HiddenField runat="server" ID="hfForceRedirect" />
 <asp:HiddenField runat="server" ID="hfFilePrefix" />
 <asp:HiddenField runat="server" ID="hfFileSuffix" />
+<asp:HiddenField runat="server" ID="hfChkBatchApp" />
+<asp:HiddenField runat="server" ID="hfChkRunning" />
 <div id="divFileUpl" runat="server" class="d-flex flex-row-reverse">
     <div class="px-2">
         <asp:LinkButton ID="lbtCancel" runat="server" Text="Annulla" OnClick="btnCancel_Click" CssClass="btn btn-warning form-control"><%: traduci("cancel") %> <i class="fa fa-ban" aria-hidden="true"></i></asp:LinkButton>

NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs

@@ -36,6 +36,34 @@ namespace NKC_WF.WebUserContols
 
         #region Public Properties
 
+        public bool checkBatchAppr
+        {
+            get
+            {
+                bool answ = true;
+                bool.TryParse(hfChkBatchApp.Value, out answ);
+                return answ;
+            }
+            set
+            {
+                hfChkBatchApp.Value = value.ToString();
+            }
+        }
+
+        public bool checkRunning
+        {
+            get
+            {
+                bool answ = true;
+                bool.TryParse(hfChkRunning.Value, out answ);
+                return answ;
+            }
+            set
+            {
+                hfChkRunning.Value = value.ToString();
+            }
+        }
+
         /// <summary>
         /// Prefisso file abilitato
         /// </summary>
@@ -169,11 +197,13 @@ namespace NKC_WF.WebUserContols
 
         protected void Upload(object sender, EventArgs e)
         {
+            bool checkFileOk = true;
             string uplFileName = "";
             string uploadedFilename = "";
             string batchName = "";
             string savedFilename = "";
             string contentType = "";
+            divMessagge.Visible = false;
             DateTime adesso = DateTime.Now;
             string dirFrom = Server.MapPath(_tempUploadDir);
             // se c'è un file
@@ -210,19 +240,41 @@ namespace NKC_WF.WebUserContols
                     }
                     else
                     {
-                        contentType = FileUpload1.PostedFile.ContentType;
-                        // accedo allo stream del file allegato
-                        using (Stream fs = FileUpload1.PostedFile.InputStream)
+                        // se richiesto controllo duplicati
+                        if (checkBatchAppr)
                         {
-                            // scrivo su file
-                            FileStream file = new FileStream(savedFilename, FileMode.Create, FileAccess.Write);
-                            fs.CopyTo(file);
-                            file.Close();
-                            // log!
-                            logger.lg.scriviLog($"Effettuato salvataggio file {uploadedFilename} come {savedFilename}");
+                            // controllo se ci sia un batch duplicato
+                            checkFileOk = DLMan.taBL.getApprovedByTakt(batchName).Count == 0;
+                            lblMessage.Text = $"{traduci("Error_BatchIsApproved")}";
+                        }
+                        // se richiesto controllo NON ci siano altri task running
+                        if (checkRunning)
+                        {
+                            // controllo se ci sia un batch duplicato
+                            checkFileOk = DLMan.taBL.getNestRunning().Count == 0;
+                            lblMessage.Text = $"{traduci("Error_OtherBatchTaskRunning")}";
+                        }
+
+                        if (!checkFileOk)
+                        {
+                            divMessagge.Visible = true;
+                        }
+                        else
+                        {
+                            contentType = FileUpload1.PostedFile.ContentType;
+                            // accedo allo stream del file allegato
+                            using (Stream fs = FileUpload1.PostedFile.InputStream)
+                            {
+                                // scrivo su file
+                                FileStream file = new FileStream(savedFilename, FileMode.Create, FileAccess.Write);
+                                fs.CopyTo(file);
+                                file.Close();
+                                // log!
+                                logger.lg.scriviLog($"Effettuato salvataggio file {uploadedFilename} come {savedFilename}");
+                            }
+                            // segnaloc he ho CARICATO IN LOCALE il file
+                            reportFileUploaded(new FileUploadEventArgs(dirFrom, uplFileName, batchName));
                         }
-                        // segnaloc he ho CARICATO IN LOCALE il file
-                        reportFileUploaded(new FileUploadEventArgs(dirFrom, uplFileName, batchName));
                     }
                 }
             }

NKC_WF/WebUserControls/cmp_fileUpload.ascx.designer.cs

@@ -50,6 +50,24 @@ namespace NKC_WF.WebUserContols
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hfFileSuffix;
 
+        /// <summary>
+        /// hfChkBatchApp control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfChkBatchApp;
+
+        /// <summary>
+        /// hfChkRunning control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfChkRunning;
+
         /// <summary>
         /// divFileUpl control.
         /// </summary>

NKC_WF/WebUserControls/cmp_footer.ascx.cs

@@ -6,14 +6,14 @@ namespace NKC_WF.WebUserControls
 {
     public partial class cmp_footer : BaseUserControl
     {
-        public event EventHandler eh_doRefresh;
-        protected void Page_Load(object sender, EventArgs e)
+        #region Private Methods
+
+        private void setClock()
         {
-            // sistemo le stringhe...
-            lblApp.Text = string.Format("<b>{0}</b> v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
-            setTimer();
-            setClock();
+            lblDateTime.Text = DateTime.Now.ToString("ddd dd.MM.yyyy, HH:mm:ss");
+            lblCodOperatore.Text = $"{user_std.UtSn.CognomeNome} ({Page.User.Identity.Name})";
         }
+
         /// <summary>
         /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada
         /// </summary>
@@ -21,20 +21,25 @@ namespace NKC_WF.WebUserControls
         {
             Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms");
         }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            // sistemo le stringhe...
+            lblApp.Text = string.Format("<b>{0}</b> v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
+            setTimer();
+            setClock();
+        }
+
         protected void Timer1_Tick(object sender, EventArgs e)
         {
             setClock();
-            // se qualcuno ascolta sollevo evento nuovo valore...
-            if (eh_doRefresh != null)
-            {
-                eh_doRefresh(this, new EventArgs());
-            }
+            raiseEvent();
         }
 
-        private void setClock()
-        {
-            lblDateTime.Text = DateTime.Now.ToString("ddd dd.MM.yyyy, HH:mm:ss");
-            lblCodOperatore.Text = $"{user_std.UtSn.CognomeNome} ({Page.User.Identity.Name})";
-        }
+        #endregion Protected Methods
     }
 }

NKC_WF/WebUserControls/cmp_menuTop.ascx.cs

@@ -7,44 +7,27 @@ namespace NKC_WF.WebUserControls
 {
     public partial class cmp_menuTop : BaseUserControl
     {
-        public event EventHandler eh_doRefresh;
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            if (!Page.IsPostBack)
-            {
-                checkAuth();
-                searchVal = "";
-                doSearch();
-                updateTreeMenu();
-            }
-        }
-
-        private void checkAuth()
-        {
-            // in primis SOLO SE non è permesso login anonymous...
-            if (!enableAnonym)
-            {
-                if (!Page.User.Identity.IsAuthenticated)
-                {
-                    Response.Redirect("default");
-                }
-            }
-        }
+        #region Protected Properties
 
         /// <summary>
-        /// imposta visibilità search globale
+        /// Valore ricerca attivo
         /// </summary>
-        public bool showSearch
+        protected string searchVal
         {
             get
             {
-                return divSearch.Visible;
+                return txtSearch.Text.Trim();
             }
             set
             {
-                divSearch.Visible = value;
+                txtSearch.Text = value.Trim();
             }
         }
+
+        #endregion Protected Properties
+
+        #region Public Properties
+
         /// <summary>
         /// Abilitazione esecuzione anonima
         /// </summary>
@@ -62,9 +45,35 @@ namespace NKC_WF.WebUserControls
             }
         }
 
-        protected void txtSearch_TextChanged(object sender, EventArgs e)
+        /// <summary>
+        /// imposta visibilità search globale
+        /// </summary>
+        public bool showSearch
         {
-            doSearch();
+            get
+            {
+                return divSearch.Visible;
+            }
+            set
+            {
+                divSearch.Visible = value;
+            }
+        }
+
+        #endregion Public Properties
+
+        #region Private Methods
+
+        private void checkAuth()
+        {
+            // in primis SOLO SE non è permesso login anonymous...
+            if (!enableAnonym)
+            {
+                if (!Page.User.Identity.IsAuthenticated)
+                {
+                    Response.Redirect("default");
+                }
+            }
         }
 
         private void doSearch()
@@ -78,27 +87,9 @@ namespace NKC_WF.WebUserControls
             {
                 memLayer.ML.emptySessionVal("valoreSearch");
             }
-            // se qualcuno ascolta sollevo evento nuovo valore...
-            if (eh_doRefresh != null)
-            {
-                eh_doRefresh(this, new EventArgs());
-            }
+            raiseEvent();
         }
 
-        /// <summary>
-        /// Valore ricerca attivo
-        /// </summary>
-        protected string searchVal
-        {
-            get
-            {
-                return txtSearch.Text.Trim();
-            }
-            set
-            {
-                txtSearch.Text = value.Trim();
-            }
-        }
         /// <summary>
         /// aggiornamento del menù
         /// </summary>
@@ -127,6 +118,11 @@ namespace NKC_WF.WebUserControls
                 }
             }
         }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
         /// <summary>
         /// click su pagina corrente, fa update!
         /// </summary>
@@ -140,9 +136,28 @@ namespace NKC_WF.WebUserControls
                 Response.Redirect("default");
             }
         }
+
         protected void lbtSearch_Click(object sender, EventArgs e)
         {
             doSearch();
         }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!Page.IsPostBack)
+            {
+                checkAuth();
+                searchVal = "";
+                doSearch();
+                updateTreeMenu();
+            }
+        }
+
+        protected void txtSearch_TextChanged(object sender, EventArgs e)
+        {
+            doSearch();
+        }
+
+        #endregion Protected Methods
     }
 }

NKC_WF/WebUserControls/cmp_numRow.ascx.cs

@@ -4,20 +4,8 @@ namespace NKC_WF.WebUserControls
 {
     public partial class cmp_numRow : BaseUserControl
     {
-        public event EventHandler eh_doRefresh;
-        protected void Page_Load(object sender, EventArgs e)
-        {
+        #region Public Properties
 
-        }
-
-        private void raiseEvent()
-        {
-            // se qualcuno ascolta sollevo evento nuovo valore...
-            if (eh_doRefresh != null)
-            {
-                eh_doRefresh(this, new EventArgs());
-            }
-        }
         public int numRow
         {
             set
@@ -32,10 +20,19 @@ namespace NKC_WF.WebUserControls
             }
         }
 
+        #endregion Public Properties
+
+        #region Protected Methods
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
+
         protected void txtNumRow_TextChanged(object sender, EventArgs e)
         {
-            
             raiseEvent();
         }
+
+        #endregion Protected Methods
     }
 }

NKC_WF/WebUserControls/mod_righePag.ascx.cs

@@ -6,80 +6,17 @@ namespace NKC_WF.WebUserControls
 {
     public partial class mod_righePag : BaseUserControl
     {
+        #region Public Events
+
         /// <summary>
         /// indicato (nuovo) numero righe x pagina
         /// </summary>
         public event EventHandler eh_newNum;
-        /// <summary>
-        /// caricamento pagina
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            if (!Page.IsPostBack)
-            {
-                numRowReq = numRowPag;
-            }
-        }
-        /// <summary>
-        /// stringa UID univoca
-        /// </summary>
-        public string uid
-        {
-            get
-            {
-                return this.UniqueID.Replace("$", "_").Replace("-", "_");
-            }
-        }
-        /// <summary>
-        /// effettua traduzione del lemma
-        /// </summary>
-        /// <param name="lemma"></param>
-        /// <returns></returns>
-        public string traduci(string lemma)
-        {
-            return user_std.UtSn.Traduci(lemma);
-        }
-        /// <summary>
-        /// aggiorno controllo paginazione...
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void txtNumRighe_TextChanged(object sender, EventArgs e)
-        {
-            // salvo num righe...
-            numRowPag = numRowReq;
-            // sollevo evento nuovo valore...
-            if (eh_newNum != null)
-            {
-                eh_newNum(this, new EventArgs());
-            }
-        }
-        /// <summary>
-        /// numero righe per pagina (in sessione)
-        /// </summary>
-        public int numRowPag
-        {
-            get
-            {
-                int answ = 10;
-                try
-                {
-                    answ = memLayer.ML.IntSessionObj(uid + "_numRowPag");
-                }
-                catch
-                {
-                    answ = 10;
-                }
-                return answ;
-            }
-            set
-            {
-                memLayer.ML.setSessionVal(uid + "_numRowPag", value);
-                numRowReq = value;
-            }
-        }
+
+        #endregion Public Events
+
+        #region Protected Properties
+
         /// <summary>
         /// numero righe gridview da mostrare legato a controllo textbox
         /// </summary>
@@ -106,5 +43,80 @@ namespace NKC_WF.WebUserControls
                 txtNumRighe.Text = value.ToString();
             }
         }
+
+        #endregion Protected Properties
+
+        #region Public Properties
+
+        /// <summary>
+        /// numero righe per pagina (in sessione)
+        /// </summary>
+        public int numRowPag
+        {
+            get
+            {
+                int answ = 10;
+                try
+                {
+                    answ = memLayer.ML.IntSessionObj(uid + "_numRowPag");
+                }
+                catch
+                {
+                    answ = 10;
+                }
+                return answ;
+            }
+            set
+            {
+                memLayer.ML.setSessionVal(uid + "_numRowPag", value);
+                numRowReq = value;
+            }
+        }
+
+        /// <summary>
+        /// stringa UID univoca
+        /// </summary>
+        public string uid
+        {
+            get
+            {
+                return this.UniqueID.Replace("$", "_").Replace("-", "_");
+            }
+        }
+
+        #endregion Public Properties
+
+        #region Protected Methods
+
+        /// <summary>
+        /// caricamento pagina
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!Page.IsPostBack)
+            {
+                numRowReq = numRowPag;
+            }
+        }
+
+        /// <summary>
+        /// aggiorno controllo paginazione...
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void txtNumRighe_TextChanged(object sender, EventArgs e)
+        {
+            // salvo num righe...
+            numRowPag = numRowReq;
+            // sollevo evento nuovo valore...
+            if (eh_newNum != null)
+            {
+                eh_newNum(this, new EventArgs());
+            }
+        }
+
+        #endregion Protected Methods
     }
 }

NKC_WF/packages.config

@@ -39,7 +39,7 @@
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="3.6.0" targetFramework="net462" />
   <package id="Microsoft.CodeQuality.Analyzers" version="3.3.2" targetFramework="net462" developmentDependency="true" />
   <package id="Microsoft.NetCore.Analyzers" version="3.3.2" targetFramework="net462" developmentDependency="true" />
-  <package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="net462" />
+  <package id="Microsoft.NETCore.Platforms" version="5.0.3" targetFramework="net462" />
   <package id="Microsoft.NetFramework.Analyzers" version="3.3.2" targetFramework="net462" developmentDependency="true" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
   <package id="Microsoft.Web.RedisSessionStateProvider" version="4.0.1" targetFramework="net462" />
@@ -48,19 +48,19 @@
   <package id="MongoDB.Bson" version="2.13.1" targetFramework="net462" />
   <package id="MongoDB.Driver" version="2.13.1" targetFramework="net462" />
   <package id="MongoDB.Driver.Core" version="2.13.1" targetFramework="net462" />
-  <package id="MongoDB.Libmongocrypt" version="1.2.2" targetFramework="net462" />
+  <package id="MongoDB.Libmongocrypt" version="1.2.3" targetFramework="net462" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
   <package id="NLog" version="4.7.11" targetFramework="net462" />
   <package id="PDFsharp" version="1.50.5147" targetFramework="net462" />
   <package id="Pipelines.Sockets.Unofficial" version="2.2.0" targetFramework="net462" />
   <package id="popper.js" version="1.16.1" targetFramework="net462" />
-  <package id="SharpCompress" version="0.28.3" targetFramework="net462" />
+  <package id="SharpCompress" version="0.29.0" targetFramework="net462" />
   <package id="SharpZipLib" version="1.3.2" targetFramework="net462" />
   <package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
   <package id="StackExchange.Redis" version="2.2.62" targetFramework="net462" />
-  <package id="SteamWare" version="5.1.2108.1912" targetFramework="net462" />
-  <package id="SteamWare.Logger" version="5.1.2108.1912" targetFramework="net462" />
+  <package id="SteamWare" version="5.1.2109.1713" targetFramework="net462" />
+  <package id="SteamWare.Logger" version="5.1.2109.1713" targetFramework="net462" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
   <package id="System.Diagnostics.PerformanceCounter" version="5.0.1" targetFramework="net462" />
   <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />

NKC_WF/site/DxfValidation.aspx

@@ -7,12 +7,19 @@
     <div class="container">
         <div class="card" style="width: 100%;">
             <div class="card-header">
-                <h3><%: traduci("DxfValidation") %></h3>
+                <div class="row">
+                    <div class="col-9">
+                        <h3><%: traduci("DxfValidation") %></h3>
+                    </div>
+                    <div class="col-3">
+                        <asp:LinkButton runat="server" ID="lbtInvalidPending" CssClass="btn btn-danger btn-block" OnClick="lbtInvalidPending_Click" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmInvalidatePending") %>'><%: traduci("InvalidatePending") %><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></asp:LinkButton>
+                    </div>
+                </div>
             </div>
             <div class="card-body">
                 <div class="row">
                     <div class="col-12">
-                        <uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" fileSuffix=".dxf" />
+                        <uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" fileSuffix=".dxf" checkRunning="true" checkBatchAppr="false" />
                     </div>
                 </div>
                 <div class="row">

NKC_WF/site/DxfValidation.aspx.cs

@@ -101,8 +101,19 @@ namespace NKC_WF.site
 
         #region Protected Methods
 
+        /// <summary>
+        /// Chiamata x rendere UNVALID ogni task pending
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtInvalidPending_Click(object sender, EventArgs e)
+        {
+            DLMan.taBL.invalidateRunning();
+        }
+
         protected void Page_Load(object sender, EventArgs e)
         {
+            lbtInvalidPending.DataBind();
             cmp_fileUpload.eh_FileUploaded += Cmp_fileUpload_eh_FileUploaded;
         }
 

NKC_WF/site/DxfValidation.aspx.designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace NKC_WF.site
@@ -15,29 +15,38 @@ namespace NKC_WF.site
     {
 
         /// <summary>
-        /// Controllo cmp_fileUpload.
+        /// lbtInvalidPending control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtInvalidPending;
+
+        /// <summary>
+        /// cmp_fileUpload control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserContols.cmp_fileUpload cmp_fileUpload;
 
         /// <summary>
-        /// Controllo divFileList.
+        /// divFileList control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divFileList;
 
         /// <summary>
-        /// Controllo cmp_batchList.
+        /// cmp_batchList control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserControls.cmp_batchList cmp_batchList;
     }

NKC_WF/site/KitRequestImporter.aspx

@@ -13,7 +13,7 @@
             <div class="card-body">
                 <div class="row">
                     <div class="col-12">
-                        <uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" forceRedirect="false" filePrefix="KIT" fileSuffix=".csv" />
+                        <uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" forceRedirect="false" filePrefix="KIT" fileSuffix=".csv" checkBatchAppr="false" checkRunning="false" />
                         <hr />
                     </div>
                     <div class="col-12">

NKC_WF/site/KitRequestImporter.aspx.designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace NKC_WF
@@ -15,65 +15,65 @@ namespace NKC_WF
     {
 
         /// <summary>
-        /// Controllo cmp_fileUpload.
+        /// cmp_fileUpload control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserContols.cmp_fileUpload cmp_fileUpload;
 
         /// <summary>
-        /// Controllo upnlCheck.
+        /// upnlCheck control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel upnlCheck;
 
         /// <summary>
-        /// Controllo cmp_kitImpCheck.
+        /// cmp_kitImpCheck control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserControls.cmp_kitImpCheck cmp_kitImpCheck;
 
         /// <summary>
-        /// Controllo divKitList.
+        /// divKitList control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divKitList;
 
         /// <summary>
-        /// Controllo upnlList.
+        /// upnlList control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel upnlList;
 
         /// <summary>
-        /// Controllo cmp_kitList.
+        /// cmp_kitList control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::NKC_WF.WebUserControls.cmp_kitList cmp_kitList;
 
         /// <summary>
-        /// Controllo Timer1.
+        /// Timer1 control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.Timer Timer1;
     }

NKC_WF/site/OrderManager.aspx

@@ -12,7 +12,7 @@
                         <h3><%: traduci("OrderManager") %></h3>
                     </div>
                     <div class="col-9">
-                        <uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" filePrefix="CNC" fileSuffix=".csv" />
+                        <uc1:cmp_fileUpload runat="server" ID="cmp_fileUpload" isWriteEnabled="true" filePrefix="CNC" fileSuffix=".csv" checkBatchAppr="true" checkRunning="false" />
                     </div>
                 </div>
             </div>

NKC_WF/site/OrderManager.aspx.cs

@@ -54,7 +54,7 @@ namespace NKC_WF
         {
             /*--------------------------------------------
              * Note validazione:
-             * - leggo cSV
+             * - leggo CSV
              * - carico su DB
              * - verifico (come ora x DXF) TUTTI i particolari
              * - cerco su tab ItemValidation
@@ -185,7 +185,6 @@ namespace NKC_WF
                 { }
             }
             Response.Redirect(Request.RawUrl);
-            //doUpdate();
         }
 
         /// <summary>

NKC_WF/site/UpdMan.aspx.cs

@@ -12,6 +12,17 @@ namespace NKC_WF.site
 {
     public partial class UpdMan : BasePage
     {
+        #region Protected Fields
+
+        /// <summary>
+        /// Controller versioni e download autenticato
+        /// </summary>
+        protected UpdateMan updManAuth = new UpdateMan("SWDownloader", "viaD@nte16");
+
+        #endregion Protected Fields
+
+        #region Protected Properties
+
         protected DS_App.UpdManDataTable _tabPackages { get; set; } = new DS_App.UpdManDataTable();
 
         protected DS_App.UpdManDataTable tabPackages
@@ -26,15 +37,53 @@ namespace NKC_WF.site
                 return tabella;
             }
         }
-        protected void Page_Load(object sender, EventArgs e)
+
+        #endregion Protected Properties
+
+        #region Private Methods
+
+        private int doDownload(string caller, DS_App.UpdManRow riga)
         {
-            DataLayer DLMan = new DataLayer();
-            if (!Page.IsPostBack)
+            int numDone = 0;
+            // modalità DB...
+            if (riga != null)
             {
-                ((SiteContent)this.Master).showSearch = false;
+                if (riga.IsAuth)
+                {
+                    updManAuth.downloadLatest(updateUrlAuth(riga.AppName), localDownloadPath(riga.LocalRepo), riga.PackName);
+                    numDone++;
+                }
+                else
+                {
+                    UpdateMan.obj.downloadLatest(updateUrl(riga.AppName), localDownloadPath(riga.LocalRepo), riga.PackName);
+                    numDone++;
+                }
             }
+            // modalità LEGACY...
+            else
+            {
+                if (caller == "ALL")
+                {
+                    // scarico TUTTI...
+                    numDone += updManAuth.downloadLatest(updateUrlAuth("NKC"), localDownloadPath("NKC"), "NKC");
+                    numDone += UpdateMan.obj.downloadLatest(updateUrl("ZCODE"), localDownloadPath("ZCODE"), "ZCODE");
+
+                    // versione IIS
+                    //numDone += UpdateMan.obj.downloadLatest(updateUrl("NKC"), localDownloadPath("NKC"), "NKC");
+                    //numDone += UpdateMan.obj.downloadLatest(updateUrl("ZCODE"), localDownloadPath("ZCODE"), "ZCODE");
+                }
+                else
+                {
+                    UpdateMan.obj.downloadLatest(updateUrl(caller), localDownloadPath(caller), caller);
+                    numDone++;
+                }
+            }
+            return numDone;
         }
 
+        #endregion Private Methods
+
+        #region Protected Methods
 
         /// <summary>
         /// Eseguo download pacchetti secondo richeista
@@ -82,7 +131,6 @@ namespace NKC_WF.site
                 }
                 else
                 {
-
                     var riga = tabPackages.FindByAppName(caller);
                     doDownload(caller, riga);
                     // calcolo elapsed time come TimeSpan value.
@@ -95,45 +143,63 @@ namespace NKC_WF.site
             lblOut.Text = resultsMsg;
         }
 
-        private int doDownload(string caller, DS_App.UpdManRow riga)
+        /// <summary>
+        /// Path locale dove scaricare gli installer
+        /// </summary>
+        protected string localDownloadPath(string package)
         {
-            int numDone = 0;
-            // modalità DB...
+            return string.Format(@"{0}{1}\{2}", memLayer.ML.CRS("downloadPath"), package, memLayer.ML.CRS("appVers"));
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            DataLayer DLMan = new DataLayer();
+            if (!Page.IsPostBack)
+            {
+                ((SiteContent)this.Master).showSearch = false;
+            }
+        }
+
+        /// <summary>
+        /// URL stringa di UPDATE...
+        /// </summary>
+        protected string updateUrl(string package)
+        {
+            string answ = "";
+            var riga = tabPackages.FindByAppName(package);
             if (riga != null)
             {
-                if (riga.IsAuth)
-                {
-                    updManAuth.downloadLatest(updateUrlAuth(riga.AppName), localDownloadPath(riga.LocalRepo), riga.PackName);
-                    numDone++;
-                }
-                else
-                {
-                    UpdateMan.obj.downloadLatest(updateUrl(riga.AppName), localDownloadPath(riga.LocalRepo), riga.PackName);
-                    numDone++;
-                }
+                answ = riga.ManifestUrl;
             }
-            // modalità LEGACY...
             else
             {
-                if (caller == "ALL")
-                {
-                    // scarico TUTTI...
-                    numDone += updManAuth.downloadLatest(updateUrlAuth("NKC"), localDownloadPath("NKC"), "NKC");
-                    numDone += UpdateMan.obj.downloadLatest(updateUrl("ZCODE"), localDownloadPath("ZCODE"), "ZCODE");
-
-                    // versione IIS
-                    //numDone += UpdateMan.obj.downloadLatest(updateUrl("NKC"), localDownloadPath("NKC"), "NKC");
-                    //numDone += UpdateMan.obj.downloadLatest(updateUrl("ZCODE"), localDownloadPath("ZCODE"), "ZCODE");
-                }
-                else
-                {
-                    UpdateMan.obj.downloadLatest(updateUrl(caller), localDownloadPath(caller), caller);
-                    numDone++;
-                }
+                answ = string.Format("http://seriate.steamware.net:8083/SWS/{0}/{1}/manifest.xml", package, memLayer.ML.CRS("appVers"));
             }
-            return numDone;
+            return answ;
         }
 
+        /// <summary>
+        /// URL stringa di UPDATE su area che richiede Auth (nexus.steamware.net)...
+        /// </summary>
+        protected string updateUrlAuth(string package)
+        {
+            string answ = "";
+            var riga = tabPackages.FindByAppName(package);
+            if (riga != null)
+            {
+                answ = riga.ManifestUrl;
+            }
+            else
+            {
+                answ = string.Format("https://nexus.steamware.net/repository/SWS/{0}/{1}/LAST/manifest.xml", package, memLayer.ML.CRS("appVers"));
+            }
+            return answ;
+        }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
         public string Version(object package, object authUrl)
         {
             UpdateInfoEventArgs updArgs = new UpdateInfoEventArgs();
@@ -160,51 +226,6 @@ namespace NKC_WF.site
             return answ;
         }
 
-        /// <summary>
-        /// Controller versioni e download autenticato
-        /// </summary>
-        protected UpdateMan updManAuth = new UpdateMan("SWDownloader", "viaD@nte16");
-
-        /// <summary>
-        /// URL stringa di UPDATE...
-        /// </summary>
-        protected string updateUrl(string package)
-        {
-            string answ = "";
-            var riga = tabPackages.FindByAppName(package);
-            if (riga != null)
-            {
-                answ = riga.ManifestUrl;
-            }
-            else
-            {
-                answ = string.Format("http://seriate.steamware.net:8083/SWS/{0}/{1}/manifest.xml", package, memLayer.ML.CRS("appVers"));
-            }
-            return answ;
-        }
-        /// <summary>
-        /// URL stringa di UPDATE su area che richiede Auth (nexus.steamware.net)...
-        /// </summary>
-        protected string updateUrlAuth(string package)
-        {
-            string answ = "";
-            var riga = tabPackages.FindByAppName(package);
-            if (riga != null)
-            {
-                answ = riga.ManifestUrl;
-            }
-            else
-            {
-                answ = string.Format("http://nexus.steamware.net/repository/SWS/{0}/{1}/LAST/{0}/{0}-.xml", package, memLayer.ML.CRS("appVers"));
-            }
-            return answ;
-        }
-        /// <summary>
-        /// Path locale dove scaricare gli installer
-        /// </summary>
-        protected string localDownloadPath(string package)
-        {
-            return string.Format(@"{0}{1}\{2}", memLayer.ML.CRS("downloadPath"), package, memLayer.ML.CRS("appVers"));
-        }
+        #endregion Public Methods
     }
 }

VersGen/ChangeLog.html

@@ -1,71 +1,70 @@
 <body>
-  <i>Sauder NKC solution</i>
-  <h4>Version: {{CURRENT-REL}}</h4>
-  <br />
-  Release Note:
-  <ul>
-      <li>
-          <b>Last Changes:</b>
-          <ul>{{LAST-CHANGES}}</ul>
-      </li>
-      <li>
-          <b>v.2.0.* &rarr;</b>
-          <ul>
-              <li>Multi machine setup (NE01/NE02)</li>
-          </ul>
-      </li>
-      <li>
-          <b>v.1.3.* &rarr;</b>
-          <ul>
-              <li>DXF Testing</li>
-          </ul>
-      </li>
-      <li>
-          <b>v.1.0.* &rarr;</b>
-          <ul>
-              <li>Production Ready</li>
-          </ul>
-      </li>
-      <li>
-          <b>v.11.* &rarr;</b>
-          <ul>
-              <li>AutoUpdate</li>
-          </ul>
-      </li>
-      <li>
-          <b>v.10.* &rarr;</b>
-          <ul>
-              <li>Completed cycle</li>
-              <li>Testing approved</li>
-          </ul>
-      </li>
-      <li>
-          <b>v.9.* &rarr;</b>
-          <ul>
-              <li>COmpleted cycle with KITTING station</li>
-          </ul>
-      </li>
-      <li>
-          <b>v.8.* &rarr;</b>
-          <ul>
-              <li>test release for production</li>
-              <li>Full active CNC cylte implemented</li>
-          </ul>
-      </li>
-      <li>
-          <b>v.7.* &rarr;</b>
-          <ul>
-              <li>Last internal only build</li>
-          </ul>
-      </li>
-  </ul>
-  <div>
-    <div style="float: left;">
-      <img src="logoSteamware.png" />
+    <i>Sauder NKC solution</i>
+    <h4>Version: {{CURRENT-REL}}</h4>
+    <br />
+    Release Note:
+    <ul>
+        <li>
+            <b>Last Changes:</b>
+            <ul>{{LAST-CHANGES}}</ul>
+        </li>
+        <li>
+            <b>v.2.0.* &rarr;</b>
+            <ul>
+                <li>Multi machine setup (NE01/NE02)</li>
+            </ul>
+        </li>
+        <li>
+            <b>v.1.3.* &rarr;</b>
+            <ul>
+                <li>DXF Testing</li>
+            </ul>
+        </li>
+        <li>
+            <b>v.1.0.* &rarr;</b>
+            <ul>
+                <li>Production Ready</li>
+            </ul>
+        </li>
+        <li>
+            <b>v.11.* &rarr;</b>
+            <ul>
+                <li>AutoUpdate</li>
+            </ul>
+        </li>
+        <li>
+            <b>v.10.* &rarr;</b>
+            <ul>
+                <li>Completed cycle</li>
+                <li>Testing approved</li>
+            </ul>
+        </li>
+        <li>
+            <b>v.9.* &rarr;</b>
+            <ul>
+                <li>COmpleted cycle with KITTING station</li>
+            </ul>
+        </li>
+        <li>
+            <b>v.8.* &rarr;</b>
+            <ul>
+                <li>test release for production</li>
+                <li>Full active CNC cylte implemented</li>
+            </ul>
+        </li>
+        <li>
+            <b>v.7.* &rarr;</b>
+            <ul>
+                <li>Last internal only build</li>
+            </ul>
+        </li>
+    </ul>
+    <div>
+        <div style="float: left;">
+            <img src="logoSteamware.png" />
+        </div>
+        <div style="float: right;">
+            <a href="https://www.steamware.net/IOT" target="_blank">&copy; Steamware - Egatletch 2019+</a>
+        </div>
     </div>
-    <div style="float: right;">
-      <a href="https://www.steamware.net/IOT" target="_blank">&copy; Steamware - Egatletch 2019+</a>
-    </div>
-  </div>
-
 </body>

VersGen/manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>{{VERS}}</version>
-  <url>http://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/ARCHIVE/{{PACKNAME}}/{{VERS}}/{{PACKNAME}}-{{VERS}}.zip</url>
-  <changelog>http://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/LAST/{{PACKNAME}}/{{PACKNAME}}-.html</changelog>
-  <mandatory>false</mandatory>
+    <version>{{VERS}}</version>
+    <url>https://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/ARCHIVE/{{PACKNAME}}/{{VERS}}/{{PACKNAME}}-{{VERS}}.zip</url>
+    <changelog>https://nexus.steamware.net/repository/SWS/NKC/{{BRANCHNAME}}/LAST/{{PACKNAME}}/{{PACKNAME}}-.html</changelog>
+    <mandatory>false</mandatory>
 </item>