diff --git a/GPW_Admin/WebUserControls/mod_adminClienti.ascx b/GPW_Admin/WebUserControls/mod_adminClienti.ascx
index 5bfdaa4..48cd7d3 100644
--- a/GPW_Admin/WebUserControls/mod_adminClienti.ascx
+++ b/GPW_Admin/WebUserControls/mod_adminClienti.ascx
@@ -206,7 +206,7 @@
         FilterExpression=" (RagSociale like '%{0}%') OR (indirizzo like '%{0}%') OR (citta like '%{0}%') OR (url like '%{0}%') OR (email like '%{0}%') OR (nota like '%{0}%') "
         OnUpdating="ods_Updating">
         <FilterParameters>
-            <asp:SessionParameter SessionField="valoreCercato" Type="String" />
+            <asp:SessionParameter SessionField="valoreSearch" Type="String" />
         </FilterParameters>
         <DeleteParameters>
             <asp:Parameter Name="Original_idxCliente" Type="Int32" />
diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
index 7c76e5d..5b7a964 100644
--- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
+++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
@@ -1,7 +1,7 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_adminDipendenti.ascx.cs" Inherits="GPW_Admin.WebUserControls.mod_adminDipendenti" %>
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
 <% if (false)
-   { %>
+    { %>
 <link href="~/css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 <div class="fontPiccolo">
@@ -195,8 +195,7 @@
                 <ItemTemplate>
                     <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandArgument='<%# Eval("idxDipendente") %>' CommandName="Delete"
                         ImageUrl="~/images/elimina_s.png" ToolTip='<%# traduci("Delete") %>' Visible='<%# delEnabled(Eval("idxDipendente")) %>' />
-                    <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete">
-                    </asp:ConfirmButtonExtender>
+                    <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete"></asp:ConfirmButtonExtender>
                 </ItemTemplate>
                 <EditItemTemplate>
                     <asp:ImageButton ID="imgUpdate2" runat="server" CausesValidation="False" CommandName="Update" ImageUrl="~/images/apply_s.png"
@@ -226,7 +225,7 @@
         UpdateMethod="updateQuery" FilterExpression=" (Cognome like '%{0}%') OR (Nome like '%{0}%') OR (CF like '%{0}%') OR (matricola like '%{0}%') OR (email like '%{0}%') "
         OnUpdating="ods_Updating">
         <FilterParameters>
-            <asp:SessionParameter SessionField="valoreCercato" Type="String" />
+            <asp:SessionParameter SessionField="valoreSearch" Type="String" />
         </FilterParameters>
         <DeleteParameters>
             <asp:Parameter Name="Original_idxDipendente" Type="Int32" />
@@ -266,4 +265,4 @@
     <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
 </div>
 <asp:ObjectDataSource ID="odsOrario" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData"
-    TypeName="GPW_data.DS_UtilityTableAdapters.v_selCodOrarioTableAdapter"></asp:ObjectDataSource>
+    TypeName="GPW_data.DS_UtilityTableAdapters.v_selCodOrarioTableAdapter"></asp:ObjectDataSource>
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.designer.cs
index eab553b..73e68af 100644
--- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.designer.cs
+++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.designer.cs
@@ -1,50 +1,52 @@
 //------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
+// <generato automaticamente>
+//     Codice generato da uno strumento.
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
+//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+//     il codice viene rigenerato. 
+// </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace GPW_Admin.WebUserControls {
-    
-    
-    public partial class mod_adminDipendenti {
-        
+namespace GPW_Admin.WebUserControls
+{
+
+
+    public partial class mod_adminDipendenti
+    {
+
         /// <summary>
-        /// grView control.
+        /// Controllo grView.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 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.GridView grView;
-        
+
         /// <summary>
-        /// ods control.
+        /// Controllo ods.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 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.ObjectDataSource ods;
-        
+
         /// <summary>
-        /// lblNumRec control.
+        /// Controllo lblNumRec.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 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.Label lblNumRec;
-        
+
         /// <summary>
-        /// odsOrario control.
+        /// Controllo odsOrario.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 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.ObjectDataSource odsOrario;
     }
diff --git a/GPW_Admin/WebUserControls/mod_adminFasi.ascx b/GPW_Admin/WebUserControls/mod_adminFasi.ascx
index 218dd6b..328dbef 100644
--- a/GPW_Admin/WebUserControls/mod_adminFasi.ascx
+++ b/GPW_Admin/WebUserControls/mod_adminFasi.ascx
@@ -2,7 +2,7 @@
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
 <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
 <% if (false)
-   { %>
+    { %>
 <link href="~/css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 <div class="filtro_1 fontPiccolo" style="white-space: nowrap; height: 30px;">
@@ -149,8 +149,8 @@
             </asp:TemplateField>
             <asp:TemplateField HeaderText="RealVsBudgetTime" SortExpression="budgetTime" ItemStyle-HorizontalAlign="Center" HeaderStyle-HorizontalAlign="Center">
                 <ItemTemplate>
-                    <asp:Panel runat="server" ID="pnlTime" CssClass='<%# colorByVal(Eval("totOre"),Eval("budgetTime"))%>' Style="font-size: 8pt;
-                        padding: .3em;" Width="8em" Visible='<%# Bind("enableTime") %>'>
+                    <asp:Panel runat="server" ID="pnlTime" CssClass='<%# colorByVal(Eval("totOre"),Eval("budgetTime"))%>' Style="font-size: 8pt; padding: .3em;"
+                        Width="8em" Visible='<%# Bind("enableTime") %>'>
                         <asp:Label ID="lblRealTime" runat="server" Text='<%# Eval("totOre","{0:#,###.##}") %>' ToolTip='<%# traduci("OreErogate") %>' />
                         /
                         <asp:Label ID="lblbudgetTime" runat="server" Text='<%# Eval("budgetTime","{0:#,###.##}") %>' ToolTip='<%# traduci("OreBudget") %>' />
@@ -182,8 +182,7 @@
                         &nbsp;
                         <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandArgument='<%# Eval("idxFase") %>' CommandName="Delete"
                             ImageUrl="~/images/elimina_m.png" ToolTip='<%# traduci("Delete") %>' Visible='<%# delEnabled(Eval("idxFase")) %>' />
-                        <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete">
-                        </asp:ConfirmButtonExtender>
+                        <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete"></asp:ConfirmButtonExtender>
                     </div>
                 </ItemTemplate>
                 <EditItemTemplate>
@@ -211,12 +210,12 @@
     </asp:GridView>
     <asp:ObjectDataSource ID="ods" runat="server" OnInserting="recuperaFooter" OldValuesParameterFormatString="Original_{0}"
         SelectMethod="getByIdxProgetto" TypeName="GPW_data.DS_ApplicazioneTableAdapters.AnagFasiTableAdapter" FilterExpression=" (nomeFase like '%{0}%') OR (descrizioneFase like '%{0}%') "
-        DeleteMethod="deleteQuery" InsertMethod="insertQuery" UpdateMethod="updateQuery" onupdating="ods_Updating">
+        DeleteMethod="deleteQuery" InsertMethod="insertQuery" UpdateMethod="updateQuery" OnUpdating="ods_Updating">
         <DeleteParameters>
             <asp:Parameter Name="Original_idxFase" Type="Int32" />
         </DeleteParameters>
         <FilterParameters>
-            <asp:SessionParameter SessionField="valoreCercato" Type="String" />
+            <asp:SessionParameter SessionField="valoreSearch" Type="String" />
         </FilterParameters>
         <InsertParameters>
             <asp:ControlParameter ControlID="filtroPrj" DefaultValue="0" PropertyName="valoreInt" Name="idxProgetto" Type="Int32" />
@@ -247,4 +246,4 @@
     <asp:Panel runat="server" ID="pnlDetRA">
         <asp:Label runat="server" ID="lblDet" Text="---" />
     </asp:Panel>
-</div>
+</div>
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/mod_adminOrario.ascx b/GPW_Admin/WebUserControls/mod_adminOrario.ascx
index e6edb5e..6285bf9 100644
--- a/GPW_Admin/WebUserControls/mod_adminOrario.ascx
+++ b/GPW_Admin/WebUserControls/mod_adminOrario.ascx
@@ -1,7 +1,7 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_adminOrario.ascx.cs" Inherits="GPW_Admin.WebUserControls.mod_adminOrario" %>
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
 <% if (false)
-   { %>
+    { %>
 <link href="~/css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 <div class="fontPiccolo">
@@ -47,8 +47,7 @@
             <asp:TemplateField ShowHeader="False">
                 <ItemTemplate>
                     <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandArgument='<%# Eval("codOrario") %>' CommandName="Delete" ImageUrl="~/images/elimina_s.png" ToolTip='<%# traduci("Delete") %>' Visible='<%# delEnabled(Eval("codOrario")) %>' />
-                    <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete">
-                    </asp:ConfirmButtonExtender>
+                    <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete"></asp:ConfirmButtonExtender>
                 </ItemTemplate>
                 <EditItemTemplate>
                     <asp:ImageButton ID="imgUpdate2" runat="server" CausesValidation="False" CommandName="Update" ImageUrl="~/images/apply_s.png" ToolTip='<%# traduci("Update")%>' />
@@ -71,13 +70,13 @@
         <SortedDescendingCellStyle CssClass="sortDescCell"></SortedDescendingCellStyle>
         <SortedDescendingHeaderStyle CssClass="sortDescHead"></SortedDescendingHeaderStyle>
     </asp:GridView>
-    <asp:ObjectDataSource ID="ods" runat="server" OnInserting="recuperaFooter" DeleteMethod="deleteQuery" 
-        InsertMethod="Insert" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" 
-        TypeName="GPW_data.DS_ApplicazioneTableAdapters.AnagOrariTableAdapter" UpdateMethod="updateQuery" 
-        FilterExpression=" (RagSociale like '%{0}%') OR (indirizzo like '%{0}%') OR (citta like '%{0}%') OR (url like '%{0}%') OR (email like '%{0}%') OR (nota like '%{0}%') " 
-        onupdating="ods_Updating">
+    <asp:ObjectDataSource ID="ods" runat="server" OnInserting="recuperaFooter" DeleteMethod="deleteQuery"
+        InsertMethod="Insert" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData"
+        TypeName="GPW_data.DS_ApplicazioneTableAdapters.AnagOrariTableAdapter" UpdateMethod="updateQuery"
+        FilterExpression=" (RagSociale like '%{0}%') OR (indirizzo like '%{0}%') OR (citta like '%{0}%') OR (url like '%{0}%') OR (email like '%{0}%') OR (nota like '%{0}%') "
+        OnUpdating="ods_Updating">
         <FilterParameters>
-            <asp:SessionParameter SessionField="valoreCercato" Type="String" />
+            <asp:SessionParameter SessionField="valoreSearch" Type="String" />
         </FilterParameters>
         <DeleteParameters>
             <asp:Parameter Name="Original_codOrario" Type="String" />
@@ -125,4 +124,4 @@
         </UpdateParameters>
     </asp:ObjectDataSource>
     <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
-</div>
+</div>
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx
index e4cdef4..2ee1f48 100644
--- a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx
+++ b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx
@@ -4,7 +4,7 @@
 <%@ Register Src="mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc2" %>
 <%@ Register Src="mod_dettaglioProgetto.ascx" TagName="mod_dettaglioProgetto" TagPrefix="uc3" %>
 <% if (false)
-   { %>
+    { %>
 <link href="~/css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 <div class="filtro_1 fontPiccolo" style="white-space: nowrap; height: 30px;">
@@ -119,8 +119,8 @@
                 </asp:TemplateField>
                 <asp:TemplateField HeaderText="RealVsBudgetTime" SortExpression="budgetTime" ItemStyle-HorizontalAlign="Center" HeaderStyle-HorizontalAlign="Center">
                     <ItemTemplate>
-                        <asp:Panel runat="server" ID="pnlTime" CssClass='<%# colorByVal(Eval("totOre"),Eval("budgetTime"))%>' Style="font-size: 9pt;
-                            padding: .3em;" Width="100px">
+                        <asp:Panel runat="server" ID="pnlTime" CssClass='<%# colorByVal(Eval("totOre"),Eval("budgetTime"))%>' Style="font-size: 9pt; padding: .3em;"
+                            Width="100px">
                             <b>
                                 <asp:Label ID="lblRealTime" runat="server" Text='<%# Eval("totOre","{0:#,###.##}") %>' ToolTip='<%# traduci("OreErogate") %>' /></b>
                             /
@@ -129,8 +129,8 @@
                         </asp:Panel>
                     </ItemTemplate>
                     <EditItemTemplate>
-                        <asp:Panel runat="server" ID="pnlTime" CssClass='<%# colorByVal(Eval("totOre"),Eval("budgetTime"))%>' Style="font-size: 9pt;
-                            padding: .3em;" Width="100px">
+                        <asp:Panel runat="server" ID="pnlTime" CssClass='<%# colorByVal(Eval("totOre"),Eval("budgetTime"))%>' Style="font-size: 9pt; padding: .3em;"
+                            Width="100px">
                             <b>
                                 <asp:Label ID="lblRealTime" runat="server" Text='<%# Eval("totOre","{0:#,###.##}") %>' ToolTip='<%# traduci("OreErogate") %>' /></b>
                             /
@@ -155,8 +155,7 @@
                     <ItemTemplate>
                         <asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandArgument='<%# Eval("idxProgetto") %>' CommandName="Delete"
                             ImageUrl="~/images/elimina_s.png" ToolTip='<%# traduci("Delete") %>' Visible='<%# delEnabled(Eval("idxProgetto")) %>' />
-                        <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete">
-                        </asp:ConfirmButtonExtender>
+                        <asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete"></asp:ConfirmButtonExtender>
                     </ItemTemplate>
                     <EditItemTemplate>
                         <asp:ImageButton ID="imgUpdate2" runat="server" CausesValidation="False" CommandName="Update" ImageUrl="~/images/apply_s.png"
@@ -180,13 +179,13 @@
         </asp:GridView>
         <asp:ObjectDataSource ID="ods" runat="server" OnInserting="recuperaFooter" DeleteMethod="deleteQuery" InsertMethod="insertQuery"
             OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GPW_data.DS_ApplicazioneTableAdapters.AnagProgettiTableAdapter"
-            UpdateMethod="updateQuery" FilterExpression=" (nomeProj like '%{0}%') OR (descrProj like '%{0}%')" 
-            onupdating="ods_Updating">
+            UpdateMethod="updateQuery" FilterExpression=" (nomeProj like '%{0}%') OR (descrProj like '%{0}%')"
+            OnUpdating="ods_Updating">
             <DeleteParameters>
                 <asp:Parameter Name="Original_idxProgetto" Type="Int32" />
             </DeleteParameters>
             <FilterParameters>
-                <asp:SessionParameter SessionField="valoreCercato" Type="String" />
+                <asp:SessionParameter SessionField="valoreSearch" Type="String" />
             </FilterParameters>
             <InsertParameters>
                 <asp:Parameter Name="idxCliente" Type="Int32" />
@@ -216,4 +215,4 @@
 </div>
 <div class="divSx" style="min-width: 175px;">
     <uc3:mod_dettaglioProgetto ID="mod_dettaglioProgetto1" runat="server" />
-</div>
+</div>
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/mod_ricercaGenerica.ascx.cs b/GPW_Admin/WebUserControls/mod_ricercaGenerica.ascx.cs
index b1b6b49..5cbf4ac 100644
--- a/GPW_Admin/WebUserControls/mod_ricercaGenerica.ascx.cs
+++ b/GPW_Admin/WebUserControls/mod_ricercaGenerica.ascx.cs
@@ -12,39 +12,14 @@ using SteamWare;
 
 public partial class mod_ricercaGenerica : ApplicationUserControl
 {
-
-    #region gestione eventi
+    #region Public Events
 
     public event EventHandler eh_nuovaRicerca;
 
-    #endregion
+    #endregion Public Events
 
-    #region area protected
+    #region Protected Properties
 
-    protected override void Page_Load(object sender, EventArgs e)
-    {
-        base.Page_Load(sender, e);
-        updateText();
-        btnCerca.Text = traduci("lblCerca");
-    }
-    /// <summary>
-    /// cambiato valore in ricerca
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected void txtCerca_TextChanged(object sender, EventArgs e)
-    {
-        salvaCerca();
-    }
-    /// <summary>
-    /// pressione del button di ricerca
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected void btnCerca_Click(object sender, EventArgs e)
-    {
-        salvaCerca();
-    }
     /// <summary>
     /// testo ricerca trimmato da spazi
     /// </summary>
@@ -59,6 +34,28 @@ public partial class mod_ricercaGenerica : ApplicationUserControl
             txtCerca.Text = value;
         }
     }
+
+    #endregion Protected Properties
+
+    #region Protected Methods
+
+    /// <summary>
+    /// pressione del button di ricerca
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void btnCerca_Click(object sender, EventArgs e)
+    {
+        salvaCerca();
+    }
+
+    protected override void Page_Load(object sender, EventArgs e)
+    {
+        base.Page_Load(sender, e);
+        updateText();
+        btnCerca.Text = traduci("lblCerca");
+    }
+
     /// <summary>
     /// effettua salvataggio ricerca
     /// </summary>
@@ -66,11 +63,11 @@ public partial class mod_ricercaGenerica : ApplicationUserControl
     {
         if (string.IsNullOrEmpty(testoRicerca))
         {
-            SteamWare.memLayer.ML.emptySessionVal("valoreCercato");
+            SteamWare.memLayer.ML.emptySessionVal("valoreSearch");
         }
         else
         {
-            SteamWare.memLayer.ML.setSessionVal("valoreCercato", testoRicerca);
+            SteamWare.memLayer.ML.setSessionVal("valoreSearch", testoRicerca);
             // raise dell'evento
             if (eh_nuovaRicerca != null)
             {
@@ -79,21 +76,30 @@ public partial class mod_ricercaGenerica : ApplicationUserControl
         }
     }
 
-    #endregion
+    /// <summary>
+    /// cambiato valore in ricerca
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    protected void txtCerca_TextChanged(object sender, EventArgs e)
+    {
+        salvaCerca();
+    }
 
-    #region area public
+    #endregion Protected Methods
+
+    #region Public Methods
 
     /// <summary>
     /// aggiorna il testo cercato
     /// </summary>
     public void updateText()
     {
-        if (!string.IsNullOrEmpty(memLayer.ML.StringSessionObj("valoreCercato")) && !Page.IsPostBack)
+        if (!string.IsNullOrEmpty(memLayer.ML.StringSessionObj("valoreSearch")) && !Page.IsPostBack)
         {
-            testoRicerca = SteamWare.memLayer.ML.StringSessionObj("valoreCercato");
+            testoRicerca = SteamWare.memLayer.ML.StringSessionObj("valoreSearch");
         }
     }
 
-    #endregion
-
-}
+    #endregion Public Methods
+}
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/mod_spostaOre.ascx b/GPW_Admin/WebUserControls/mod_spostaOre.ascx
index 95de6c5..47e35d8 100644
--- a/GPW_Admin/WebUserControls/mod_spostaOre.ascx
+++ b/GPW_Admin/WebUserControls/mod_spostaOre.ascx
@@ -4,7 +4,7 @@
 <%@ Register Src="mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc2" %>
 <%@ Register Src="mod_dateTime.ascx" TagName="mod_dateTime" TagPrefix="uc3" %>
 <% if (false)
-   { %>
+    { %>
 <link href="~/css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 <div class="filtro_1 fontPiccolo" style="white-space: nowrap; height: 28px; padding: 2px;">
@@ -12,8 +12,7 @@
         <div class="divSx">
             <uc1:mod_filtro ID="filtroDip" runat="server" filterUnchekText="mostraTutti" filterChekText="filtraDip" changeCheckEnabled="false"
                 changeCheckVisible="false" comboWidth="160" />
-            <asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter">
-            </asp:ObjectDataSource>
+            <asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter"></asp:ObjectDataSource>
         </div>
         <div class="divSx">
             <uc2:mod_periodoAnalisi ID="mod_periodoAnalisi1" runat="server" realtimeUpdate="true" />
@@ -181,7 +180,7 @@
         TypeName="GPW_data.DS_ApplicazioneTableAdapters.regAttDayExplTableAdapter" UpdateMethod="updateQuery" OnUpdating="odsRA_Updating"
         FilterExpression=" nomeFase LIKE '%{0}%' OR descrizione LIKE '%{0}%' ">
         <FilterParameters>
-            <asp:SessionParameter SessionField="valoreCercato" Type="String" />
+            <asp:SessionParameter SessionField="valoreSearch" Type="String" />
         </FilterParameters>
         <SelectParameters>
             <asp:ControlParameter ControlID="filtroDip" PropertyName="valoreInt" DefaultValue="0" Name="idxDipendente" Type="Int32" />
@@ -208,4 +207,4 @@
         </SelectParameters>
     </asp:ObjectDataSource>
     <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
-</div>
+</div>
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/mod_timbrMensili.ascx b/GPW_Admin/WebUserControls/mod_timbrMensili.ascx
index 8d29ff9..0522c51 100644
--- a/GPW_Admin/WebUserControls/mod_timbrMensili.ascx
+++ b/GPW_Admin/WebUserControls/mod_timbrMensili.ascx
@@ -3,96 +3,96 @@
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
 <%@ Register Src="mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc2" %>
 <% if (false)
-  { %>
+    { %>
 <link href="~/css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 <div class="filtro_1 fontPiccolo" style="height: 28px; padding: 2px;">
-  <div class="divSx fontPiccolo">
-    <div class="divSx">
-      <uc1:mod_filtro ID="filtroDip" runat="server" filterUnchekText="mostraTutti" filterChekText="filtraDip" changeCheckEnabled="false" changeCheckVisible="false" />
-      <asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getAttivi" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter"></asp:ObjectDataSource>
-    </div>
-    <div class="divSx">
-      &nbsp;
-    </div>
-    <div class="divSx">
-      <uc2:mod_periodoAnalisi ID="mod_periodoAnalisi1" runat="server" />
-    </div>
-  </div>
-  <div class="divDx">
-    <div class="divDx">
-      <asp:TextBox runat="server" ID="txtMinRedExtra" Width="3em" Visible="false" ToolTip="minuti di riduzione richiesti" Text="30" />
+    <div class="divSx fontPiccolo">
+        <div class="divSx">
+            <uc1:mod_filtro ID="filtroDip" runat="server" filterUnchekText="mostraTutti" filterChekText="filtraDip" changeCheckEnabled="false" changeCheckVisible="false" />
+            <asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getAttivi" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter"></asp:ObjectDataSource>
+        </div>
+        <div class="divSx">
+            &nbsp;
+        </div>
+        <div class="divSx">
+            <uc2:mod_periodoAnalisi ID="mod_periodoAnalisi1" runat="server" />
+        </div>
     </div>
     <div class="divDx">
-      <asp:RadioButtonList ID="rblComp" runat="server" RepeatDirection="Horizontal" AutoPostBack="True" OnSelectedIndexChanged="rblComp_SelectedIndexChanged" Visible="false">
-        <asp:ListItem Text="No" Value="0" Selected="True" />
-        <asp:ListItem Text="-> Perm" Value="1" />
-        <asp:ListItem Text="-> StrAss" Value="2" />
-      </asp:RadioButtonList>
+        <div class="divDx">
+            <asp:TextBox runat="server" ID="txtMinRedExtra" Width="3em" Visible="false" ToolTip="minuti di riduzione richiesti" Text="30" />
+        </div>
+        <div class="divDx">
+            <asp:RadioButtonList ID="rblComp" runat="server" RepeatDirection="Horizontal" AutoPostBack="True" OnSelectedIndexChanged="rblComp_SelectedIndexChanged" Visible="false">
+                <asp:ListItem Text="No" Value="0" Selected="True" />
+                <asp:ListItem Text="-> Perm" Value="1" />
+                <asp:ListItem Text="-> StrAss" Value="2" />
+            </asp:RadioButtonList>
+        </div>
     </div>
-  </div>
 </div>
 <div class="clearDiv fontPiccolo" style="text-align=: right;">
-  <asp:GridView ID="grView" runat="server" AllowSorting="True" AllowPaging="True" AutoGenerateColumns="False" CellPadding="4" DataSourceID="ods" ForeColor="#333333" GridLines="None" Width="100%" OnDataBound="grView_DataBound" DataKeyNames="Anno,Mese,idxDipendente">
-    <SortedAscendingCellStyle CssClass="sortAscCell" />
-    <SortedAscendingHeaderStyle CssClass="sortAscHead" />
-    <SortedDescendingCellStyle CssClass="sortDescCell" />
-    <SortedDescendingHeaderStyle CssClass="sortDescHead" />
-    <AlternatingRowStyle CssClass="alternatingRowStyle" />
-    <Columns>
-      <asp:BoundField DataField="Anno" HeaderText="Anno" SortExpression="Anno" ControlStyle-Width="7em" ReadOnly="True" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
-      <asp:BoundField DataField="Mese" HeaderText="Mese" SortExpression="Mese" ControlStyle-Width="21em" ReadOnly="True" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
-      <asp:BoundField DataField="CognomeNome" HeaderText="Dipendente" SortExpression="CognomeNome" ControlStyle-Width="1em" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
-      <asp:BoundField DataField="totOreOrd" HeaderText="totOreOrd" SortExpression="totOreOrd" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
-      <asp:BoundField DataField="totLav" HeaderText="totLav" SortExpression="totLav" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
-      <asp:BoundField DataField="totOreNonLav" HeaderText="totOreNonLav" SortExpression="totOreNonLav" ControlStyle-Width="2em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
-      <asp:BoundField DataField="totOrePerm" HeaderText="totOrePerm" SortExpression="totOrePerm" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
-      <%--<asp:TemplateField>
+    <asp:GridView ID="grView" runat="server" AllowSorting="True" AllowPaging="True" AutoGenerateColumns="False" CellPadding="4" DataSourceID="ods" ForeColor="#333333" GridLines="None" Width="100%" OnDataBound="grView_DataBound" DataKeyNames="Anno,Mese,idxDipendente">
+        <SortedAscendingCellStyle CssClass="sortAscCell" />
+        <SortedAscendingHeaderStyle CssClass="sortAscHead" />
+        <SortedDescendingCellStyle CssClass="sortDescCell" />
+        <SortedDescendingHeaderStyle CssClass="sortDescHead" />
+        <AlternatingRowStyle CssClass="alternatingRowStyle" />
+        <Columns>
+            <asp:BoundField DataField="Anno" HeaderText="Anno" SortExpression="Anno" ControlStyle-Width="7em" ReadOnly="True" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
+            <asp:BoundField DataField="Mese" HeaderText="Mese" SortExpression="Mese" ControlStyle-Width="21em" ReadOnly="True" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
+            <asp:BoundField DataField="CognomeNome" HeaderText="Dipendente" SortExpression="CognomeNome" ControlStyle-Width="1em" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
+            <asp:BoundField DataField="totOreOrd" HeaderText="totOreOrd" SortExpression="totOreOrd" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
+            <asp:BoundField DataField="totLav" HeaderText="totLav" SortExpression="totLav" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
+            <asp:BoundField DataField="totOreNonLav" HeaderText="totOreNonLav" SortExpression="totOreNonLav" ControlStyle-Width="2em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
+            <asp:BoundField DataField="totOrePerm" HeaderText="totOrePerm" SortExpression="totOrePerm" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
+            <%--<asp:TemplateField>
                 <ItemTemplate>
                     <asp:ImageButton runat="server" ID="btnFixPerm" ToolTip="Compensazione permessi" CommandName="Update" ImageUrl="~/images/arrowLeft_m.png" Visible='<%# compPermVisible(Eval("totOreStra"),Eval("totOrePerm")) %>' />
                     <asp:ConfirmButtonExtender ID="cbebtnFixPerm" runat="server" ConfirmText="Procedo con la compensazione straordinari -> permessi?" TargetControlID="btnFixPerm">
                     </asp:ConfirmButtonExtender>
                 </ItemTemplate>
             </asp:TemplateField>--%>
-      <%--<asp:TemplateField>
+            <%--<asp:TemplateField>
                 <ItemTemplate>
                     <asp:ImageButton runat="server" ID="btnReduceExtra" ToolTip="Riduci straordinari" CommandName="Update" ImageUrl="~/images/arrowRight_m.png" Visible='<%# reduceVisible(Eval("totOreStra"),Eval("totNonLav")) %>' />
                     <asp:ConfirmButtonExtender ID="cbeReduceExtra" runat="server" ConfirmText="Procedo con la rettifica degli straordinari per i minuti indicati?" TargetControlID="btnReduceExtra">
                     </asp:ConfirmButtonExtender>
                 </ItemTemplate>
             </asp:TemplateField>--%>
-      <asp:BoundField DataField="totOreFer" HeaderText="totOreFer" SortExpression="totOreFer" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
-      <asp:BoundField DataField="totOreFest" HeaderText="totOreFest" SortExpression="totOreFest" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
-      <asp:BoundField DataField="totOreStra" HeaderText="totOreStra" SortExpression="totOreStra" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
-    </Columns>
-    <EditRowStyle CssClass="editRowStyle" />
-    <FooterStyle CssClass="footerStyle" ForeColor="White" />
-    <HeaderStyle CssClass="headerStyle" ForeColor="White" />
-    <PagerStyle CssClass="pagerStyle" ForeColor="White" />
-    <RowStyle CssClass="rowStyle" />
-    <SelectedRowStyle CssClass="selectedRowStyle" ForeColor="#333333" />
-    <SortedAscendingCellStyle CssClass="sortAscCell"></SortedAscendingCellStyle>
-    <SortedAscendingHeaderStyle CssClass="sortAscHead"></SortedAscendingHeaderStyle>
-    <SortedDescendingCellStyle CssClass="sortDescCell"></SortedDescendingCellStyle>
-    <SortedDescendingHeaderStyle CssClass="sortDescHead"></SortedDescendingHeaderStyle>
-  </asp:GridView>
-  <asp:ObjectDataSource ID="ods" runat="server" OnInserting="recuperaFooter" OldValuesParameterFormatString="{0}" SelectMethod="GetData" TypeName="GPW_data.DS_ApplicazioneTableAdapters.TimbMeseExplTableAdapter" FilterExpression=" (RagSociale like '%{0}%') OR (indirizzo like '%{0}%') OR (citta like '%{0}%') OR (url like '%{0}%') OR (email like '%{0}%') OR (nota like '%{0}%') " UpdateMethod="CompStraord">
-    <FilterParameters>
-      <asp:SessionParameter SessionField="valoreCercato" Type="String" />
-    </FilterParameters>
-    <SelectParameters>
-      <asp:SessionParameter Name="inizio" SessionField="_inizio" Type="DateTime" />
-      <asp:SessionParameter Name="fine" SessionField="_fine" Type="DateTime" />
-      <asp:SessionParameter DefaultValue="0" Name="idxDipendente" SessionField="idxDip_sel" Type="Int32" />
-    </SelectParameters>
-    <UpdateParameters>
-      <asp:Parameter Name="Anno" Type="Int32" />
-      <asp:Parameter Name="Mese" Type="Int32" />
-      <asp:Parameter Name="idxDipendente" Type="Int32" />
-      <%--<asp:SessionParameter DefaultValue="0" Name="tipoCom" SessionField="tipoComp" Type="Int32" />--%>
-      <asp:ControlParameter Name="tipoCom" ControlID="rblComp" PropertyName="SelectedValue" Type="Int32" />
-      <asp:ControlParameter Name="minuti" ControlID="txtMinRedExtra" PropertyName="Text" Type="Int32" />
-    </UpdateParameters>
-  </asp:ObjectDataSource>
-  <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
-</div>
+            <asp:BoundField DataField="totOreFer" HeaderText="totOreFer" SortExpression="totOreFer" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
+            <asp:BoundField DataField="totOreFest" HeaderText="totOreFest" SortExpression="totOreFest" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
+            <asp:BoundField DataField="totOreStra" HeaderText="totOreStra" SortExpression="totOreStra" ControlStyle-Width="1em" ReadOnly="True" DataFormatString="{0:0.##}" ItemStyle-HorizontalAlign="Right" HeaderStyle-HorizontalAlign="Right" />
+        </Columns>
+        <EditRowStyle CssClass="editRowStyle" />
+        <FooterStyle CssClass="footerStyle" ForeColor="White" />
+        <HeaderStyle CssClass="headerStyle" ForeColor="White" />
+        <PagerStyle CssClass="pagerStyle" ForeColor="White" />
+        <RowStyle CssClass="rowStyle" />
+        <SelectedRowStyle CssClass="selectedRowStyle" ForeColor="#333333" />
+        <SortedAscendingCellStyle CssClass="sortAscCell"></SortedAscendingCellStyle>
+        <SortedAscendingHeaderStyle CssClass="sortAscHead"></SortedAscendingHeaderStyle>
+        <SortedDescendingCellStyle CssClass="sortDescCell"></SortedDescendingCellStyle>
+        <SortedDescendingHeaderStyle CssClass="sortDescHead"></SortedDescendingHeaderStyle>
+    </asp:GridView>
+    <asp:ObjectDataSource ID="ods" runat="server" OnInserting="recuperaFooter" OldValuesParameterFormatString="{0}" SelectMethod="GetData" TypeName="GPW_data.DS_ApplicazioneTableAdapters.TimbMeseExplTableAdapter" FilterExpression=" (RagSociale like '%{0}%') OR (indirizzo like '%{0}%') OR (citta like '%{0}%') OR (url like '%{0}%') OR (email like '%{0}%') OR (nota like '%{0}%') " UpdateMethod="CompStraord">
+        <FilterParameters>
+            <asp:SessionParameter SessionField="valoreSearch" Type="String" />
+        </FilterParameters>
+        <SelectParameters>
+            <asp:SessionParameter Name="inizio" SessionField="_inizio" Type="DateTime" />
+            <asp:SessionParameter Name="fine" SessionField="_fine" Type="DateTime" />
+            <asp:SessionParameter DefaultValue="0" Name="idxDipendente" SessionField="idxDip_sel" Type="Int32" />
+        </SelectParameters>
+        <UpdateParameters>
+            <asp:Parameter Name="Anno" Type="Int32" />
+            <asp:Parameter Name="Mese" Type="Int32" />
+            <asp:Parameter Name="idxDipendente" Type="Int32" />
+            <%--<asp:SessionParameter DefaultValue="0" Name="tipoCom" SessionField="tipoComp" Type="Int32" />--%>
+            <asp:ControlParameter Name="tipoCom" ControlID="rblComp" PropertyName="SelectedValue" Type="Int32" />
+            <asp:ControlParameter Name="minuti" ControlID="txtMinRedExtra" PropertyName="Text" Type="Int32" />
+        </UpdateParameters>
+    </asp:ObjectDataSource>
+    <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
+</div>
\ No newline at end of file