From beb91f7a293669692b52b821de38e72b932f26e2 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 18 Jan 2021 09:48:53 +0100
Subject: [PATCH 1/2] fix segnalati da Mara

---
 .../WebUserControls/mod_adminProgetti.ascx    |   8 +-
 .../WebUserControls/mod_approvaTimbr.ascx     |   6 +-
 .../WebUserControls/mod_approvaTimbr.ascx.cs  |   5 +
 .../mod_approvaTimbr.ascx.designer.cs         |  86 ++++-----
 .../mod_dettaglioProgetto.ascx                | 175 +++++++++---------
 .../mod_dettaglioProgetto.ascx.designer.cs    |  36 ++--
 6 files changed, 161 insertions(+), 155 deletions(-)

diff --git a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx
index d93f087..9610b6b 100644
--- a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx
+++ b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx
@@ -37,7 +37,7 @@
     </div>
 </div>
 <div class="row table-default small">
-    <div class="col-12">
+    <div class="col-12 col-md-9 col-lg-10">
         <asp:GridView ID="grView" runat="server" AllowSorting="True" AllowPaging="True" AutoGenerateColumns="False" CssClass="table table-sm table-striped" DataKeyNames="idxProgetto" DataSourceID="ods" OnDataBound="grView_DataBound" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowUpdating="grView_RowUpdating">
             <EditRowStyle CssClass="table-primary" />
             <SelectedRowStyle CssClass="table-info" />
@@ -215,7 +215,7 @@
         <asp:ObjectDataSource runat="server" ID="odsGruppi" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData"
             TypeName="GPW_data.DS_UtilityTableAdapters.v_selGruppiTableAdapter"></asp:ObjectDataSource>
     </div>
-</div>
-<div class="divSx" style="min-width: 175px;">
-    <uc3:mod_dettaglioProgetto ID="mod_dettaglioProgetto1" runat="server" />
+    <div class="col-12 col-md-3 col-lg-2">
+        <uc3:mod_dettaglioProgetto ID="mod_dettaglioProgetto1" runat="server" />
+    </div>
 </div>
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx
index e3b3573..caa9d6f 100644
--- a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx
+++ b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx
@@ -5,7 +5,11 @@
 <div class="d-flex small table-secondary">
     <div class="px-2">
         <uc1:mod_filtro ID="filtroDip" runat="server" filterUnchekText="mostraTutti" filterChekText="filtraDip" />
-        <asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getAttivi" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter"></asp:ObjectDataSource>
+        <asp:ObjectDataSource ID="odsDip" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GPW_data.DS_UtilityTableAdapters.v_selDipendentiTableAdapter">
+            <SelectParameters>
+                <asp:Parameter DefaultValue="false" Name="Conditio" Type="Boolean" />
+            </SelectParameters>
+        </asp:ObjectDataSource>
     </div>
     <div class="px-2">
         <label for="arrot">
diff --git a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.cs b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.cs
index 39fb726..8f014c4 100644
--- a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.cs
+++ b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.cs
@@ -97,6 +97,11 @@ namespace GPW_Admin.WebUserControls
 
         #region Protected Methods
 
+        protected void chkshowAll_CheckedChanged(object sender, EventArgs e)
+        {
+            filtroDip.ods = odsDip;
+        }
+
         protected void grView_PageIndexChanged(object sender, EventArgs e)
         {
             // imposto ods
diff --git a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.designer.cs
index ed685b9..3524e09 100644
--- a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.designer.cs
+++ b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx.designer.cs
@@ -11,52 +11,52 @@ namespace GPW_Admin.WebUserControls
 {
 
 
-  public partial class mod_approvaTimbr
-  {
+    public partial class mod_approvaTimbr
+    {
 
-    /// <summary>
-    /// Controllo filtroDip.
-    /// </summary>
-    /// <remarks>
-    /// Campo generato automaticamente.
-    /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-    /// </remarks>
-    protected global::mod_filtro filtroDip;
+        /// <summary>
+        /// Controllo filtroDip.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::mod_filtro filtroDip;
 
-    /// <summary>
-    /// Controllo odsDip.
-    /// </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.ObjectDataSource odsDip;
+        /// <summary>
+        /// Controllo odsDip.
+        /// </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.ObjectDataSource odsDip;
 
-    /// <summary>
-    /// Controllo txtArrot.
-    /// </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.TextBox txtArrot;
+        /// <summary>
+        /// Controllo txtArrot.
+        /// </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.TextBox txtArrot;
 
-    /// <summary>
-    /// Controllo grView.
-    /// </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.GridView grView;
+        /// <summary>
+        /// Controllo grView.
+        /// </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.GridView grView;
 
-    /// <summary>
-    /// Controllo ods.
-    /// </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.ObjectDataSource ods;
-  }
+        /// <summary>
+        /// Controllo ods.
+        /// </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.ObjectDataSource ods;
+    }
 }
diff --git a/GPW_Admin/WebUserControls/mod_dettaglioProgetto.ascx b/GPW_Admin/WebUserControls/mod_dettaglioProgetto.ascx
index 3329931..bd6dc23 100644
--- a/GPW_Admin/WebUserControls/mod_dettaglioProgetto.ascx
+++ b/GPW_Admin/WebUserControls/mod_dettaglioProgetto.ascx
@@ -1,107 +1,102 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettaglioProgetto.ascx.cs" Inherits="GPW_Admin.WebUserControls.mod_dettaglioProgetto" %>
-<% if (false)
-   { %>
-<link href="~/css/Style.css" rel="stylesheet" type="text/css" />
-<% } %>
-<asp:FormView ID="fmView" runat="server" DataSourceID="ods">
+
+<asp:FormView ID="fmView" runat="server" DataSourceID="ods" Width="100%">
     <ItemTemplate>
-        <div class="dataBlockHeader">
-            Resoconto progetto
-        </div>
-        <div class="dataBlock">
-            <div class="blockSizeSmallest">
-                <div class="dataBlockSx">
-                    <div class="dataBlockLabel">
-                        Budget:
+
+        <div class="card border border-info">
+            <div class="card-header bg-info text-light">
+                <h5>Resoconto progetto</h5>
+            </div>
+            <div class="card-body">
+                <div class="row">
+                    <div class="col-6 text-left">
+                        <div class="text-secondary">
+                            Budget:
+                        </div>
+                        <div class="font-weight-bold">
+                            <asp:Label ID="oreBudgetLabel" runat="server" Text='<%# Bind("oreBudget","{0:0.##} h") %>' />
+                        </div>
                     </div>
-                    <div class="dataBlockValue">
-                        <asp:Label ID="oreBudgetLabel" runat="server" Text='<%# Bind("oreBudget","{0:0.##} h") %>' />
+                    <div class="col-6 text-right">
+                        <div class="text-secondary">
+                            Attivo:
+                        </div>
+                        <div class="font-weight-bold">
+                            <asp:CheckBox runat="server" ID="chkAttivo" Checked='<%# Bind("Attivo") %>' AutoPostBack="true" OnCheckedChanged="chkAttivo_CheckedChanged" Enabled='<%# isWritable() %>' />
+                        </div>
                     </div>
                 </div>
-                <div class="dataBlockDx">
-                    <div class="dataBlockLabel">
-                        Attivo:
+                <div class="row">
+                    <div class="col-6 text-left">
+                        <div class="text-secondary">
+                            Erogate:
+                        </div>
+                        <div class="font-weight-bold">
+                            <asp:Label ID="oreTotLabel" runat="server" Text='<%# Bind("oreTot","{0:0.##} h") %>' />
+                        </div>
                     </div>
-                    <div class="dataBlockValue">
-                        <asp:CheckBox runat="server" ID="chkAttivo" Checked='<%# Bind("Attivo") %>' AutoPostBack="true" OnCheckedChanged="chkAttivo_CheckedChanged" Enabled='<%# isWritable() %>' />
+                    <div class="col-6 text-right">
+                        <div class="text-secondary">
+                            % budget
+                        </div>
+                        <div class="font-weight-bold">
+                            <asp:Label ID="lblPercErogate" runat="server" Text='<%# percRatio(Eval("oreTot"),Eval("oreBudget")) %>' />
+                        </div>
+                    </div>
+                    <div class="col-6 text-left">
+                        <div class="text-secondary">
+                            Mese corr:
+                        </div>
+                        <div class="font-weight-bold">
+                            <asp:Label ID="oreMeseLabel" runat="server" Text='<%# Bind("oreMese","{0:0.##} h") %>' />
+                        </div>
+                    </div>
+                    <div class="col-6 text-right">
+                        <div class="text-secondary">
+                            % erogate
+                        </div>
+                        <div class="font-weight-bold">
+                            <asp:Label ID="lblPercMese" runat="server" Text='<%# percRatio(Eval("oreMese"),Eval("oreTot")) %>' />
+                        </div>
                     </div>
                 </div>
-                <div class="dataBlockReset">
-                </div>
-                <div class="dataBlockSx">
-                    <div class="dataBlockLabel">
-                        Erogate:
+                <div class="row">
+
+                    <div class="col-6 text-left">
+                        <div class="text-secondary">
+                            Mese prec:
+                        </div>
+                        <div class="font-weight-bold">
+                            <asp:Label ID="oreMesePrecLabel" runat="server" Text='<%# Bind("oreMesePrec","{0:0.##} h") %>' />
+                        </div>
                     </div>
-                    <div class="dataBlockValue">
-                        <asp:Label ID="oreTotLabel" runat="server" Text='<%# Bind("oreTot","{0:0.##} h") %>' />
+                    <div class="col-6 text-right">
+                        <div class="text-secondary">
+                            % erogate
+                        </div>
+                        <div class="font-weight-bold">
+                            <asp:Label ID="lblPercMesePrec" runat="server" Text='<%# percRatio(Eval("oreMesePrec"),Eval("oreTot")) %>' />
+                        </div>
                     </div>
                 </div>
-                <div class="dataBlockDx">
-                    <div class="dataBlockLabel">
-                        % budget
+                <div class="row">
+
+                    <div class="col-6 text-left">
+                        <div class="text-secondary">
+                            Starred
+                        </div>
                     </div>
-                    <div class="dataBlockValue">
-                        <asp:Label ID="lblPercErogate" runat="server" Text='<%# percRatio(Eval("oreTot"),Eval("oreBudget")) %>' />
+                    <div class="col-6 text-right">
+                        <div class="text-secondary">
+                            <asp:CheckBox runat="server" ID="chkStarred" Checked='<%# Bind("starred") %>' AutoPostBack="true" OnCheckedChanged="chkStarred_CheckedChanged" Enabled='<%# isWritable() %>' />
+                        </div>
                     </div>
                 </div>
-                <div class="dataBlockReset">
-                </div>
-                <div class="dataBlockSx">
-                    <div class="dataBlockLabel">
-                        Mese corr:
+                <div class="row">
+
+                    <div class="col-12">
+                        <asp:Button runat="server" ID="btnFasi" Text="Dettaglio Fasi" OnClick="btnFasi_Click" CssClass="btn btn-sm btn-success btn-block" />
                     </div>
-                    <div class="dataBlockValue">
-                        <asp:Label ID="oreMeseLabel" runat="server" Text='<%# Bind("oreMese","{0:0.##} h") %>' />
-                    </div>
-                </div>
-                <div class="dataBlockDx">
-                    <div class="dataBlockLabel">
-                        % erogate
-                    </div>
-                    <div class="dataBlockValue">
-                        <asp:Label ID="lblPercMese" runat="server" Text='<%# percRatio(Eval("oreMese"),Eval("oreTot")) %>' />
-                    </div>
-                </div>
-                <div class="dataBlockReset">
-                </div>
-                <div class="dataBlockSx">
-                    <div class="dataBlockLabel">
-                        Mese prec:
-                    </div>
-                    <div class="dataBlockValue">
-                        <asp:Label ID="oreMesePrecLabel" runat="server" Text='<%# Bind("oreMesePrec","{0:0.##} h") %>' />
-                    </div>
-                </div>
-                <div class="dataBlockDx">
-                    <div class="dataBlockLabel">
-                        % erogate
-                    </div>
-                    <div class="dataBlockValue">
-                        <asp:Label ID="lblPercMesePrec" runat="server" Text='<%# percRatio(Eval("oreMesePrec"),Eval("oreTot")) %>' />
-                    </div>
-                </div>
-                <div class="dataBlockReset">
-                </div>
-                 <div class="dataBlockSx">
-                    <div class="dataBlockLabel">
-                        Starred
-                    </div>
-                    <%--<div class="dataBlockValue">
-                        <asp:Label ID="Label1" runat="server" Text='<%# Bind("oreMesePrec","{0:0.##} h") %>' />
-                    </div>--%>
-                </div>
-                <div class="dataBlockDx">
-                    <div class="dataBlockLabel">
-                        <asp:CheckBox runat="server" ID="chkStarred" Checked='<%# Bind("starred") %>' AutoPostBack="true" OnCheckedChanged="chkStarred_CheckedChanged" Enabled='<%# isWritable() %>' />
-                    </div>
-                    <%--<div class="dataBlockValue">
-                        <asp:Label ID="Label2" runat="server" Text='<%# percRatio(Eval("oreMesePrec"),Eval("oreTot")) %>' />
-                    </div>--%>
-                </div>
-                <div class="dataBlockReset">
-                </div>
-                <div class="dataBlockBtn">
-                    <asp:Button runat="server" ID="btnFasi" Text="Dettaglio Fasi" OnClick="btnFasi_Click" CssClass="btnNaviga" />
                 </div>
             </div>
         </div>
@@ -111,4 +106,4 @@
     <SelectParameters>
         <asp:SessionParameter DefaultValue="0" Name="idxProgetto" SessionField="idxProgetto_sel" Type="Int32" />
     </SelectParameters>
-</asp:ObjectDataSource>
+</asp:ObjectDataSource>
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/mod_dettaglioProgetto.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_dettaglioProgetto.ascx.designer.cs
index df350d1..e9c8853 100644
--- a/GPW_Admin/WebUserControls/mod_dettaglioProgetto.ascx.designer.cs
+++ b/GPW_Admin/WebUserControls/mod_dettaglioProgetto.ascx.designer.cs
@@ -1,32 +1,34 @@
 //------------------------------------------------------------------------------
-// <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_dettaglioProgetto {
-        
+namespace GPW_Admin.WebUserControls
+{
+
+
+    public partial class mod_dettaglioProgetto
+    {
+
         /// <summary>
-        /// fmView control.
+        /// Controllo fmView.
         /// </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.FormView fmView;
-        
+
         /// <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;
     }

From 71e795d032875b0d77a582fcbfb49a798b2c2832 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 18 Jan 2021 09:48:59 +0100
Subject: [PATCH 2/2] New rel

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 61ed071..2d4dbe9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
       steps {
         /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
         script {
-          withEnv(['NEXT_BUILD_NUMBER=4142']) {
+          withEnv(['NEXT_BUILD_NUMBER=4143']) {
             // env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
             env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
               env.APP_NAME = 'GPW'