From 5dc5d6c970e4cee517eaf517156d3d71db33e90b Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 20 Oct 2021 11:56:14 +0200
Subject: [PATCH] blocco approvazione timbrature da licenza

---
 .../WebUserControls/mod_approvaTimbr.ascx     |  2 +-
 .../WebUserControls/mod_approvaTimbr.ascx.cs  |  4 +-
 .../mod_approvaTimbr.ascx.designer.cs         | 40 +++++++++----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx
index caa9d6f..5db6738 100644
--- a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx
+++ b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx
@@ -32,7 +32,7 @@
             <Columns>
                 <asp:TemplateField>
                     <ItemTemplate>
-                        <asp:LinkButton runat="server" ID="lbApprova" Visible='<%# userCanApprove %>' Text="Approva" CommandArgument="approva" CommandName="Select" CssClass="btn btn-sm btn-success"><i class="fa fa-check" aria-hidden="true"></i></asp:LinkButton>
+                        <asp:LinkButton runat="server" ID="lbApprova" Visible='<%# userCanApprove && chkLicOk %>' Text="Approva" CommandArgument="approva" CommandName="Select" CssClass="btn btn-sm btn-success"><i class="fa fa-check" aria-hidden="true"></i></asp:LinkButton>
                     </ItemTemplate>
                 </asp:TemplateField>
                 <asp:TemplateField ItemStyle-HorizontalAlign="Left">
diff --git a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.cs b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.cs
index 8f014c4..c2572e2 100644
--- a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.cs
+++ b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.cs
@@ -11,7 +11,7 @@ using System.Data;
 
 namespace GPW_Admin.WebUserControls
 {
-    public partial class mod_approvaTimbr : System.Web.UI.UserControl
+    public partial class mod_approvaTimbr : BaseUserControl
     {
         #region Protected Properties
 
@@ -51,7 +51,7 @@ namespace GPW_Admin.WebUserControls
                 bool answ = false;
                 try
                 {
-                    answ = user_std.UtSn.userHasRight("GPW_admin");
+                    answ = user_std.UtSn.userHasRight("GPW_admin") && chkLicOk;
                 }
                 catch
                 { }
diff --git a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.designer.cs
index 3524e09..5882f8b 100644
--- a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.designer.cs
+++ b/GPW_Admin/WebUserControls/mod_approvaTimbr.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 GPW_Admin.WebUserControls
@@ -15,47 +15,47 @@ namespace GPW_Admin.WebUserControls
     {
 
         /// <summary>
-        /// Controllo filtroDip.
+        /// filtroDip 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::mod_filtro filtroDip;
 
         /// <summary>
-        /// Controllo odsDip.
+        /// odsDip 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 odsDip;
 
         /// <summary>
-        /// Controllo txtArrot.
+        /// txtArrot 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.TextBox txtArrot;
 
         /// <summary>
-        /// Controllo grView.
+        /// grView 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.GridView grView;
 
         /// <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;
     }