From d4d8fdb68982e918c26b3d6e511c253424dc133c Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 9 Jan 2021 08:43:32 +0100 Subject: [PATCH] Ancora fix grafici vari --- .../WebUserControls/mod_adminProgetti.ascx | 14 ++++---- .../WebUserControls/mod_approvaTimbr.ascx | 6 ++-- GPW_Admin/WebUserControls/mod_filtro.ascx | 2 +- GPW_Admin/WebUserControls/mod_spostaOre.ascx | 24 ++++++++----- GPW_Data/DS_Applicazione.Designer.cs | 32 +++++++++++++++-- GPW_Data/DS_Applicazione.xsd | 8 +++++ GPW_Data/DS_Applicazione.xss | 36 +++++++++---------- 7 files changed, 83 insertions(+), 39 deletions(-) diff --git a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx index 44c64ff..a552fc8 100644 --- a/GPW_Admin/WebUserControls/mod_adminProgetti.ascx +++ b/GPW_Admin/WebUserControls/mod_adminProgetti.ascx @@ -13,19 +13,19 @@
-
-
-
+
+
+
-
+
-
+
-
- +
+ Reset
diff --git a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx index 74cb601..e3b3573 100644 --- a/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx +++ b/GPW_Admin/WebUserControls/mod_approvaTimbr.ascx @@ -2,12 +2,12 @@ <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> -
-
+
+
-
+
diff --git a/GPW_Admin/WebUserControls/mod_filtro.ascx b/GPW_Admin/WebUserControls/mod_filtro.ascx index 725cd6c..e8603af 100644 --- a/GPW_Admin/WebUserControls/mod_filtro.ascx +++ b/GPW_Admin/WebUserControls/mod_filtro.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_filtro" CodeBehind="mod_filtro.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> -
+
diff --git a/GPW_Admin/WebUserControls/mod_spostaOre.ascx b/GPW_Admin/WebUserControls/mod_spostaOre.ascx index cdc2913..2d3b522 100644 --- a/GPW_Admin/WebUserControls/mod_spostaOre.ascx +++ b/GPW_Admin/WebUserControls/mod_spostaOre.ascx @@ -130,11 +130,11 @@
-
+
h
-
+
| @@ -149,15 +149,23 @@
-
- -
+
+
+
+ + | + + +
+
+
+
| - +
-
- +
+
diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs index 644dd7d..9928e1b 100644 --- a/GPW_Data/DS_Applicazione.Designer.cs +++ b/GPW_Data/DS_Applicazione.Designer.cs @@ -8420,6 +8420,8 @@ namespace GPW_data { private global::System.Data.DataColumn columnCognomeNome; + private global::System.Data.DataColumn columngruppo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public regAttDayExplDataTable() { @@ -8549,6 +8551,14 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn gruppoColumn { + get { + return this.columngruppo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -8586,7 +8596,7 @@ namespace GPW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public regAttDayExplRow AddregAttDayExplRow(int idxDipendente, System.DateTime inizio, System.DateTime fine, string descrizione, decimal oreTot, decimal importo, string RagSociale, string nomeProj, string nomeFase, decimal minTot, string CognomeNome) { + public regAttDayExplRow AddregAttDayExplRow(int idxDipendente, System.DateTime inizio, System.DateTime fine, string descrizione, decimal oreTot, decimal importo, string RagSociale, string nomeProj, string nomeFase, decimal minTot, string CognomeNome, string gruppo) { regAttDayExplRow rowregAttDayExplRow = ((regAttDayExplRow)(this.NewRow())); object[] columnValuesArray = new object[] { idxDipendente, @@ -8600,7 +8610,8 @@ namespace GPW_data { nomeFase, minTot, null, - CognomeNome}; + CognomeNome, + gruppo}; rowregAttDayExplRow.ItemArray = columnValuesArray; this.Rows.Add(rowregAttDayExplRow); return rowregAttDayExplRow; @@ -8642,6 +8653,7 @@ namespace GPW_data { this.columnminTot = base.Columns["minTot"]; this.columnidxRA = base.Columns["idxRA"]; this.columnCognomeNome = base.Columns["CognomeNome"]; + this.columngruppo = base.Columns["gruppo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8671,6 +8683,8 @@ namespace GPW_data { base.Columns.Add(this.columnidxRA); this.columnCognomeNome = new global::System.Data.DataColumn("CognomeNome", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCognomeNome); + this.columngruppo = new global::System.Data.DataColumn("gruppo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngruppo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidxRA}, true)); this.columnidxDipendente.AllowDBNull = false; @@ -8692,6 +8706,8 @@ namespace GPW_data { this.columnidxRA.Unique = true; this.columnCognomeNome.ReadOnly = true; this.columnCognomeNome.MaxLength = 101; + this.columngruppo.AllowDBNull = false; + this.columngruppo.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16126,6 +16142,17 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string gruppo { + get { + return ((string)(this[this.tableregAttDayExpl.gruppoColumn])); + } + set { + this[this.tableregAttDayExpl.gruppoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsdescrizioneNull() { @@ -30208,6 +30235,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi tableMapping.ColumnMappings.Add("minTot", "minTot"); tableMapping.ColumnMappings.Add("idxRA", "idxRA"); tableMapping.ColumnMappings.Add("CognomeNome", "CognomeNome"); + tableMapping.ColumnMappings.Add("gruppo", "gruppo"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd index 8fa845a..91bddbc 100644 --- a/GPW_Data/DS_Applicazione.xsd +++ b/GPW_Data/DS_Applicazione.xsd @@ -2614,6 +2614,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi + @@ -3662,6 +3663,13 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt + + + + + + + diff --git a/GPW_Data/DS_Applicazione.xss b/GPW_Data/DS_Applicazione.xss index 58f9683..701ce94 100644 --- a/GPW_Data/DS_Applicazione.xss +++ b/GPW_Data/DS_Applicazione.xss @@ -4,29 +4,29 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - - - + + + - - - - - + + + + + - + - - - - - - + + + + + + @@ -101,7 +101,7 @@ - + 279