From 8567bd35cdcf49341464ed9fccf92f1aaf1aa301 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 10 Oct 2018 17:59:02 +0200
Subject: [PATCH] =?UTF-8?q?Visibilit=C3=A0=20scarti/controlli=20condiziona?=
 =?UTF-8?q?le?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MP-TAB/DettaglioMacchina.aspx             |  4 ++--
 MP-TAB/DettaglioMacchina.aspx.cs          | 25 +++++++++++++++++++++--
 MP-TAB/DettaglioMacchina.aspx.designer.cs |  4 ++--
 MP-TAB/MP-TAB.csproj                      |  8 ++++++++
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/MP-TAB/DettaglioMacchina.aspx b/MP-TAB/DettaglioMacchina.aspx
index 7c4629ee..ce727e9e 100644
--- a/MP-TAB/DettaglioMacchina.aspx
+++ b/MP-TAB/DettaglioMacchina.aspx
@@ -30,10 +30,10 @@
         <uc4:mod_confProd ID="mod_confProd1" runat="server" />
         <div class="row">
           <div class="col-6">
-            <asp:HyperLink runat="server" ID="hlScarti" NavigateUrl="~/Scarti.aspx" CssClass="btn btn-info btn-lg btn-block"><i class="fa fa-bug"></i> Reg. SCARTI</asp:HyperLink>
+            <asp:HyperLink runat="server" ID="hlScarti" NavigateUrl="~/Scarti" CssClass="btn btn-info btn-lg btn-block"><i class="fa fa-bug"></i> Reg. SCARTI</asp:HyperLink>
           </div>
           <div class="col-6">
-            <asp:HyperLink runat="server" ID="hlCOntrolli" NavigateUrl="~/Controlli.aspx" CssClass="btn btn-primary btn-lg btn-block"><i class="fa fa-wrench"></i> Reg.CONTROLLI</asp:HyperLink>
+            <asp:HyperLink runat="server" ID="hlControlli" NavigateUrl="~/Controlli" CssClass="btn btn-primary btn-lg btn-block"><i class="fa fa-wrench"></i> Reg.CONTROLLI</asp:HyperLink>
           </div>
         </div>
         <%--<uc3:mod_regScarti runat="server" ID="mod_regScarti" />
diff --git a/MP-TAB/DettaglioMacchina.aspx.cs b/MP-TAB/DettaglioMacchina.aspx.cs
index 2035cb4f..19591386 100644
--- a/MP-TAB/DettaglioMacchina.aspx.cs
+++ b/MP-TAB/DettaglioMacchina.aspx.cs
@@ -1,7 +1,6 @@
 using SteamWare;
 using System;
 using System.Web.UI;
-using WebMasterPages;
 
 namespace MoonProTablet
 {
@@ -25,7 +24,9 @@ namespace MoonProTablet
     {
       if (!Page.IsPostBack)
       {
-        Session["TipoLink"] = "DetMacc";
+        memLayer.ML.setSessionVal("TipoLink", "DetMacc");
+        hlScarti.Visible = enableScarti;
+        hlControlli.Visible = enableControlli;
       }
       mod_confProd1.eh_newVal += mod_confProd1_eh_newVal;
       mod_confProd1.eh_reset += mod_confProd1_eh_reset;
@@ -48,5 +49,25 @@ namespace MoonProTablet
     {
       mod_dettMacchina1.doUpdate();
     }
+    /// <summary>
+    /// Verifica abilitazione gestione scarti
+    /// </summary>
+    public bool enableScarti
+    {
+      get
+      {
+        return memLayer.ML.cdvb("enableScarti");
+      }
+    }
+    /// <summary>
+    /// Verifica abilitazione gestione scarti
+    /// </summary>
+    public bool enableControlli
+    {
+      get
+      {
+        return memLayer.ML.cdvb("enableControlli");
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/MP-TAB/DettaglioMacchina.aspx.designer.cs b/MP-TAB/DettaglioMacchina.aspx.designer.cs
index 1ad76954..51074c40 100644
--- a/MP-TAB/DettaglioMacchina.aspx.designer.cs
+++ b/MP-TAB/DettaglioMacchina.aspx.designer.cs
@@ -58,13 +58,13 @@ namespace MoonProTablet {
         protected global::System.Web.UI.WebControls.HyperLink hlScarti;
         
         /// <summary>
-        /// Controllo hlCOntrolli.
+        /// Controllo hlControlli.
         /// </summary>
         /// <remarks>
         /// Campo generato automaticamente.
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.HyperLink hlCOntrolli;
+        protected global::System.Web.UI.WebControls.HyperLink hlControlli;
         
         /// <summary>
         /// Controllo mod_directLinks.
diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj
index 0c7e6b4e..95967276 100644
--- a/MP-TAB/MP-TAB.csproj
+++ b/MP-TAB/MP-TAB.csproj
@@ -399,6 +399,7 @@
     <Content Include="fonts\fontawesome-webfont.eot" />
     <Content Include="images\iconDic\IconGen.pdn" />
     <Content Include="Content\bloccoMacc.less" />
+    <Content Include="Reset.aspx" />
     <Content Include="Resources\Disegni\ND.docx" />
     <Content Include="Files\Disegni\ND.pdf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -672,6 +673,13 @@
     <Compile Include="RepProd_GG.aspx.designer.cs">
       <DependentUpon>RepProd_GG.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Reset.aspx.cs">
+      <DependentUpon>Reset.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Reset.aspx.designer.cs">
+      <DependentUpon>Reset.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Scarti.aspx.cs">
       <DependentUpon>Scarti.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>