Merge branch 'develop' into SDK

.gitignore

@@ -423,3 +423,4 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
+.ionide/symbolCache.db

.gitlab-ci.yml

@@ -23,7 +23,6 @@ variables:
 
 # helper creazione hash files x IIS
 .hashBuild: &hashBuild
-      # $Target = $env:APP_NAME + "\ReleaseClienti\MAPO_PROD\" + $env:NEW_REL + "\" + $env:APP_NAME + ".zip"
    - |
       $Target = $env:APP_NAME + "\Release\" + $env:APP_NAME + ".zip"
       $MD5 = Get-FileHash $Target -Algorithm MD5
@@ -156,7 +155,6 @@ IO:build:
  script:    
    - '& "$env:MSBUILD_PATH" MP-IO/MP-IO.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
    
-
 SITE:build:
  stage: build
  variables:
@@ -172,20 +170,20 @@ SITE:build:
  script:    
    - '& "$env:MSBUILD_PATH" MP-SITE/MP-SITE.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
 
-MON:build:
- stage: build
- variables:
-    CURR_PRJ: "MP-MON"
- tags:
-   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH != "SDK"'
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
-   - *version-fix
- script:    
-   - '& "$env:MSBUILD_PATH" MP-MON/MP-MON.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
+# MON:build:
+#  stage: build
+#  variables:
+#     CURR_PRJ: "MP-MON"
+#  tags:
+#    - win
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH != "SDK"'
+#  before_script:
+#    - *nuget-fix
+#    - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'
+#    - *version-fix
+#  script:    
+#    - '& "$env:MSBUILD_PATH" MP-MON/MP-MON.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
 
 TAB:build:
  stage: build
@@ -259,19 +257,19 @@ SITE:staging:
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
  needs: ["SITE:build"]
 
-MON:staging:
- stage: staging
- tags:
-   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "develop"'
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'  
-   - *version-fix
- script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
- needs: ["MON:build"]
+# MON:staging:
+#  stage: staging
+#  tags:
+#    - win
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH == "develop"'
+#  before_script:
+#    - *nuget-fix
+#    - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'  
+#    - *version-fix
+#  script: 
+#    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
+#  needs: ["MON:build"]
  
 TAB:staging:
  stage: staging
@@ -343,19 +341,19 @@ SITE:deploy:
    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
  needs: ["SITE:build"]
 
-MON:deploy:
- stage: deploy
- tags:
-   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "master"'
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'  
-   - *version-fix
- script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
- needs: ["MON:build"]
+# MON:deploy:
+#  stage: deploy
+#  tags:
+#    - win
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH == "master"'
+#  before_script:
+#    - *nuget-fix
+#    - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'  
+#    - *version-fix
+#  script: 
+#    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
+#  needs: ["MON:build"]
  
 TAB:deploy:
  stage: deploy
@@ -448,27 +446,26 @@ SITE:install:
    - *nexusUpload
  needs: ["SITE:build"]
 
-
-MON:install:
- stage: installer
- tags:
-   - win
- rules:
-   - if: '$CI_COMMIT_BRANCH == "master"'
-     when: manual
-   - if: '$CI_COMMIT_BRANCH == "develop"'
- variables:
-  APP_NAME: MP-MON
-  NEXUS_PATH: MP-MON
- before_script:
-   - *nuget-fix
-   - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'  
-   - *version-fix
- script: 
-   -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/MON" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
-   - *hashBuild
-   - *nexusUpload
- needs: ["MON:build"]
+# MON:install:
+#  stage: installer
+#  tags:
+#    - win
+#  rules:
+#    - if: '$CI_COMMIT_BRANCH == "master"'
+#      when: manual
+#    - if: '$CI_COMMIT_BRANCH == "develop"'
+#  variables:
+#   APP_NAME: MP-MON
+#   NEXUS_PATH: MP-MON
+#  before_script:
+#    - *nuget-fix
+#    - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet'  
+#    - *version-fix
+#  script: 
+#    -  '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/MON" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
+#    - *hashBuild
+#    - *nexusUpload
+#  needs: ["MON:build"]
 
 TAB:install:
  stage: installer
@@ -511,4 +508,3 @@ MAG:install:
    - *hashBuild
    - *nexusUpload
  needs: ["MAG:build"]
-

MAPO.sln

@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapoDb", "MapoDb\MapoDb.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-IO", "MP-IO\MP-IO.csproj", "{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-MON", "MP-MON\MP-MON.csproj", "{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-TAB", "MP-TAB\MP-TAB.csproj", "{51F720FE-7BED-4275-93B1-CDA9A9B53670}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8688B7C8-87E9-4FCE-B607-9C3F963CD6B7}"
@@ -54,12 +52,6 @@ Global
 		{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Prod|Any CPU.Build.0 = Prod|Any CPU
 		{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
-		{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Prod|Any CPU.Build.0 = Prod|Any CPU
-		{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.Build.0 = Release|Any CPU
 		{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Prod|Any CPU.ActiveCfg = Prod|Any CPU

MP-ADM/WebUserControls/cmp_PODL_OUT.ascx.cs

@@ -395,10 +395,7 @@ namespace MP_ADM.WebUserControls
             enableChgPrio = ((priorita + delta) >= LPI && (priorita + delta) <= LPS);
 
             bool singleMachine = !string.IsNullOrEmpty(IdxMacchinaFilt) && IdxMacchinaFilt == IdxMacchina;
-#if false
-            bool onlyProgrammed = chkUnassigned.Checked;
-            return enableChgPrio && onlyProgrammed && singleMachine;
-#endif
+
             return enableChgPrio && singleMachine;
         }
 

MP-ADM/WebUserControls/cmp_planStats.ascx

@@ -29,10 +29,7 @@
                             <ItemTemplate>
                                 <div class="d-flex justify-content-between">
                                     <div class="py-0 px-2 border-right border-light">
-                                        <asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-info" ToolTip="Caricamento dati da ERP" OnClick="lbtForceReload_Click">
-                                            <i class="fa fa-refresh"></i>
-                                        FORCE RELOAD
-                                        </asp:LinkButton>
+                                        <asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-info" ToolTip="Caricamento dati da ERP" OnClick="lbtForceReload_Click"><i class="fa fa-refresh"></i> FORCE RELOAD</asp:LinkButton>
                                     </div>
                                     <div class="py-0 px-2 border-right border-light">
                                         <div class="d-flex justify-content-between">

MP-ADM/WebUserControls/cmp_planStats.ascx.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 MP_ADM.WebUserControls
@@ -15,137 +15,137 @@ namespace MP_ADM.WebUserControls
     {
 
         /// <summary>
-        /// Controllo updProgImport.
+        /// updProgImport 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.UpdateProgress updProgImport;
 
         /// <summary>
-        /// Controllo frmView.
+        /// frmView 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.FormView frmView;
 
         /// <summary>
-        /// Controllo ods.
+        /// ods 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.ObjectDataSource ods;
 
         /// <summary>
-        /// Controllo ddlTipoStat.
+        /// ddlTipoStat 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.DropDownList ddlTipoStat;
 
         /// <summary>
-        /// Controllo lbtToggle.
+        /// lbtToggle 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 lbtToggle;
 
         /// <summary>
-        /// Controllo tgIcon.
+        /// tgIcon 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 tgIcon;
 
         /// <summary>
-        /// Controllo divDetail.
+        /// divDetail 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 divDetail;
 
         /// <summary>
-        /// Controllo cmp_planStats_Fasi.
+        /// cmp_planStats_Fasi 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::MP_ADM.WebUserControls.cmp_planStats_Fasi cmp_planStats_Fasi;
 
         /// <summary>
-        /// Controllo cmp_planStats_Mac.
+        /// cmp_planStats_Mac 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::MP_ADM.WebUserControls.cmp_planStats_Mac cmp_planStats_Mac;
 
         /// <summary>
-        /// Controllo cmp_planStats_Cli.
+        /// cmp_planStats_Cli 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::MP_ADM.WebUserControls.cmp_planStats_Cli cmp_planStats_Cli;
 
         /// <summary>
-        /// Controllo cmp_planStats_Art.
+        /// cmp_planStats_Art 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::MP_ADM.WebUserControls.cmp_planStats_Art cmp_planStats_Art;
 
         /// <summary>
-        /// Controllo hfIdxMacc.
+        /// hfIdxMacc 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.HiddenField hfIdxMacc;
 
         /// <summary>
-        /// Controllo hfCodGrp.
+        /// hfCodGrp 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.HiddenField hfCodGrp;
 
         /// <summary>
-        /// Controllo hfCodArt.
+        /// hfCodArt 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.HiddenField hfCodArt;
 
         /// <summary>
-        /// Controllo hfCodCli.
+        /// hfCodCli 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.HiddenField hfCodCli;
     }

MP-ADM/WebUserControls/cmp_righePag.ascx.cs

@@ -77,17 +77,6 @@ namespace MP_ADM.WebUserControls
             }
         }
 
-        /// <summary>
-        /// stringa UID univoca
-        /// </summary>
-        public string uid
-        {
-            get
-            {
-                return this.UniqueID.Replace("$", "_").Replace("-", "_");
-            }
-        }
-
         #endregion Public Properties
 
         #region Protected Methods

MP-MAG/BaseUserControl.cs

@@ -439,18 +439,25 @@ namespace MP_MAG
             bool answ = false;
             try
             {
-#if false
-                currProdData = getProdDataDb;
-#endif
                 // rileggo
                 prodPrintData newProdPrintData = MagDataLayerObj.currProdPrintData;
+                DateTime dtRif = DateTime.Now;
                 // calcolo
                 var tabOdl = DataLayerObj.taODL.getByIdx(newProdPrintData.IdxOdl, false);
+                // se ODL chiuso --> uso data chiusura x indicare data controllo
                 if (tabOdl.Rows.Count > 0)
                 {
                     newProdPrintData.QtaOdl = tabOdl[0].NumPezzi;
+                    if (!tabOdl[0].IsDataFineNull())
+                    {
+                        dtRif = tabOdl[0].DataFine;
+                    }
                 }
-                var tabDatiProdAct = DataLayerObj.taStatoProd.GetData(newProdPrintData.IdxMacchina, DateTime.Now);
+
+                //2022.03.31 modifica stored lettura
+                var tabDatiProdAct = DataLayerObj.taStatoProd.getByMacchinaData(newProdPrintData.IdxMacchina, dtRif);
+                //var tabDatiProdAct = DataLayerObj.taStatoProd.GetData(newProdPrintData.IdxMacchina, dtRif);
+
                 if (tabDatiProdAct.Rows.Count > 0)
                 {
                     newProdPrintData.QtaConf = tabDatiProdAct[0].PzConfBuoni;
@@ -476,52 +483,5 @@ namespace MP_MAG
 
         #endregion Public Methods
 
-#if false
-    protected Dictionary<int, string> anagMateriali
-    {
-      set
-      {
-        string jsonData = JsonConvert.SerializeObject(value);
-        memLayer.ML.setRSV("anagMateriali", jsonData, 60);
-      }
-      get
-      {
-        Dictionary<int, string> answ = new Dictionary<int, string>();
-        //cerco in redis...
-        string rawData = memLayer.ML.getRSV("anagMateriali");
-        if (!string.IsNullOrEmpty(rawData))
-        {
-          answ = JsonConvert.DeserializeObject<Dictionary<int, string>>(rawData);
-        }
-        // sennò nel DB e salvo in redis...
-        else
-        {
-          var tabMat = DataLayer.man.taMat.GetData();
-          foreach (var item in tabMat)
-          {
-            answ.Add(item.MatID, item.MatDesc);
-          }
-          // salvo in redis
-          anagMateriali = answ;
-        }
-        // restituisco
-        return answ;
-      }
-    }
-
-    public string matByKey(object _matId)
-    {
-      string answ = "";
-      int matId = 0;
-      int.TryParse(_matId.ToString(), out matId);
-      try
-      {
-        answ = anagMateriali[matId];
-      }
-      catch
-      { }
-      return answ;
-    }
-#endif
     }
 }

MP-MAG/Content/Site.css

@@ -37,6 +37,23 @@ body {
     width: 100%;
   }
 }
+.GridPager a,
+.GridPager span {
+  display: block;
+  height: 1.5em;
+  min-width: 1.5em;
+  text-align: center;
+  text-decoration: none;
+}
+.GridPager a {
+  background-color: #f5f5f5;
+  color: #969696;
+}
+.GridPager span {
+  background-color: #A1DCF2;
+  color: #000;
+  font-weight: bold;
+}
 .border-thick {
   border-width: 3px !important;
 }
@@ -135,7 +152,8 @@ body {
   text-align: center;
 }
 .shortcuts .shortcut {
-  min-width: 12rem;
+  color: black;
+  min-width: 10.5rem;
   min-height: 6rem;
   display: inline-block;
   padding: 1rem 0;
@@ -154,6 +172,7 @@ body {
   border-radius: 0.75rem;
 }
 .shortcuts .shortcut-sm {
+  color: black;
   min-width: 6.75rem;
   min-height: 4.5rem;
   display: inline-block;
@@ -187,22 +206,24 @@ body {
   color: #333;
 }
 .shortcuts .shortcut:hover {
-  background: #E8E8E8;
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
-  background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
-  background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
-  background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
+  color: #FFFFFF;
+  background: #696969;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#696969));
+  background-image: -webkit-linear-gradient(top, #fafafa, 0%, #696969, 100%);
+  background-image: -moz-linear-gradient(top, #fafafa 0%, #696969 100%);
+  background-image: linear-gradient(to bottom, #fafafa 0%, #696969 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ff696969', GradientType=0);
 }
 .shortcuts .shortcut-sm:hover {
-  background: #E8E8E8;
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
-  background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
-  background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
-  background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
+  color: #FFFFFF;
+  background: #696969;
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#696969));
+  background-image: -webkit-linear-gradient(top, #fafafa, 0%, #696969, 100%);
+  background-image: -moz-linear-gradient(top, #fafafa 0%, #696969 100%);
+  background-image: linear-gradient(to bottom, #fafafa 0%, #696969 100%);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ff696969', GradientType=0);
 }
 .shortcuts .shortcut:active {
   box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
@@ -220,5 +241,4 @@ body {
   display: block;
   margin-top: 0.75em;
   font-weight: 400;
-  color: #666;
 }

MP-MAG/Content/Site.less

@@ -45,6 +45,26 @@ body {
     }
 }
 
+.GridPager a,
+.GridPager span {
+    display: block;
+    height: 1.5em;
+    min-width: 1.5em;
+    text-align: center;
+    text-decoration: none;
+}
+
+.GridPager a {
+    background-color: #f5f5f5;
+    color: #969696;
+}
+
+.GridPager span {
+    background-color: #A1DCF2;
+    color: #000;
+    font-weight: bold;
+}
+
 @borderThick: 3px;
 
 .border-thick {
@@ -170,10 +190,11 @@ body {
 }
 
 .shortcuts .shortcut {
-    min-width: @blSCut * 8;
-    min-height: @blSCut * 4;
+    color: black;
+    min-width: (@blSCut * 7);
+    min-height: (@blSCut * 4);
     display: inline-block;
-    padding: @blSCut*2/3 0;
+    padding: (@blSCut * 2 / 3) 0;
     margin: 0 2px 1em;
     vertical-align: top;
     text-decoration: none;
@@ -186,14 +207,15 @@ body {
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
     border: 1px solid #ddd;
     box-sizing: border-box;
-    border-radius: @blSCut/2;
+    border-radius: (@blSCut / 2);
 }
 
 .shortcuts .shortcut-sm {
-    min-width: @blSCut * 4.5;
-    min-height: @blSCut * 3;
+    color: black;
+    min-width: (@blSCut * 4.5);
+    min-height: (@blSCut * 3);
     display: inline-block;
-    padding: @blSCut/4 0;
+    padding: (@blSCut / 4) 0;
     margin: 0 2px 1em;
     vertical-align: top;
     text-decoration: none;
@@ -206,14 +228,14 @@ body {
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
     border: 1px solid #ddd;
     box-sizing: border-box;
-    border-radius: @blSCut/2;
+    border-radius: (@blSCut/2);
 }
 
 .shortcuts .shortcut .shortcut-icon {
     width: 100%;
     margin-top: 0;
     margin-bottom: 0;
-    font-size: @blSCut*2;
+    font-size: (@blSCut*2);
     color: #333;
 }
 
@@ -221,28 +243,30 @@ body {
     width: 100%;
     margin-top: 0;
     margin-bottom: 0;
-    font-size: @blSCut*2;
+    font-size: (@blSCut*2);
     color: #333;
 }
 
 .shortcuts .shortcut:hover {
-    background: #E8E8E8;
-    background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
-    background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
-    background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
-    background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
+    color: #FFFFFF;
+    background: #696969;
+    background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#696969));
+    background-image: -webkit-linear-gradient(top, #fafafa, 0%, #696969, 100%);
+    background-image: -moz-linear-gradient(top, #fafafa 0%, #696969 100%);
+    background-image: linear-gradient(to bottom, #fafafa 0%, #696969 100%);
     background-repeat: repeat-x;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ff696969', GradientType=0);
 }
 
 .shortcuts .shortcut-sm:hover {
-    background: #E8E8E8;
-    background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
-    background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
-    background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
-    background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
+    color: #FFFFFF;
+    background: #696969;
+    background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#696969));
+    background-image: -webkit-linear-gradient(top, #fafafa, 0%, #696969, 100%);
+    background-image: -moz-linear-gradient(top, #fafafa 0%, #696969 100%);
+    background-image: linear-gradient(to bottom, #fafafa 0%, #696969 100%);
     background-repeat: repeat-x;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ff696969', GradientType=0);
 }
 
 .shortcuts .shortcut:active {
@@ -265,5 +289,4 @@ body {
     display: block;
     margin-top: .75em;
     font-weight: 400;
-    color: #666;
-}
+}

MP-MAG/Content/Site.min.css

@@ -1 +1 @@
-body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:12rem;min-height:6rem;display:inline-block;padding:1rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.75rem;}.shortcuts .shortcut-sm{min-width:6.75rem;min-height:4.5rem;display:inline-block;padding:.375rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.75rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}
+body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.5em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{color:#000;min-width:10.5rem;min-height:6rem;display:inline-block;padding:1rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.75rem;}.shortcuts .shortcut-sm{color:#000;min-width:6.75rem;min-height:4.5rem;display:inline-block;padding:.375rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.75rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',GradientType=0);}.shortcuts .shortcut-sm:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;}

MP-MAG/Controllers/HomeController.cs

@@ -17,14 +17,5 @@ namespace MP_MAG.Controllers
         }
 
         #endregion Public Methods
-
-#if false
-        public ActionResult Index()
-        {
-            ViewBag.Title = "Home Page";
-
-            return View();
-        }
-#endif
     }
 }

MP-MAG/MP-MAG.csproj

@@ -329,6 +329,13 @@
     <Compile Include="Site.Master.designer.cs">
       <DependentUpon>Site.Master</DependentUpon>
     </Compile>
+    <Compile Include="SMART\AnagCliFor.aspx.cs">
+      <DependentUpon>AnagCliFor.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="SMART\AnagCliFor.aspx.designer.cs">
+      <DependentUpon>AnagCliFor.aspx</DependentUpon>
+    </Compile>
     <Compile Include="SMART\Default.aspx.cs">
       <DependentUpon>Default.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -336,6 +343,13 @@
     <Compile Include="SMART\Default.aspx.designer.cs">
       <DependentUpon>Default.aspx</DependentUpon>
     </Compile>
+    <Compile Include="SMART\DiBa.aspx.cs">
+      <DependentUpon>DiBa.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="SMART\DiBa.aspx.designer.cs">
+      <DependentUpon>DiBa.aspx</DependentUpon>
+    </Compile>
     <Compile Include="SMART\EnrollDevice.aspx.cs">
       <DependentUpon>EnrollDevice.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -413,6 +427,13 @@
     <Compile Include="WebUserControls\cmp_activeParams.ascx.designer.cs">
       <DependentUpon>cmp_activeParams.ascx</DependentUpon>
     </Compile>
+    <Compile Include="WebUserControls\cmp_AnagCliFor.ascx.cs">
+      <DependentUpon>cmp_AnagCliFor.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_AnagCliFor.ascx.designer.cs">
+      <DependentUpon>cmp_AnagCliFor.ascx</DependentUpon>
+    </Compile>
     <Compile Include="WebUserControls\cmp_barcode.ascx.cs">
       <DependentUpon>cmp_barcode.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -469,6 +490,13 @@
     <Compile Include="WebUserControls\cmp_currODL.ascx.designer.cs">
       <DependentUpon>cmp_currODL.ascx</DependentUpon>
     </Compile>
+    <Compile Include="WebUserControls\cmp_destClienti.ascx.cs">
+      <DependentUpon>cmp_destClienti.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\cmp_destClienti.ascx.designer.cs">
+      <DependentUpon>cmp_destClienti.ascx</DependentUpon>
+    </Compile>
     <Compile Include="WebUserControls\cmp_dettLotti.ascx.cs">
       <DependentUpon>cmp_dettLotti.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -890,7 +918,9 @@
     <Content Include="Reports\queueConf.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="SMART\AnagCliFor.aspx" />
     <Content Include="SMART\Default.aspx" />
+    <Content Include="SMART\DiBa.aspx" />
     <Content Include="SMART\EnrollDevice.aspx" />
     <Content Include="SMART\jumper.aspx" />
     <Content Include="SMART\login.aspx" />
@@ -905,6 +935,7 @@
     <Content Include="webfonts\fa-regular-400.svg" />
     <Content Include="webfonts\fa-solid-900.svg" />
     <Content Include="WebUserControls\cmp_activeParams.ascx" />
+    <Content Include="WebUserControls\cmp_AnagCliFor.ascx" />
     <Content Include="WebUserControls\cmp_barcode.ascx" />
     <Content Include="SMART\elencoLotti.aspx" />
     <Content Include="SMART\prtFiniti.aspx" />
@@ -912,6 +943,7 @@
     <Content Include="SMART\prtSemilav.aspx" />
     <Content Include="WebUserControls\cmp_creaLottoOUT.ascx" />
     <Content Include="WebUserControls\cmp_currODL.ascx" />
+    <Content Include="WebUserControls\cmp_destClienti.ascx" />
     <Content Include="WebUserControls\cmp_dettLotti.ascx" />
     <Content Include="WebUserControls\cmp_elencoLotti.ascx" />
     <Content Include="WebUserControls\cmp_elencoPedane.ascx" />

MP-MAG/SMART/AnagCliFor.aspx

@@ -0,0 +1,11 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="AnagCliFor.aspx.cs" Inherits="MP_MAG.SMART.AnagCliFor" %>
+
+<%@ Register Src="~/WebUserControls/cmp_AnagCliFor.ascx" TagPrefix="uc1" TagName="cmp_AnagCliFor" %>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
+    <div class="row m-0">
+        <div class="col-12">
+            <uc1:cmp_AnagCliFor runat="server" id="cmp_AnagCliFor" />
+        </div>
+    </div>
+</asp:Content>

MP-MAG/SMART/AnagCliFor.aspx.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace MP_MAG.SMART
+{
+    public partial class AnagCliFor : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

MP-MAG/SMART/AnagCliFor.aspx.designer.cs

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MP_MAG.SMART
+{
+
+
+    public partial class AnagCliFor
+    {
+
+        /// <summary>
+        /// cmp_AnagCliFor control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MP_MAG.WebUserControls.cmp_AnagCliFor cmp_AnagCliFor;
+    }
+}

MP-MAG/SMART/DiBa.aspx

@@ -0,0 +1,3 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="DiBa.aspx.cs" Inherits="MP_MAG.SMART.DiBa" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
+</asp:Content>

MP-MAG/SMART/DiBa.aspx.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace MP_MAG.SMART
+{
+    public partial class DiBa : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

MP-MAG/SMART/DiBa.aspx.designer.cs

@@ -0,0 +1,17 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MP_MAG.SMART
+{
+
+
+    public partial class DiBa
+    {
+    }
+}

MP-MAG/SMART/menu.aspx

@@ -2,9 +2,9 @@
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
     <div class="container">
-        <div class="jumbotron">
+        <div class="alert alert-secondary p-5">
             <h2>Modulo Magazzino</h2>
-            <i>Gestione Lotti e stampa etichette UDC prodotti</i>
+            <i>Gestione Lotti, stampa etichette UDC prodotti, Anagrafiche Logistiche</i>
         </div>
 
         <div class="shortcuts">
@@ -14,6 +14,10 @@
                         <i class="fa-2x text-dark fas fa-mobile-alt"></i>
                         <span class="shortcut-label">SMART START</span>
                     </a>
+                    <a href="AnagCliFor" class="shortcut">
+                        <i class="fa-2x text-dark fas fa-book"></i>
+                        <span class="shortcut-label">Anag. CLi/Forn</span>
+                    </a>
                     <a href="elencoLotti" class="shortcut">
                         <i class="fa-2x text-dark fas fa-list"></i>
                         <span class="shortcut-label">RICERCA LOTTI</span>

MP-MAG/SMART/printCartOdl.aspx.cs

@@ -18,6 +18,10 @@ namespace MP_MAG.SMART
             // di conseguenza mostro stampa oppure selezione ODL...
             divOdl.Visible = missingOdl;
             divPrint.Visible = !missingOdl;
+            if (divPrint.Visible)
+            {
+                cmp_currODL.forceReload();
+            }
         }
 
         private void Cmp_printODL_eh_addNew(object sender, EventArgs e)

MP-MAG/WebUserControls/cmp_AnagCliFor.ascx

@@ -0,0 +1,165 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_AnagCliFor.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_AnagCliFor" %>
+<%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %>
+<%@ Register Src="~/WebUserControls/cmp_destClienti.ascx" TagPrefix="uc1" TagName="cmp_destClienti" %>
+
+
+<div class="card">
+    <div class="card-header">
+        <div class="d-flex flex-row-reverse">
+            <div class="px-2">
+                <asp:CheckBox runat="server" ID="chkShowCli" Text="Clienti" Checked="true" AutoPostBack="true" />
+            </div>
+            <div class="px-2">
+                <asp:CheckBox runat="server" ID="chkShoFor" Text="Fornitori" Checked="true" AutoPostBack="true" />
+            </div>
+            <div class="px-2 flex-fill">
+                <h3>Anagrafica Clienti / Fornitori</h3>
+            </div>
+        </div>
+    </div>
+    <div class="card-body">
+        <div class="row">
+            <div runat="server" id="divMain" class="col-12">
+                <asp:HiddenField runat="server" ID="hfShowDet" />
+                <asp:GridView runat="server" ID="grView" AutoGenerateColumns="False" DataKeyNames="CodCliente" DataSourceID="ods" CssClass="table table-sm table-striped small" AllowPaging="True" OnRowDeleted="grView_RowDeleted" OnRowEditing="grView_RowEditing" OnPageIndexChanged="grView_PageIndexChanged" OnSelectedIndexChanged="grView_SelectedIndexChanged">
+                    <HeaderStyle CssClass="default" />
+                    <PagerStyle CssClass="active GridPager" />
+                    <PagerSettings Mode="NumericFirstLast" />
+                    <SelectedRowStyle CssClass="table-info" />
+                    <Columns>
+                        <asp:TemplateField ShowHeader="False">
+                            <HeaderTemplate>
+                                <asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-primary btn-sm" Visible="true" ToolTip="Reset"><i class="fas fa-sync-alt"></i></asp:LinkButton>
+                            </HeaderTemplate>
+                            <EditItemTemplate>
+                                <div class="text-nowrap">
+                                    <asp:LinkButton ID="lbtUpdate1" runat="server" CausesValidation="True" CommandName="Update" Text="Update" CssClass="btn btn-sm btn-success"><i class="fas fa-check-circle"></i></asp:LinkButton>
+                                    &nbsp;<asp:LinkButton ID="lbtCancel1" runat="server" CausesValidation="False" CommandName="Cancel" Text="Cancel" CssClass="btn btn-sm btn-warning"><i class="fas fa-ban"></i></asp:LinkButton>
+                                </div>
+                            </EditItemTemplate>
+                            <ItemTemplate>
+                                <div class="text-nowrap">
+                                    <asp:LinkButton ID="lbtSel" runat="server" CausesValidation="False" CommandName="Select" Text="Select" CssClass="btn btn-sm btn-info"><i class="fa fa-search"></i></asp:LinkButton>
+                                    &nbsp;<asp:LinkButton ID="lbtEdit" runat="server" CausesValidation="False" CommandName="Edit" Text="Edit" CssClass="btn btn-sm btn-primary"><i class="fa fa-edit"></i></asp:LinkButton>
+                                </div>
+                            </ItemTemplate>
+                        </asp:TemplateField>
+                        <asp:TemplateField HeaderText="Cod" SortExpression="CodCliente">
+                            <EditItemTemplate>
+                                <asp:TextBox ID="TextBox7" runat="server" Text='<%# Bind("CodCliente") %>' Width="10em" />
+                            </EditItemTemplate>
+                            <ItemTemplate>
+                                <asp:Label ID="Label7" runat="server" Text='<%# Eval("CodCliente") %>' />
+                            </ItemTemplate>
+                        </asp:TemplateField>
+                        <asp:TemplateField HeaderText="Rag Sociale" SortExpression="RagSociale">
+                            <EditItemTemplate>
+                                <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("RagSociale") %>' Width="20em" />
+                            </EditItemTemplate>
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# Eval("RagSociale") %>' />
+                            </ItemTemplate>
+                        </asp:TemplateField>
+                        <asp:TemplateField HeaderText="Indirizzo" SortExpression="Indirizzo">
+                            <EditItemTemplate>
+                                <asp:TextBox ID="txtIndirizzo" runat="server" Text='<%# Bind("Indirizzo") %>' Width="10em" />
+                            </EditItemTemplate>
+                            <ItemTemplate>
+                                <asp:Label ID="lblIndirizzo" runat="server" Text='<%# Eval("Indirizzo") %>' />
+                            </ItemTemplate>
+                        </asp:TemplateField>
+                        <asp:TemplateField HeaderText="Localita" SortExpression="Localita">
+                            <EditItemTemplate>
+                                <asp:TextBox ID="txtLocalita" runat="server" Text='<%# Bind("Localita") %>' Width="10em" />
+                            </EditItemTemplate>
+                            <ItemTemplate>
+                                <asp:Label ID="lblLocalita" runat="server" Text='<%# Eval("Localita") %>' />
+                            </ItemTemplate>
+                        </asp:TemplateField>
+                        <asp:TemplateField HeaderText="Cap" SortExpression="Cap">
+                            <EditItemTemplate>
+                                <asp:TextBox ID="txtCap" runat="server" Text='<%# Bind("Cap") %>' Width="5em" />
+                            </EditItemTemplate>
+                            <ItemTemplate>
+                                <asp:Label ID="lblCap" runat="server" Text='<%# Eval("Cap") %>' />
+                            </ItemTemplate>
+                        </asp:TemplateField>
+                        <asp:TemplateField HeaderText="Provincia" SortExpression="Provincia">
+                            <EditItemTemplate>
+                                <asp:TextBox ID="txtProvincia" runat="server" Text='<%# Bind("Provincia") %>' Width="4em" />
+                            </EditItemTemplate>
+                            <ItemTemplate>
+                                <asp:Label ID="lblProvincia" runat="server" Text='<%# Eval("Provincia") %>' />
+                            </ItemTemplate>
+                        </asp:TemplateField>
+                        <asp:TemplateField HeaderText="Nazione" SortExpression="Nazione">
+                            <EditItemTemplate>
+                                <asp:TextBox ID="txtNazione" runat="server" Text='<%# Bind("Nazione") %>' Width="2em" />
+                            </EditItemTemplate>
+                            <ItemTemplate>
+                                <asp:Label ID="lblNazione" runat="server" Text='<%# Eval("Nazione") %>' />
+                            </ItemTemplate>
+                        </asp:TemplateField>
+                        <asp:CheckBoxField DataField="IsCli" HeaderText="Cli" SortExpression="IsCli" />
+                        <asp:CheckBoxField DataField="IsFor" HeaderText="For" SortExpression="IsFor" />
+                        <asp:TemplateField ShowHeader="False">
+                            <HeaderTemplate>
+                                <asp:LinkButton ID="lbtAddNew" runat="server" OnClick="lbtAddNew_Click" CssClass="btn btn-success btn-sm" Visible="true" ToolTip="Add New" OnClientClick="return  confirm('Sicuro di voler inserire un nuovo record?');"><i class="fas fa-plus"></i></asp:LinkButton>
+                            </HeaderTemplate>
+                            <EditItemTemplate>
+                                <div class="text-nowrap">
+                                    <asp:LinkButton ID="lbtUpdate2" runat="server" CausesValidation="True" CommandName="Update" Text="Update" CssClass="btn btn-sm btn-success"><i class="fas fa-check-circle"></i></asp:LinkButton>
+                                    &nbsp;<asp:LinkButton ID="lbtCancel2" runat="server" CausesValidation="False" CommandName="Cancel" Text="Cancel" CssClass="btn btn-sm btn-warning"><i class="fas fa-ban"></i></asp:LinkButton>
+                                </div>
+                            </EditItemTemplate>
+                            <ItemTemplate>
+                                <asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" Text="Delete" OnClientClick="return  confirm('Sicuro di voler procedere con eliminazione?');" CssClass="btn btn-sm btn-danger"><i class="fas fa-trash"></i></asp:LinkButton>
+                            </ItemTemplate>
+                        </asp:TemplateField>
+                    </Columns>
+                </asp:GridView>
+                <asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="Original_{0}" SelectMethod="getBySearch" TypeName="MagData.DS_MagTableAdapters.AnagClientiTableAdapter" DeleteMethod="deleteQuery" InsertMethod="insertQuery" UpdateMethod="updateQuery">
+                    <DeleteParameters>
+                        <asp:Parameter Name="Original_CodCliente" Type="String" />
+                    </DeleteParameters>
+                    <InsertParameters>
+                        <asp:Parameter Name="CodCliente" Type="String" />
+                        <asp:Parameter Name="RagSociale" Type="String" />
+                        <asp:Parameter Name="Indirizzo" Type="String" />
+                        <asp:Parameter Name="Localita" Type="String" />
+                        <asp:Parameter Name="Cap" Type="String" />
+                        <asp:Parameter Name="Provincia" Type="String" />
+                        <asp:Parameter Name="Nazione" Type="String" />
+                        <asp:Parameter Name="IsCli" Type="Boolean" />
+                        <asp:Parameter Name="IsFor" Type="Boolean" />
+                    </InsertParameters>
+                    <SelectParameters>
+                        <asp:SessionParameter DefaultValue="" Name="searchVal" SessionField="valoreSearch" Type="String" />
+                        <asp:ControlParameter ControlID="chkShowCli" DefaultValue="true" Name="showCli" PropertyName="Checked" Type="Boolean" />
+                        <asp:ControlParameter ControlID="chkShoFor" DefaultValue="true" Name="showFor" PropertyName="Checked" Type="Boolean" />
+                    </SelectParameters>
+                    <UpdateParameters>
+                        <asp:Parameter Name="CodCliente" Type="String" />
+                        <asp:Parameter Name="RagSociale" Type="String" />
+                        <asp:Parameter Name="Indirizzo" Type="String" />
+                        <asp:Parameter Name="Localita" Type="String" />
+                        <asp:Parameter Name="Cap" Type="String" />
+                        <asp:Parameter Name="Provincia" Type="String" />
+                        <asp:Parameter Name="Nazione" Type="String" />
+                        <asp:Parameter Name="IsCli" Type="Boolean" />
+                        <asp:Parameter Name="IsFor" Type="Boolean" />
+                        <asp:Parameter Name="Original_CodCliente" Type="String" />
+                    </UpdateParameters>
+                </asp:ObjectDataSource>
+            </div>
+            <div runat="server" id="divDetail" class="col-6 table-info p-1">
+                <div class="table-light p-0">
+                    <uc1:cmp_destClienti runat="server" ID="cmp_destClienti" />
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="card-footer text-right py-1">
+        <uc1:cmp_numRow runat="server" ID="cmp_numRow" />
+    </div>
+</div>

MP-MAG/WebUserControls/cmp_AnagCliFor.ascx.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Web.UI;
+
+namespace MP_MAG.WebUserControls
+{
+    public partial class cmp_AnagCliFor : BaseUserControl
+    {
+        #region Protected Properties
+
+        protected bool showDet
+        {
+            get
+            {
+                bool answ = false;
+                bool.TryParse(hfShowDet.Value, out answ);
+                return answ;
+            }
+            set
+            {
+                hfShowDet.Value = $"{value}";
+                fixDetailView(value);
+            }
+        }
+
+        #endregion Protected Properties
+
+        #region Private Methods
+
+        private void Cmp_numRow_eh_doRefresh(object sender, EventArgs e)
+        {
+            grView.PageSize = cmp_numRow.numRow;
+            grView.PageIndex = 0;
+            doReset();
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        protected void fixDetailView(bool showDetail)
+        {
+            divMain.Visible = true;
+            divDetail.Visible = showDetail;
+            string mainCss = showDetail ? "col-6 pr-0" : "col-12";
+            divMain.Attributes.Remove("class");
+            divMain.Attributes.Add("class", mainCss);
+            for (int i = 7; i < 11; i++)
+            {
+                grView.Columns[i].Visible = !showDet;
+            }
+        }
+
+        protected void grView_PageIndexChanged(object sender, EventArgs e)
+        {
+            doReset();
+        }
+
+        protected void grView_RowDeleted(object sender, System.Web.UI.WebControls.GridViewDeletedEventArgs e)
+        {
+            doReset();
+        }
+
+        protected void grView_RowEditing(object sender, System.Web.UI.WebControls.GridViewEditEventArgs e)
+        {
+            grView.SelectedIndex = e.NewEditIndex;
+        }
+
+        protected void grView_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            showDet = true;
+            cmp_destClienti.codCli = $"{grView.SelectedValue}";
+        }
+
+        /// <summary>
+        /// Aggiunta nuovo record
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtAddNew_Click(object sender, EventArgs e)
+        {
+            MagDataLayerObj.taACF.insertQuery("__CodiceCliente", "Nuova Ragione Sociale", "Nuovo Indirizzo", "Nuova Località", "00000", "BA", "IT", false, true);
+            doReset();
+        }
+
+        /// <summary>
+        /// comando reset
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtReset_Click(object sender, EventArgs e)
+        {
+            doReset();
+            raiseReset();
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!Page.IsPostBack)
+            {
+                grView.PageSize = cmp_numRow.numRow;
+                showDet = false;
+            }
+            cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh;
+        }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
+        public void doReset()
+        {
+            grView.SelectedIndex = -1;
+            grView.DataBind();
+            showDet = false;
+        }
+
+        #endregion Public Methods
+    }
+}

MP-MAG/WebUserControls/cmp_AnagCliFor.ascx.designer.cs

@@ -0,0 +1,98 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MP_MAG.WebUserControls
+{
+
+
+    public partial class cmp_AnagCliFor
+    {
+
+        /// <summary>
+        /// chkShowCli 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.CheckBox chkShowCli;
+
+        /// <summary>
+        /// chkShoFor 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.CheckBox chkShoFor;
+
+        /// <summary>
+        /// divMain control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMain;
+
+        /// <summary>
+        /// hfShowDet 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 hfShowDet;
+
+        /// <summary>
+        /// grView 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.GridView grView;
+
+        /// <summary>
+        /// ods 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.ObjectDataSource ods;
+
+        /// <summary>
+        /// divDetail control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail;
+
+        /// <summary>
+        /// cmp_destClienti control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MP_MAG.WebUserControls.cmp_destClienti cmp_destClienti;
+
+        /// <summary>
+        /// cmp_numRow control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MP_MAG.WebUserControls.cmp_numRow cmp_numRow;
+    }
+}

MP-MAG/WebUserControls/cmp_OrderList.ascx

@@ -110,7 +110,7 @@
                 </asp:TemplateField>
                 <asp:TemplateField ShowHeader="False">
                     <HeaderTemplate>
-                        <asp:LinkButton ID="lbtAddNew" runat="server" CssClass="btn btn-sm btn-outline-dark" ToolTip="Add New" OnClick="lbtAddNew_Click" Visible='<%# EnableEdit %>'><i class="fas fa-plus"></i></asp:LinkButton>
+                        <asp:LinkButton ID="lbtAddNew" runat="server" CssClass="btn btn-sm btn-outline-dark" ToolTip="Mostra/Nascondi Add New" OnClick="lbtAddNew_Click" Visible='<%# EnableEdit %>'><i class="fas fa-plus"></i></asp:LinkButton>
                     </HeaderTemplate>
                     <ItemTemplate>
                         <asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" CssClass="btn btn-sm btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmDelete") %>' Visible='<%# EnableEdit && Eval("NumAL").ToString()=="0" %>'><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>

MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs

@@ -20,7 +20,12 @@ namespace MP_MAG.WebUserControls
             set
             {
                 hfCodCli.Value = $"{value}";
-                doUpdate();
+#if false
+                if (PackListID > 0)
+                {
+                    doUpdate();
+                } 
+#endif
             }
         }
 
@@ -35,7 +40,10 @@ namespace MP_MAG.WebUserControls
             set
             {
                 hfPackListID.Value = $"{value}";
-                doUpdate();
+                if (!string.IsNullOrEmpty(CodCliente))
+                {
+                    doUpdate();
+                }
             }
         }
 
@@ -59,7 +67,7 @@ namespace MP_MAG.WebUserControls
                 var ordiniCaricati = tabOrdiniCaricati.Where(x => x.ExtOrdCod == keySel);
                 if (ordiniCaricati.ToList().Count == 0)
                 {
-                    MagData.MagDataLayer.man.taOList.insertQuery(PackListID, keySel, rigaOrd.CodArticolo, descrOrd, rigaOrd.Qta, rigaOrd.CodCliente, rigaOrd.CodDestinazione);
+                    MagData.MagDataLayer.man.taOList.insertQuery(PackListID, keySel, rigaOrd.CodArticolo, descrOrd, rigaOrd.QtaEvadibile, rigaOrd.CodCliente, rigaOrd.CodDestinazione);
                 }
                 raiseAddNew();
             }

MP-MAG/WebUserControls/cmp_PLScanner.ascx.cs

@@ -1,4 +1,5 @@
 using MagData;
+using SteamWare;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -120,6 +121,21 @@ namespace MP_MAG.WebUserControls
             }
         }
 
+        /// <summary>
+        /// UDC appena processato (in redis x 1 sec)
+        /// </summary>
+        protected string ProcUDC
+        {
+            get
+            {
+                return memLayer.ML.getRSV("LastProcUdc");
+            }
+            set
+            {
+                memLayer.ML.setRSV("LastProcUdc", value, 1);
+            }
+        }
+
         #endregion Protected Properties
 
         #region Private Methods
@@ -335,8 +351,16 @@ namespace MP_MAG.WebUserControls
                                     // se uguale OK
                                     else if (tabAL[0].AL == SelPedana)
                                     {
-                                        // tutto ok
-                                        allOk = true;
+                                        // 2022.03.31 se siamo in seconda lettura IMMEDIATA tutto ok
+                                        if (ProcUDC == code)
+                                        {
+                                            allOk = true;
+                                        }
+                                        // 2022.03.25 modifica: se è già associato --> giallo!
+                                        else
+                                        {
+                                            cmp_barcode.showOutput("badge badge-warning", $"Attenzione: UDC già caricato su Pedana/AL ({tabAL[0].AL})");
+                                        }
                                     }
                                     else
                                     {
@@ -367,6 +391,7 @@ namespace MP_MAG.WebUserControls
                             if (allOk)
                             {
                                 SelUDC = code;
+                                ProcUDC = code;
                                 tryLinkAlUdc();
                             }
                         }
@@ -447,27 +472,6 @@ namespace MP_MAG.WebUserControls
         /// <param name="resetStatus"></param>
         protected void resetSelection(bool resetStatus)
         {
-#if false
-      if (resetStatus)
-      {
-        try
-        {
-          // SE item esiste...
-          var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999);
-          if (tabItem.Count == 1)
-          {
-            // riposto item a status 1...
-            DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId);
-          }
-        }
-        catch
-        { }
-      }
-      // elimino item sel...
-      itemIdSelected = 0;
-      resetShowData();
-      ComLib.resetItemPickup(SheetID, DeviceId);
-#endif
         }
 
         #endregion Protected Methods

MP-MAG/WebUserControls/cmp_currODL.ascx.cs

@@ -18,8 +18,9 @@ namespace MP_MAG.WebUserControls
             Response.Redirect(titolo);
         }
 
-        protected void Page_Load(object sender, EventArgs e)
+        public void forceReload()
         {
+            resetProdData();
         }
 
         #endregion Protected Methods

MP-MAG/WebUserControls/cmp_destClienti.ascx

@@ -0,0 +1,133 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_destClienti.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_destClienti" %>
+<asp:HiddenField runat="server" ID="hfCodCli" />
+<asp:GridView runat="server" ID="grView" AutoGenerateColumns="False" DataKeyNames="CodCliente,CodDestinazione" DataSourceID="ods" CssClass="table table-sm table-striped small" AllowPaging="True">
+    <EmptyDataTemplate>
+        <div class="alert alert-warning">
+            <h4>0 Record Found</h4>
+
+            <asp:LinkButton ID="lbtAddNew" runat="server" OnClick="lbtAddNew_Click" CssClass="btn btn-success btn-sm" Visible="true" ToolTip="Add New" OnClientClick="return  confirm('Sicuro di voler inserire un nuovo record?');">Aggiungi Nuovo <i class="fas fa-plus"></i></asp:LinkButton>
+        </div>
+    </EmptyDataTemplate>
+    <Columns>
+        <asp:TemplateField ShowHeader="False">
+            <HeaderTemplate>
+                <asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-primary btn-sm" Visible="true" ToolTip="Reset"><i class="fas fa-sync-alt"></i></asp:LinkButton>
+            </HeaderTemplate>
+            <EditItemTemplate>
+                <div class="text-nowrap">
+                    <asp:LinkButton ID="lbtUpdate1" runat="server" CausesValidation="True" CommandName="Update" Text="Update" CssClass="btn btn-sm btn-success"><i class="fas fa-check-circle"></i></asp:LinkButton>
+                    &nbsp;<asp:LinkButton ID="lbtCancel1" runat="server" CausesValidation="False" CommandName="Cancel" Text="Cancel" CssClass="btn btn-sm btn-warning"><i class="fas fa-ban"></i></asp:LinkButton>
+                </div>
+            </EditItemTemplate>
+            <ItemTemplate>
+                <div class="text-nowrap">
+                    <asp:LinkButton ID="lbtSel" runat="server" CausesValidation="False" CommandName="Select" Text="Select" CssClass="btn btn-sm btn-info"><i class="fa fa-search"></i></asp:LinkButton>
+                    &nbsp;<asp:LinkButton ID="lbtEdit" runat="server" CausesValidation="False" CommandName="Edit" Text="Edit" CssClass="btn btn-sm btn-primary"><i class="fa fa-edit"></i></asp:LinkButton>
+                </div>
+            </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Cod." SortExpression="CodDestinazione">
+            <EditItemTemplate>
+                <asp:TextBox ID="txtCodDestinazione" runat="server" Text='<%# Bind("CodDestinazione") %>' Width="5em" />
+            </EditItemTemplate>
+            <ItemTemplate>
+                <asp:Label ID="lblCodDestinazione" runat="server" Text='<%# Eval("CodDestinazione") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
+                <asp:TemplateField HeaderText="Descr" SortExpression="DescDestinazione">
+            <EditItemTemplate>
+                <asp:TextBox ID="txtDescDestinazione" runat="server" Text='<%# Bind("DescDestinazione") %>' Width="6em" />
+            </EditItemTemplate>
+            <ItemTemplate>
+                <asp:Label ID="lblDescDestinazione" runat="server" Text='<%# Eval("DescDestinazione") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Indirizzo" SortExpression="Indirizzo">
+            <EditItemTemplate>
+                <asp:TextBox ID="txtIndirizzo" runat="server" Text='<%# Bind("Indirizzo") %>' Width="10em" />
+            </EditItemTemplate>
+            <ItemTemplate>
+                <asp:Label ID="lblIndirizzo" runat="server" Text='<%# Eval("Indirizzo") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Localita" SortExpression="Localita">
+            <EditItemTemplate>
+                <asp:TextBox ID="txtLocalita" runat="server" Text='<%# Bind("Localita") %>' Width="10em" />
+            </EditItemTemplate>
+            <ItemTemplate>
+                <asp:Label ID="lblLocalita" runat="server" Text='<%# Eval("Localita") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Cap" SortExpression="Cap">
+            <EditItemTemplate>
+                <asp:TextBox ID="txtCap" runat="server" Text='<%# Bind("Cap") %>' Width="5em" />
+            </EditItemTemplate>
+            <ItemTemplate>
+                <asp:Label ID="lblCap" runat="server" Text='<%# Eval("Cap") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Provincia" SortExpression="Provincia">
+            <EditItemTemplate>
+                <asp:TextBox ID="txtProvincia" runat="server" Text='<%# Bind("Provincia") %>' Width="4em" />
+            </EditItemTemplate>
+            <ItemTemplate>
+                <asp:Label ID="lblProvincia" runat="server" Text='<%# Eval("Provincia") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField HeaderText="Nazione" SortExpression="Nazione">
+            <EditItemTemplate>
+                <asp:TextBox ID="txtNazione" runat="server" Text='<%# Bind("Nazione") %>' Width="2em" />
+            </EditItemTemplate>
+            <ItemTemplate>
+                <asp:Label ID="lblNazione" runat="server" Text='<%# Eval("Nazione") %>' />
+            </ItemTemplate>
+        </asp:TemplateField>
+        <asp:TemplateField ShowHeader="False">
+            <HeaderTemplate>
+                <asp:LinkButton ID="lbtAddNew" runat="server" OnClick="lbtAddNew_Click" CssClass="btn btn-success btn-sm" Visible="true" ToolTip="Add New" OnClientClick="return  confirm('Sicuro di voler inserire un nuovo record?');"><i class="fas fa-plus"></i></asp:LinkButton>
+            </HeaderTemplate>
+            <EditItemTemplate>
+                <div class="text-nowrap">
+                    <asp:LinkButton ID="lbtCancel2" runat="server" CausesValidation="False" CommandName="Cancel" Text="Cancel" CssClass="btn btn-sm btn-warning"><i class="fas fa-ban"></i></asp:LinkButton>
+                </div>
+            </EditItemTemplate>
+            <ItemTemplate>
+                <asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" Text="Delete" OnClientClick="return  confirm('Sicuro di voler procedere con eliminazione?');" CssClass="btn btn-sm btn-danger"><i class="fas fa-trash"></i></asp:LinkButton>
+            </ItemTemplate>
+        </asp:TemplateField>
+    </Columns>
+    <HeaderStyle CssClass="default" />
+    <PagerStyle CssClass="active GridPager" />
+    <PagerSettings Mode="NumericFirstLast" />
+    <SelectedRowStyle CssClass="table-primary" />
+</asp:GridView>
+<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByCodCli" TypeName="MagData.DS_MagTableAdapters.AnagDestinClientiTableAdapter" DeleteMethod="deleteQuery" InsertMethod="insertQuery" UpdateMethod="updateQuery">
+    <DeleteParameters>
+        <asp:Parameter Name="Original_CodCliente" Type="String" />
+        <asp:Parameter Name="Original_CodDestinazione" Type="String" />
+    </DeleteParameters>
+    <InsertParameters>
+        <asp:Parameter Name="CodCliente" Type="String" />
+        <asp:Parameter Name="CodDestinazione" Type="String" />
+        <asp:Parameter Name="DescDestinazione" Type="String" />
+        <asp:Parameter Name="Indirizzo" Type="String" />
+        <asp:Parameter Name="Localita" Type="String" />
+        <asp:Parameter Name="Cap" Type="String" />
+        <asp:Parameter Name="Provincia" Type="String" />
+        <asp:Parameter Name="Nazione" Type="String" />
+    </InsertParameters>
+    <SelectParameters>
+        <asp:ControlParameter ControlID="hfCodCli" DefaultValue="###" Name="CodCliente" PropertyName="Value" Type="String" />
+    </SelectParameters>
+    <UpdateParameters>
+        <asp:Parameter Name="CodDestinazione" Type="String" />
+        <asp:Parameter Name="DescDestinazione" Type="String" />
+        <asp:Parameter Name="Indirizzo" Type="String" />
+        <asp:Parameter Name="Cap" Type="String" />
+        <asp:Parameter Name="Localita" Type="String" />
+        <asp:Parameter Name="Provincia" Type="String" />
+        <asp:Parameter Name="Nazione" Type="String" />
+        <asp:Parameter Name="Original_CodCliente" Type="String" />
+        <asp:Parameter Name="Original_CodDestinazione" Type="String" />
+    </UpdateParameters>
+</asp:ObjectDataSource>

MP-MAG/WebUserControls/cmp_destClienti.ascx.cs

@@ -0,0 +1,72 @@
+using System;
+
+namespace MP_MAG.WebUserControls
+{
+    public partial class cmp_destClienti : BaseUserControl
+    {
+        #region Public Properties
+
+        public string codCli
+        {
+            get
+            {
+                return hfCodCli.Value;
+            }
+            set
+            {
+                hfCodCli.Value = value;
+                grView.DataBind();
+                grView.SelectedIndex = -1;
+            }
+        }
+
+        #endregion Public Properties
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Aggiunta nuovo record
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtAddNew_Click(object sender, EventArgs e)
+        {
+            // cerco il num di cli esistenti e usi + 1...
+            var destCli = MagDataLayerObj.taADC.getByCodCli(codCli);
+            string newCodDest = "__CodDestNew";
+            if (destCli != null)
+            {
+                newCodDest = $"D{destCli.Count + 1:0000}";
+            }
+            MagDataLayerObj.taADC.insertQuery(codCli, newCodDest, "Nuova Destinazione", "Nuovo Indirizzo", "00000", "Nuova Località", "BA", "IT");
+            doReset();
+        }
+
+        /// <summary>
+        /// comando reset
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void lbtReset_Click(object sender, EventArgs e)
+        {
+            doReset();
+            raiseReset();
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
+        public void doReset()
+        {
+            grView.SelectedIndex = -1;
+            grView.DataBind();
+        }
+
+        #endregion Public Methods
+    }
+}

MP-MAG/WebUserControls/cmp_destClienti.ascx.designer.cs

@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MP_MAG.WebUserControls
+{
+
+
+    public partial class cmp_destClienti
+    {
+
+        /// <summary>
+        /// hfCodCli 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 hfCodCli;
+
+        /// <summary>
+        /// grView 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.GridView grView;
+
+        /// <summary>
+        /// ods 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.ObjectDataSource ods;
+    }
+}

MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs

@@ -115,6 +115,11 @@ namespace MP_MAG.WebUserControls
             { }
             // descrizione
             txtDescr.Text = $"{newNum}";
+            // se sono in add --> sollevo evento editing
+            if (divAddNew.Visible)
+            {
+                raiseEditing();
+            }
         }
 
         #endregion Private Methods
@@ -214,19 +219,6 @@ namespace MP_MAG.WebUserControls
             grView.DataBind();
         }
 
-#if false
-        /// <summary>
-        /// Avvia stampa report pedana
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void lbtPrintReport_Click(object sender, EventArgs e)
-        {
-            // lancio il report x l'elenco pedane + contenuto
-            MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackList}", $"{PackListID}", ddlPost.SelectedValue);
-        }
-#endif
-
         /// <summary>
         /// comando reset
         /// </summary>

MP-MAG/WebUserControls/cmp_gestPedane.ascx

@@ -18,6 +18,6 @@
             </div>
         </div>
         <asp:HiddenField runat="server" ID="hfPackListID" />
-        <asp:Timer runat="server" ID="timerGestPed" Interval="2000" OnTick="timerGestPed_Tick" />
+        <asp:Timer runat="server" ID="timerGestPed" Interval="5000" OnTick="timerGestPed_Tick" />
     </ContentTemplate>
 </asp:UpdatePanel>

MP-MAG/WebUserControls/cmp_jumper.ascx.cs

@@ -67,7 +67,7 @@ namespace MP_MAG.WebUserControls
             // se l'operatore in sessione è DIVERSO da quello appena inviato --> effettuo NUOVO login
             if (MatrOpr == memLayer.ML.IntSessionObj("MatrOpr"))
             {
-                // rimando a pagina di stampax ODL
+                // rimando a pagina di stampa x ODL
                 tgtPage = "printCartOdl";
             }
             else

MP-MAG/WebUserControls/cmp_packListMgmt.ascx

@@ -8,7 +8,14 @@
     <div class="card-header text-uppercase py-1">
         <div class="row">
             <div class="col-12 col-md-3">
-                <h3>Packing List</h3>
+                <div class="d-flex justify-content-between">
+                    <div class="px-1">
+                <h4>Packing List</h4>
+                    </div>
+                    <div class="px-1">
+                        <asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-sm btn-primary" OnClick="lbtForceReload_Click"><i class="fas fa-sync-alt"></i> Force Reload</asp:LinkButton>
+                    </div>
+                </div>
             </div>
             <div class="col-12 col-md-7 small">
                 <div class="input-group">

MP-MAG/WebUserControls/cmp_packListMgmt.ascx.cs

@@ -112,5 +112,12 @@ namespace MP_MAG.WebUserControls
         }
 
         #endregion Internal Methods
+
+        protected void lbtForceReload_Click(object sender, EventArgs e)
+        {
+            // forzo rilettura ordine... se abilitato ES3 / Arca
+            DataLayerObj.taArcaGiac.stp_IMP_All_Import_Process(null, null, null, null);
+            DataLayerObj.taArcaGiac.stp_IMP_All_Ordini_Process(null, null, null, "OVC", null);
+        }
     }
 }

MP-MAG/WebUserControls/cmp_packListMgmt.ascx.designer.cs

@@ -14,6 +14,15 @@ namespace MP_MAG.WebUserControls
     public partial class cmp_packListMgmt
     {
 
+        /// <summary>
+        /// lbtForceReload 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.LinkButton lbtForceReload;
+
         /// <summary>
         /// ddlElencoCli control.
         /// </summary>

MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs

@@ -285,61 +285,6 @@ namespace MP_MAG.WebUserControls
 
         private void doUpdate()
         {
-#if false
-      // reset grafico
-      icnCart.Attributes.Remove("class");
-      icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
-      icnBin.Attributes.Remove("class");
-      icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
-      icnSecOp.Attributes.Remove("class");
-      icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
-
-      // in base al secondo mostro uno o altro...
-      if (showCart)
-      {
-        icnCart.Attributes.Remove("class");
-        icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-success");
-        lblMessage.Text = "Item recognized";
-        // controllo SE HO cart
-        if (currCartTab.Count == 1)
-        {
-          var cartRow = currCartTab[0];
-          // imposto OUT
-          lblDestination.Text = $"SEND TO CART <b>C{cartRow.CartIndex}</b> ({cartRow.CartDtmx})";
-        }
-        else
-        {
-          lblDestination.Text = $"ERROR SEARCHING CART: {currCartTab.Count} found!";
-        }
-        lblDestination.CssClass = "text-success";
-      }
-      else if (showBin)
-      {
-        icnBin.Attributes.Remove("class");
-        icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-primary");
-        lblMessage.Text = "Item recognized";
-        if (currBinTab.Count == 1)
-        {
-          var binRow = currBinTab[0];
-          lblDestination.Text = $"SEND TO BIN <b>B{binRow.BinIndex}</b> ({binRow.BinDtmx})";
-        }
-        else
-        {
-          lblDestination.Text = $"ERROR SEARCHING BIN: {currBinTab.Count} found!";
-        }
-        lblDestination.CssClass = "text-primary";
-      }
-      if (showSecOp)
-      {
-        icnSecOp.Attributes.Remove("class");
-        icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-info");
-        lblMessage.Text = "Item recognized";
-        lblLastBCode.Text = $"DO SEC OP: {secOp}";
-        lblLastBCode.CssClass = "text-info";
-      }
-      // fix btn reset!
-      lbtResetSel.Visible = (itemIdSelected != 0);
-#endif
         }
 
         private bool processLastCmd(bool doRaiseEv)
@@ -517,16 +462,7 @@ namespace MP_MAG.WebUserControls
 
         private void resetIcons()
         {
-#if false
-      lblDestination.CssClass = "text-secondary";
-      lblMessage.Text = "";
-      lblDestination.Text = "";
-      lblLastBCode.Text = "";
-      lbtCancel.Visible = false;
-      lbtScrapped.Visible = false;
-      lbtParkArea.Visible = false;
-      lbtResetSel.Visible = (itemIdSelected != 0);
-#endif
+
         }
 
         #endregion Private Methods
@@ -604,76 +540,5 @@ namespace MP_MAG.WebUserControls
 
         #endregion Protected Methods
 
-#if false
-    /// <summary>
-    /// Mostra o nasconde dettaglio su ITEM letto
-    /// </summary>
-    /// <param name="showItem"></param>
-    /// <param name="itemRow"></param>
-    /// <param name="showError"></param>
-    private void showItemDetail(bool showItem, DS_App.ItemListRow itemRow, bool showError)
-    {
-      resetShowData();
-      divItemDet.Visible = showItem;
-      divItemError.Visible = showError;
-      if (showError)
-      {
-        displError("Item not found", true);
-      }
-      if (showItem)
-      {
-        lblItemCode.Text = itemRow.ItemExtCode;
-        lblItemDesc.Text = itemRow.ItemDesc;
-        lblItemDtmx.Text = itemRow.ItemDtmx;
-        itemIdSelected = itemRow.ItemID;
-        // CONTROLLO SIA in stato 1 --> worked, 2--> selected, 100--> parked...
-        switch (itemRow.StatusID)
-        {
-          case 0:
-            displError("ERROR: Item not ready", false);
-            break;
-
-          case 1:
-          case 2:
-          case 100:
-            // salvo che è in STATO 2 (picked up)
-            DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId);
-            // verifico cosa devo mostrare come PROX passaggio...
-            showCart = itemRow.ProcessesReq == "";
-            showBin = (itemRow.ProcessesReq.Contains("PaintFlag"));
-            secOp = itemRow.PostProcList;
-            showSecOp = (secOp != "");
-            doUpdate();
-            break;
-
-          case 3:
-            displError("Item already on CART!", false);
-            break;
-
-          case 4:
-            // fino a concorrenza qta richiesta sposto, POI do errori
-            displError("ALL Item already scanned on BIN!", false);
-            break;
-
-          case 5:
-            displError("Item already at KIT STATION!", false);
-            break;
-
-          case 990:
-            displError("Item declared SCRAP!", false);
-            break;
-
-          case 991:
-            displError("Item declared SCRAP with CNC program created!", false);
-            break;
-
-          default:
-            displError("ERROR: Item status UNKNOWN!", false);
-            break;
-        }
-      }
-      lbtResetSel.Visible = (itemIdSelected != 0);
-    }
-#endif
     }
 }

MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs

@@ -283,61 +283,6 @@ namespace MP_MAG.WebUserControls
 
         private void doUpdate()
         {
-#if false
-      // reset grafico
-      icnCart.Attributes.Remove("class");
-      icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
-      icnBin.Attributes.Remove("class");
-      icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
-      icnSecOp.Attributes.Remove("class");
-      icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-outline-secondary");
-
-      // in base al secondo mostro uno o altro...
-      if (showCart)
-      {
-        icnCart.Attributes.Remove("class");
-        icnCart.Attributes.Add("class", "btn btn-sm btn-block btn-success");
-        lblMessage.Text = "Item recognized";
-        // controllo SE HO cart
-        if (currCartTab.Count == 1)
-        {
-          var cartRow = currCartTab[0];
-          // imposto OUT
-          lblDestination.Text = $"SEND TO CART <b>C{cartRow.CartIndex}</b> ({cartRow.CartDtmx})";
-        }
-        else
-        {
-          lblDestination.Text = $"ERROR SEARCHING CART: {currCartTab.Count} found!";
-        }
-        lblDestination.CssClass = "text-success";
-      }
-      else if (showBin)
-      {
-        icnBin.Attributes.Remove("class");
-        icnBin.Attributes.Add("class", "btn btn-sm btn-block btn-primary");
-        lblMessage.Text = "Item recognized";
-        if (currBinTab.Count == 1)
-        {
-          var binRow = currBinTab[0];
-          lblDestination.Text = $"SEND TO BIN <b>B{binRow.BinIndex}</b> ({binRow.BinDtmx})";
-        }
-        else
-        {
-          lblDestination.Text = $"ERROR SEARCHING BIN: {currBinTab.Count} found!";
-        }
-        lblDestination.CssClass = "text-primary";
-      }
-      if (showSecOp)
-      {
-        icnSecOp.Attributes.Remove("class");
-        icnSecOp.Attributes.Add("class", "btn btn-sm btn-block btn-info");
-        lblMessage.Text = "Item recognized";
-        lblLastBCode.Text = $"DO SEC OP: {secOp}";
-        lblLastBCode.CssClass = "text-info";
-      }
-      // fix btn reset!
-      lbtResetSel.Visible = (itemIdSelected != 0);
-#endif
         }
 
         private bool processLastCmd(bool doRaiseEv)
@@ -566,27 +511,6 @@ namespace MP_MAG.WebUserControls
         /// <param name="resetStatus"></param>
         protected void resetSelection(bool resetStatus)
         {
-#if false
-      if (resetStatus)
-      {
-        try
-        {
-          // SE item esiste...
-          var tabItem = DataLayer.man.taIL.getBySearch(itemIdSelected, itemIdSelected.ToString(), 0, 999);
-          if (tabItem.Count == 1)
-          {
-            // riposto item a status 1...
-            DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId);
-          }
-        }
-        catch
-        { }
-      }
-      // elimino item sel...
-      itemIdSelected = 0;
-      resetShowData();
-      ComLib.resetItemPickup(SheetID, DeviceId);
-#endif
         }
 
         /// <summary>
@@ -602,76 +526,5 @@ namespace MP_MAG.WebUserControls
 
         #endregion Protected Methods
 
-#if false
-    /// <summary>
-    /// Mostra o nasconde dettaglio su ITEM letto
-    /// </summary>
-    /// <param name="showItem"></param>
-    /// <param name="itemRow"></param>
-    /// <param name="showError"></param>
-    private void showItemDetail(bool showItem, DS_App.ItemListRow itemRow, bool showError)
-    {
-      resetShowData();
-      divItemDet.Visible = showItem;
-      divItemError.Visible = showError;
-      if (showError)
-      {
-        displError("Item not found", true);
-      }
-      if (showItem)
-      {
-        lblItemCode.Text = itemRow.ItemExtCode;
-        lblItemDesc.Text = itemRow.ItemDesc;
-        lblItemDtmx.Text = itemRow.ItemDtmx;
-        itemIdSelected = itemRow.ItemID;
-        // CONTROLLO SIA in stato 1 --> worked, 2--> selected, 100--> parked...
-        switch (itemRow.StatusID)
-        {
-          case 0:
-            displError("ERROR: Item not ready", false);
-            break;
-
-          case 1:
-          case 2:
-          case 100:
-            // salvo che è in STATO 2 (picked up)
-            DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId);
-            // verifico cosa devo mostrare come PROX passaggio...
-            showCart = itemRow.ProcessesReq == "";
-            showBin = (itemRow.ProcessesReq.Contains("PaintFlag"));
-            secOp = itemRow.PostProcList;
-            showSecOp = (secOp != "");
-            doUpdate();
-            break;
-
-          case 3:
-            displError("Item already on CART!", false);
-            break;
-
-          case 4:
-            // fino a concorrenza qta richiesta sposto, POI do errori
-            displError("ALL Item already scanned on BIN!", false);
-            break;
-
-          case 5:
-            displError("Item already at KIT STATION!", false);
-            break;
-
-          case 990:
-            displError("Item declared SCRAP!", false);
-            break;
-
-          case 991:
-            displError("Item declared SCRAP with CNC program created!", false);
-            break;
-
-          default:
-            displError("ERROR: Item status UNKNOWN!", false);
-            break;
-        }
-      }
-      lbtResetSel.Visible = (itemIdSelected != 0);
-    }
-#endif
     }
 }

MP-MON/MP-MON.csproj.user

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <UseIISExpress>true</UseIISExpress>
-    <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
-    <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
-    <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
-    <WebStackScaffolding_IsReferencingScriptLibrariesSelected>False</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
-    <WebStackScaffolding_LayoutPageFile />
-    <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>OVH-Demo</NameOfLastUsedPublishProfile>
-    <WebStackScaffolding_ControllerDialogWidth>1440</WebStackScaffolding_ControllerDialogWidth>
-    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
-    <WebStackScaffolding_DbContextTypeFullName>MP_MON.Models.MoonProEntities</WebStackScaffolding_DbContextTypeFullName>
-    <WebStackScaffolding_IsViewGenerationSelected>True</WebStackScaffolding_IsViewGenerationSelected>
-    <Use64BitIISExpress />
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
-    <Controller_SelectedScaffolderID>ApiControllerWithActionsScaffolder</Controller_SelectedScaffolderID>
-    <Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <StartPageUrl>
-          </StartPageUrl>
-          <StartAction>CurrentPage</StartAction>
-          <AspNetDebugging>True</AspNetDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <NativeDebugging>False</NativeDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <ExternalProgram>
-          </ExternalProgram>
-          <StartExternalURL>
-          </StartExternalURL>
-          <StartCmdLineArguments>
-          </StartCmdLineArguments>
-          <StartWorkingDirectory>
-          </StartWorkingDirectory>
-          <EnableENC>True</EnableENC>
-          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>

MP-MON/Properties/PublishProfiles/IIS01.pubxml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>MSDeploy</WebPublishMethod>
-    <ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
-    <LastUsedBuildConfiguration>IIS01</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>True</ExcludeApp_Data>
-    <MSDeployServiceURL>https://IIS01:8172/MsDeploy.axd</MSDeployServiceURL>
-    <DeployIisAppPath>Default Web Site/MP/MON</DeployIisAppPath>
-    <RemoteSitePhysicalPath />
-    <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
-    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
-    <EnableMSDeployBackup>True</EnableMSDeployBackup>
-    <UserName>jenkins</UserName>
-    <_SavePWD>True</_SavePWD>
-    <PublishDatabaseSettings>
-      <Objects xmlns="">
-        <ObjectGroup Name="MapoMonEntities" Order="1" Enabled="False">
-          <Destination Path="" />
-          <Object Type="DbCodeFirst">
-            <Source Path="DBContext" DbContext="MP_MON.Models.MapoMonEntities, MP-MON" Origin="Configuration" />
-          </Object>
-        </ObjectGroup>
-      </Objects>
-    </PublishDatabaseSettings>
-    <PrecompileBeforePublish>True</PrecompileBeforePublish>
-    <EnableUpdateable>True</EnableUpdateable>
-    <DebugSymbols>False</DebugSymbols>
-    <WDPMergeOption>DonotMerge</WDPMergeOption>
-  </PropertyGroup>
-  <ItemGroup>
-    <MSDeployParameterValue Include="$(DeployParameterPrefix)MapoMonEntities-Web.config Connection String" />
-  </ItemGroup>
-</Project>

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TimeStampOfAssociatedLegacyPublishXmlFile />
-    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAAAewiJ+nIBbTTspMQrI3mYbAAAAAASAAACgAAAAEAAAAHv/uqF0OeZk5Jd/VDKaqDkYAAAAhda034UKNfpaxG3rzuVFGxxL3vD63IOpFAAAAPdOB9Rh9Dmin8POLOsKm2rkpUWP</EncryptedPassword>
-  </PropertyGroup>
-</Project>

MP-MON/Properties/PublishProfiles/IIS02.pubxml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>MSDeploy</WebPublishMethod>
-    <ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
-    <LastUsedBuildConfiguration>IIS02</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>True</ExcludeApp_Data>
-    <MSDeployServiceURL>https://IIS02:8172/MsDeploy.axd</MSDeployServiceURL>
-    <DeployIisAppPath>Default Web Site/MP/MON</DeployIisAppPath>
-    <RemoteSitePhysicalPath />
-    <SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
-    <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
-    <EnableMSDeployBackup>True</EnableMSDeployBackup>
-    <UserName>jenkins</UserName>
-    <_SavePWD>True</_SavePWD>
-    <PrecompileBeforePublish>True</PrecompileBeforePublish>
-    <EnableUpdateable>True</EnableUpdateable>
-    <DebugSymbols>False</DebugSymbols>
-    <WDPMergeOption>DonotMerge</WDPMergeOption>
-    <PublishDatabaseSettings>
-      <Objects xmlns="">
-        <ObjectGroup Name="MapoMonEntities" Order="1" Enabled="False">
-          <Destination Path="" />
-          <Object Type="DbCodeFirst">
-            <Source Path="DBContext" DbContext="MP_MON.Models.MapoMonEntities, MP-MON" Origin="Configuration" />
-          </Object>
-        </ObjectGroup>
-      </Objects>
-    </PublishDatabaseSettings>
-  </PropertyGroup>
-  <ItemGroup>
-    <MSDeployParameterValue Include="$(DeployParameterPrefix)MapoMonEntities-Web.config Connection String" />
-  </ItemGroup>
-</Project>

MP-MON/Properties/PublishProfiles/IIS02.pubxml.user

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <TimeStampOfAssociatedLegacyPublishXmlFile />
-    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAACNVkF3Su901/DC3hNZl1gfAAAAAASAAACgAAAAEAAAAEufS9x2sME6BWrVhAqtSZcYAAAAdFUcWCqlDMWfdNjH3u3kaK1d+6g8yZhZFAAAAPq8jPh6qkXvKLqnRGO5Mkj6ESpe</EncryptedPassword>
-  </PropertyGroup>
-</Project>

MP-Site/WebUserControls/mod_sequencerTempiCiclo.ascx.cs

@@ -325,51 +325,6 @@ namespace MP_SITE.WebUserControls
 
         #endregion Protected Methods
 
-#if false
-        /// <summary>
-        /// popola il sequencer degli stati raggruppando perché troppi valori secondo MEDIA ARMONICA
-        /// </summary>
-        /// <param name="dati"></param>
-        /// <returns></returns>
-        private void plottaGruppiMediaArmonica(DataLayer_generic.serieTimeValDataTable dati)
-        {
-            // creo oggetto x contenere i dati "mediati"
-            DataLayer_generic.serieTimeValDataTable datiGrouped = new DataLayer_generic.serieTimeValDataTable();
-            // calcolo il val minimo da plottare (come ampiezza)
-            decimal ampiezzaMin = (decimal)totale / numSplit;
-            // setup valori iniziali
-            decimal valoreCurr = (decimal)0.0;
-            decimal valoreMedio = (decimal)1.0;
-            DateTime timeRaggiunto = _grafico.intervallo.inizio;
-            decimal ampiezzaCurr = (decimal)0.0;
-            decimal ampiezzaMedia = (decimal)0.0;
-            string label = "";
-            // ciclo x tutti i record
-            foreach (DataLayer_generic.serieTimeValRow riga in dati)
-            {
-                // calcolo nuova ampiezza
-                ampiezzaCurr = (decimal)riga.DataEnd.Subtract(riga.DataStart).TotalMinutes;
-                //...e calcolo nuovo valore medio...
-                valoreCurr = riga.valore;
-                // calcolo media armonica
-                valoreMedio = ((ampiezzaCurr + ampiezzaMedia) / (ampiezzaMedia / valoreMedio + ampiezzaCurr / valoreCurr));
-                ampiezzaMedia = ampiezzaCurr + ampiezzaMedia;
-                // se supero il limite aggiungo in tabella, sennò proseguo...
-                if (ampiezzaMedia > ampiezzaMin)
-                {
-                    label = string.Format("TC: {0} min/pz", valoreMedio);
-                    datiGrouped.AddserieTimeValRow(timeRaggiunto, riga.DataEnd, valoreMedio, label, "TC");
-                    // resetto
-                    timeRaggiunto = riga.DataEnd;
-                    ampiezzaMedia = (decimal)0.0;
-                    valoreMedio = (decimal)1.0;
-                }
-            }
-            _grafico.palletChange = false;
-            plottaDettaglio(datiGrouped);
-        }
-#endif
-
         #region Public Methods
 
         /// <summary>

MP-TAB/DettaglioMacchina.aspx.cs

@@ -6,56 +6,6 @@ namespace MoonProTablet
 {
     public partial class DettaglioMacchina : BasePage
     {
-#if false
-        protected int MatrOpr
-        {
-            get
-            {
-                return memLayer.ML.IntSessionObj("MatrOpr");
-            }
-        }
-
-        protected int QtaUdc
-        {
-            get
-            {
-                int answ = 1;
-                string codGrp = "IMB";
-                string codVal = "NUM_PZ_CONT";
-                // recupero dato da scheda tecnica della quantità per UDC
-                var tabSTAR = DataLayerObj.taSTAR.getByGrpOdlLbl(codGrp, codVal, idxODL);
-                if (tabSTAR.Rows.Count > 0)
-                {
-                    try
-                    {
-                        int.TryParse(tabSTAR[0].Value, out answ);
-                    }
-                    catch
-                    { }
-                }
-                return answ;
-            }
-        }
-        protected string UserAuthKey
-        {
-            get
-            {
-                //cerco in sessione...
-                string answ = memLayer.ML.StringSessionObj("UserAuthKey");
-                // se non trovo --> db
-                if (string.IsNullOrEmpty(answ))
-                {
-                    var tabOpr = DataLayerObj.taOp.getByMatrOpr(MatrOpr);
-                    if (tabOpr.Rows.Count > 0)
-                    {
-                        answ = tabOpr[0].authKey;
-                    }
-                }
-                return answ;
-            }
-        }
-#endif
-
         #region Private Methods
 
         private void mod_confProd1_eh_newVal(object sender, EventArgs e)

MP-TAB/Test2.aspx.cs

@@ -37,42 +37,11 @@ namespace MoonProTablet
             divInnovazioni.Visible = showConf;
             if (showConf)
             {
-#if false
-                // continuo update
-                lbtSalva.Visible = showConf;
-                lblUpdating.Visible = !showConf;
-#endif
-#if false
-                try
-                {
-                    updatePzBuoni();
-                    // sollevo evento!
-                    if (eh_inserting != null)
-                    {
-                        eh_inserting(this, new EventArgs());
-                    }
-                }
-                catch
-                {
-                    txtNumPezzi.Text = "0";
-                    logger.lg.scriviLog(string.Format("Errore recupero pezzi da confermare per la macchina {0}", idxMacchinaSel), tipoLog.ERROR);
-                }
-#endif
-            }
-            if (showConf)
-            {
                 lblShowConfProd.Text = "Nascondi Conferma";
             }
             else
             {
                 lblShowConfProd.Text = "Mostra Conferma";
-#if false
-                // sollevo evento!
-                if (eh_reset != null)
-                {
-                    eh_reset(this, new EventArgs());
-                }
-#endif
             }
         }
 

MP-TAB/WebUserControls/cmp_dichiarList.ascx

@@ -59,43 +59,7 @@
                 </asp:TemplateField>
             </Columns>
         </asp:GridView>
-                <%--<asp:TemplateField HeaderText="Registro Scarti <i class='fa fa-sort'></i>" SortExpression="DataOra" HeaderStyle-CssClass="btn btn-sm btn-block btn-secondary text-info" HeaderStyle-ForeColor="White">
-                    <ItemTemplate>
-                        <div class="row">
-                            <div class="col-5 small">
-                                <div>
-                                    Art: <b>
-                                        <asp:Label ID="Label5" runat="server" Text='<%# Eval("CodArticolo") %>' /></b>
-                                </div>
-                                <div>
-                                    <asp:Label ID="Label4" runat="server" CssClass='<%# "text-" + Eval("cssClass")%>'><i class='<%# Eval("icona") %>'></i> <%# Eval("Descrizione") %>'</asp:Label>
-                                </div>
-                            </div>
-                            <div class="col-2 px-0 text-center">
-                                <span class="lead font-weight-bold">
-                                    <%# Eval("Qta") %>
-                                </span>pz
-                            </div>
-                            <div class="col-5 text-right small">
-                                <div class="text-truncate">
-                                    <asp:Label ID="Label1" runat="server" Text='<%# Eval("DataOra","{0:ddd dd.MM.yy HH:mm:ss}") %>' />
-                                    <i class="fa fa-clock-o" aria-hidden="true"></i>
-                                </div>
-                                <div class="text-truncate">
-                                    <b>
-                                        <asp:Label ID="Label3" runat="server" Text='<%# Eval("Operatore") %>' /></b>
-                                    <i class="fa fa-user" aria-hidden="true"></i>
-                                </div>
-                            </div>
-                            <div class="col-12 small">
-                                <i runat="server" id="iNote" visible='<%# Eval("Note").ToString()!="" %>'>Nota:
-                  <b>
-                      <asp:Label ID="Label6" runat="server" Text='<%# Eval("Note") %>' /></b></i>
-                            </div>
-                        </div>
-                    </ItemTemplate>
-                </asp:TemplateField>--%>
-        <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getFilt" TypeName="MapoDb.DS_applicazioneTableAdapters.DiarioDichiarazioniTableAdapter" DeleteMethod="deleteQuery" UpdateMethod="updateQuery" OnUpdating="ods_Updating">
+        <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getFilt" TypeName="MapoDb.DS_applicazioneTableAdapters.DiarioDichiarazioniTableAdapter" DeleteMethod="deleteQuery" UpdateMethod="updateQuery" OnUpdating="ods_Updating" FilterExpression="">
             <DeleteParameters>
                 <asp:Parameter Name="Original_IdxDich" Type="Int32" />
             </DeleteParameters>

MP-TAB/WebUserControls/mod_ODL.ascx.cs

@@ -639,11 +639,11 @@ namespace MoonProTablet.WebUserControls
         private void doRemoveCurrOdlData()
         {
             // invio task x end produzione...
-            DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.endProd, "");
             string setArtVal = "NO ART";
             string setPzCommVal = "0";
             string setCommVal = $"NO ODL";
             // FIXME TODO: scrivere come sotto? testare valvital x linea LASCO
+            DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.endProd, "");
             DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setArt, setArtVal);
             DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setPzComm, setPzCommVal);
             DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setComm, setCommVal);
@@ -976,6 +976,18 @@ namespace MoonProTablet.WebUserControls
             DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.fixStopSetup, outData);
             outData = "Inserita richiesta invio Fix chiusura attrezzaggio " + outData;
             lblOut.Text = outData;
+            // se è master --> chiamo update child!
+            if (isMaster)
+            {
+                // calcolo gli slave...
+                var slaveList = DataLayerObj.taM2S.getByMaster(idxMacchina);
+                foreach (var machine in slaveList)
+                {
+                    outData = $"TS:{ts}|MATR:{DataLayerObj.MatrOpr}|ODL:{idxOdlMacc}|master machine:{idxMacchinaFix}";
+                    // invio task x end produzione...
+                    DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.fixStopSetup, outData);
+                }
+            }
         }
 
         /// <summary>
@@ -1185,7 +1197,6 @@ namespace MoonProTablet.WebUserControls
                 processaEvento(idxMacchinaFix, idxEvento, sb.ToString(), idxODL_curr);
                 // indico INIZIO SETUP su REDIS come EXE della macchina...
                 string ts = string.Format("{0:yyMMdd}T{0:HHmmss.fff}Z", DateTime.Now);
-                DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.startSetup, $"TS:{ts}|MATR:{DataLayerObj.MatrOpr}|ODL:{idxODL_curr}");
                 // aggiungo articolo, commessa, richiesta pezzi...
                 try
                 {
@@ -1194,6 +1205,7 @@ namespace MoonProTablet.WebUserControls
                     string setPzCommVal = $"{datiODL.NumPezzi}";
                     string setCommVal = $"ODL{datiODL.IdxODL:00000000}";
                     // FIXME TODO: scrivere come sotto? testare valvital x linea LASCO
+                    DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.startSetup, $"TS:{ts}|MATR:{DataLayerObj.MatrOpr}|ODL:{idxODL_curr}");
                     DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setArt, setArtVal);
                     DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setPzComm, setPzCommVal);
                     DataLayerObj.addTask4Machine(idxMacchinaFix, taskType.setComm, setCommVal);
@@ -1213,6 +1225,7 @@ namespace MoonProTablet.WebUserControls
                             DataLayerObj.updateMachineParameter(machine.IdxMacchinaSlave, "setComm", setCommVal);
 #endif
 
+                            DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.startSetup, $"TS:{ts}|MATR: {DataLayerObj.MatrOpr}| Master Machine: {idxMacchinaFix}");
                             DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.setArt, setArtVal);
                             DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.setPzComm, setPzCommVal);
                             DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.setComm, setCommVal);
@@ -1328,6 +1341,13 @@ namespace MoonProTablet.WebUserControls
                 int idxOdlAltra = DataLayerObj.taODL.getByMacchina(idxMaccAltraTav)[0].IdxODL;
                 sb.AppendLine(String.Format(evText, idxOdlAltra));
                 processaEvento(idxMaccAltraTav, idxEvento, String.Format(evText, idxOdlAltra), idxOdlAltra);
+
+                // invio eventi ad IOB slave...
+                var slaveList = DataLayerObj.taM2S.getByMaster(idxMacchina);
+                foreach (var machine in slaveList)
+                {
+                    DataLayerObj.addTask4Machine(machine.IdxMacchinaSlave, taskType.stopSetup, $"TS:{ts}|MATR: {DataLayerObj.MatrOpr}| Master Machine: {idxMacchinaFix}");
+                }
             }
             // se è master --> chiamo update child!
             if (isMaster)

MP-TAB/WebUserControls/mod_confProd.ascx.cs

@@ -429,6 +429,7 @@ namespace MoonProTablet.WebUserControls
             {
                 eh_newVal(this, new EventArgs());
             }
+            dtReqUpdate = DateTime.Now;
             doUpdate();
         }
 

MagData/DS_Mag.xss

@@ -4,18 +4,19 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:ElencoLotti" ZOrder="10" X="241" Y="15" Height="515" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="349" />
-    <Shape ID="DesignTable:ElencoUdc" ZOrder="9" X="561" Y="17" Height="476" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="349" />
-    <Shape ID="DesignTable:AnagArt" ZOrder="5" X="279" Y="548" Height="191" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:ODL" ZOrder="1" X="930" Y="30" Height="411" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:Elencopost2Queue" ZOrder="4" X="30" Y="753" Height="192" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
-    <Shape ID="DesignTable:ElencoAL" ZOrder="8" X="882" Y="491" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:AnagClienti" ZOrder="2" X="320" Y="783" Height="210" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:ElencoAL2UDC" ZOrder="7" X="16" Y="357" Height="176" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
-    <Shape ID="DesignTable:AnagArticoli2Clienti" ZOrder="6" X="8" Y="549" Height="172" Width="262" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:Macchine" ZOrder="3" X="621" Y="553" Height="227" Width="235" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="147" />
+    <Shape ID="DesignTable:ElencoLotti" ZOrder="11" X="241" Y="15" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:ElencoUdc" ZOrder="10" X="561" Y="17" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagArt" ZOrder="6" X="279" Y="548" Height="191" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:ODL" ZOrder="2" X="930" Y="30" Height="343" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:Elencopost2Queue" ZOrder="5" X="30" Y="753" Height="134" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:ElencoAL" ZOrder="9" X="882" Y="491" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:AnagClienti" ZOrder="3" X="320" Y="783" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:ElencoAL2UDC" ZOrder="8" X="16" Y="357" Height="172" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:AnagArticoli2Clienti" ZOrder="7" X="8" Y="549" Height="172" Width="262" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Macchine" ZOrder="4" X="621" Y="553" Height="267" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:AnagDestinClienti" ZOrder="1" X="671" Y="892" Height="305" Width="266" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

MagData/MagDataLayer.cs

@@ -39,6 +39,8 @@ namespace MagData
         public static string redReportConf = "MP-CTRACK:MAG:reportConf";
         public DS_MagTableAdapters.AnagArtTableAdapter taAA;
         public DS_MagTableAdapters.AnagArticoli2ClientiTableAdapter taAA2C;
+        public DS_MagTableAdapters.AnagClientiTableAdapter taACF;
+        public DS_MagTableAdapters.AnagDestinClientiTableAdapter taADC;
         public DS_ReportTableAdapters.stp_prt_CartellinoFinitiOdetteTableAdapter taCFOdette;
         public DS_ReportTableAdapters.stp_prt_CartellinoPedaneTableAdapter taCPed;
         public DS_ReportTableAdapters.stp_prt_CartellinoSemilavoratiTableAdapter taCSemil;
@@ -326,6 +328,8 @@ namespace MagData
 
             taAA = new DS_MagTableAdapters.AnagArtTableAdapter();
             taAA2C = new DS_MagTableAdapters.AnagArticoli2ClientiTableAdapter();
+            taACF = new DS_MagTableAdapters.AnagClientiTableAdapter();
+            taADC= new DS_MagTableAdapters.AnagDestinClientiTableAdapter();
             taEA2U = new DS_MagTableAdapters.ElencoAL2UDCTableAdapter();
             taEAL = new DS_MagTableAdapters.ElencoALTableAdapter();
             taEL = new DS_MagTableAdapters.ElencoLottiTableAdapter();
@@ -351,6 +355,8 @@ namespace MagData
 
             taAA.Connection.ConnectionString = connString;
             taAA2C.Connection.ConnectionString = connString;
+            taACF.Connection.ConnectionString = connString;
+            taADC.Connection.ConnectionString = connString;
             taEA2U.Connection.ConnectionString = connString;
             taEAL.Connection.ConnectionString = connString;
             taEL.Connection.ConnectionString = connString;

MagData/Objects.cs

@@ -96,13 +96,6 @@ namespace MagData
     /// </summary>
     public class prodPrintData
     {
-#if false
-        /// <summary>
-        /// Cod operatore corrente
-        /// </summary>
-        public string CodOpr { get; set; } = "";
-#endif
-
         #region Public Constructors
 
         /// <summary>

MapoDb/AlarmsArchive.cs

@@ -11,11 +11,6 @@ namespace MapoDb
   /// </summary>
   public class AlarmsArchive
   {
-#if false
-    string mdbConnString = "mongodb://W2019-MONGODB:27017";
-    //string mdbConnString = "mongodb://localhost:27017";
-    MongoClient client; 
-#endif
 
 
     /// <summary>
@@ -32,12 +27,6 @@ namespace MapoDb
     /// </summary>
     public AlarmsArchive()
     {
-#if false
-      // rifare avvio con lettura da web.config...
-      client = new MongoClient(mdbConnString);
-      database = client.GetDatabase("MAPO"); 
-#endif
-
       database = memLayer.ML.getMongoDatabase("MAPO");
       DataLayerObj = new DataLayer();
     }

MapoDb/DS_ProdTempi.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="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="1394" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:TempiCicloRilevati" ZOrder="15" X="20" Y="81" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:ODL" ZOrder="1" X="588" Y="452" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -14,7 +14,7 @@
     <Shape ID="DesignTable:stp_PzProd_getByMacchina" ZOrder="8" X="23" Y="754" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:DatiConfermati" ZOrder="23" X="585" Y="50" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:CalendFesteFerie" ZOrder="13" X="346" Y="364" Height="115" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="4" X="25" Y="975" Height="97" Width="300" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="46" SplitterPosition="46" />
+    <Shape ID="DesignTable:stp_TempoByIdxMaccPeriodClass" ZOrder="4" X="25" Y="969" Height="97" Width="300" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="46" SplitterPosition="46" />
     <Shape ID="DesignTable:DatiProduzione" ZOrder="20" X="554" Y="922" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:stp_repDonati_getDatiProdMacchina" ZOrder="11" X="949" Y="688" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:stp_repDonati_getLastStatoDurataMacchina" ZOrder="22" X="957" Y="1072" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
@@ -28,7 +28,7 @@
     <Shape ID="DesignTable:RegistroScarti" ZOrder="3" X="25" Y="1371" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:PromesseODL" ZOrder="9" X="946" Y="1728" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:ElencoConfermeProd" ZOrder="19" X="26" Y="1839" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:StatoProd" ZOrder="14" X="541" Y="1777" Height="267" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:StatoProd" ZOrder="14" X="541" Y="1777" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
     <Shape ID="DesignTable:Macchine2Slave" ZOrder="6" X="333" Y="559" Height="153" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
   </Shapes>
   <Connectors />

MapoDb/DataLayer.cs

@@ -897,7 +897,7 @@ namespace MapoDb
             Dictionary<string, string> savedTask = new Dictionary<string, string>();
             try
             {
-                logger.lg.scriviLog($"Request: idxMacchina: {idxMacchina} | taskKey: {taskKey} | taskVal: {taskVal}");
+                //logger.lg.scriviLog($"Request: idxMacchina: {idxMacchina} | taskKey: {taskKey} | taskVal: {taskVal}");
                 // leggo task attuali...
                 currTask = mTaskMacchina(idxMacchina);
                 if (currTask.ContainsKey($"{taskKey}"))

MapoDb/FluxArchive.cs

@@ -44,12 +44,6 @@ namespace MapoDb
     /// </summary>
     public class FluxArchive
     {
-#if false
-    string mdbConnString = "mongodb://W2019-MONGODB:27017";
-    //string mdbConnString = "mongodb://localhost:27017";
-    MongoClient client;
-#endif
-
         #region Private Fields
 
         /// <summary>

MapoDb/resoconti.cs

@@ -425,17 +425,6 @@ public class resoconti
                 i++;
             }
             logger.lg.scriviLog(string.Format("Conversione oggetto eseguita: {0} rec, {1} msec", sequenza.Count, stopwatch.ElapsedMilliseconds));
-#if false
-   // faccio trim x primo evento...
-   if (_sequenza[0].start < _intervallo.inizio)
-   {
-    _sequenza.serieDati[0].valore -= _intervallo.inizio.Subtract(_sequenza.serieDati[0].timeData).TotalMinutes;
-    _sequenza.serieDati[0].timeData = _intervallo.inizio;
-   }
-   //...e ultimo evento...
-   int numValori = _sequenza.serieDati.Count - 1;
-   _sequenza.serieDati[numValori].valore = _intervallo.fine.Subtract(_sequenza.serieDati[numValori].timeData).TotalMinutes;
-#endif
         }
 
         return sequenza;

MapoSDK/Enums.cs

@@ -99,7 +99,12 @@
         /// <summary>
         /// Tipo stringa
         /// </summary>
-        String
+        String,
+
+        /// <summary>
+        /// Timpo intero da High/Low Bit positivo (high bit va moltiplicato x 32768 = Uint16Max/2)
+        /// </summary>
+        HLPInt
     }
 
     /// <summary>