From 6a9165ca6405c1dcb3044ae68221d3d96cee7553 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Sat, 14 Jul 2018 12:23:22 +0200 Subject: [PATCH] inserita visualizzazione bozza filtraggio interventi x condominio --- Data/DS_app.Designer.cs | 85 ++++++++++++++++--- Data/DS_app.xsd | 17 +++- PUB/WebUserContols/mod_richiesteList.ascx | 69 ++++++++++++--- .../mod_richiesteList.ascx.designer.cs | 18 ++++ 4 files changed, 164 insertions(+), 25 deletions(-) diff --git a/Data/DS_app.Designer.cs b/Data/DS_app.Designer.cs index 0449f5c..44723dc 100644 --- a/Data/DS_app.Designer.cs +++ b/Data/DS_app.Designer.cs @@ -3260,6 +3260,8 @@ namespace Data { private global::System.Data.DataColumn columnidxRichiesta; + private global::System.Data.DataColumn columnidxStato; + private global::System.Data.DataColumn columnidxCond; private global::System.Data.DataColumn columnidxFornitore; @@ -3349,6 +3351,14 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn idxStatoColumn { + get { + return this.columnidxStato; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn idxCondColumn { @@ -3579,6 +3589,7 @@ namespace Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public ElencolRichRow AddElencolRichRow( + int idxStato, int idxCond, int idxFornitore, string cod_fornitore, @@ -3606,6 +3617,7 @@ namespace Data { ElencolRichRow rowElencolRichRow = ((ElencolRichRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, + idxStato, idxCond, idxFornitore, cod_fornitore, @@ -3660,6 +3672,7 @@ namespace Data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] internal void InitVars() { this.columnidxRichiesta = base.Columns["idxRichiesta"]; + this.columnidxStato = base.Columns["idxStato"]; this.columnidxCond = base.Columns["idxCond"]; this.columnidxFornitore = base.Columns["idxFornitore"]; this.columncod_fornitore = base.Columns["cod_fornitore"]; @@ -3691,6 +3704,8 @@ namespace Data { private void InitClass() { this.columnidxRichiesta = new global::System.Data.DataColumn("idxRichiesta", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnidxRichiesta); + this.columnidxStato = new global::System.Data.DataColumn("idxStato", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidxStato); this.columnidxCond = new global::System.Data.DataColumn("idxCond", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnidxCond); this.columnidxFornitore = new global::System.Data.DataColumn("idxFornitore", typeof(int), null, global::System.Data.MappingType.Element); @@ -3747,6 +3762,7 @@ namespace Data { this.columnidxRichiesta.AllowDBNull = false; this.columnidxRichiesta.ReadOnly = true; this.columnidxRichiesta.Unique = true; + this.columnidxStato.AllowDBNull = false; this.columnidxCond.AllowDBNull = false; this.columnidxFornitore.AllowDBNull = false; this.columncod_fornitore.MaxLength = 11; @@ -5559,6 +5575,17 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public int idxStato { + get { + return ((int)(this[this.tableElencolRich.idxStatoColumn])); + } + set { + this[this.tableElencolRich.idxStatoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int idxCond { @@ -8769,6 +8796,7 @@ SELECT idxFornitore, idxArea, Attivazione FROM AssF2A WHERE (idxArea = @idxArea) tableMapping.SourceTable = "Table"; tableMapping.DataSetTable = "ElencolRich"; tableMapping.ColumnMappings.Add("idxRichiesta", "idxRichiesta"); + tableMapping.ColumnMappings.Add("idxStato", "idxStato"); tableMapping.ColumnMappings.Add("idxCond", "idxCond"); tableMapping.ColumnMappings.Add("idxFornitore", "idxFornitore"); tableMapping.ColumnMappings.Add("cod_fornitore", "cod_fornitore"); @@ -8806,25 +8834,33 @@ SELECT idxFornitore, idxArea, Attivazione FROM AssF2A WHERE (idxArea = @idxArea) [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT idxRichiesta, idxCond, idxFornitore, cod_fornitore, cod_cond, nom_cond, dataRich, codCollabRich, genContatto, telContatto, messaggio, note, iscritta, ricevuto, data_ricevuto, risolto, data_risolto, fattura, data_fattura, preventivo, + this._commandCollection[0].CommandText = @"SELECT idxRichiesta, idxStato, idxCond, idxFornitore, cod_fornitore, cod_cond, nom_cond, dataRich, codCollabRich, genContatto, telContatto, messaggio, note, iscritta, ricevuto, data_ricevuto, risolto, data_risolto, fattura, data_fattura, preventivo, data_inizio_preventivo, data_fine_preventivo, primo_controllo, secondo_controllo, controllo_temporale FROM v_ElencolRich"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "dbo.stp_ER_InsertQuery"; + this._commandCollection[1].CommandText = "dbo.stp_ER_getByCond"; this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCond", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFornitore", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataRich", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codCollabRich", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@genContatto", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@telContatto", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@messaggio", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minStato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maxStato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_ER_InsertQuery"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCond", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFornitore", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataRich", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@codCollabRich", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@genContatto", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@telContatto", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@messaggio", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8851,11 +8887,40 @@ FROM v_ElencolRich"; return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_app.ElencolRichDataTable getByCondStato(global::System.Nullable idxCond, global::System.Nullable minStato, global::System.Nullable maxStato) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((idxCond.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxCond.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((minStato.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(minStato.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((maxStato.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((int)(maxStato.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + DS_app.ElencolRichDataTable dataTable = new DS_app.ElencolRichDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int InsertQuery(global::System.Nullable idxCond, global::System.Nullable idxFornitore, global::System.Nullable dataRich, string codCollabRich, string genContatto, string telContatto, string messaggio) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; if ((idxCond.HasValue == true)) { command.Parameters[1].Value = ((int)(idxCond.Value)); } diff --git a/Data/DS_app.xsd b/Data/DS_app.xsd index cef2c32..83b86e2 100644 --- a/Data/DS_app.xsd +++ b/Data/DS_app.xsd @@ -450,7 +450,7 @@ FROM v_AssF2C - SELECT idxRichiesta, idxCond, idxFornitore, cod_fornitore, cod_cond, nom_cond, dataRich, codCollabRich, genContatto, telContatto, messaggio, note, iscritta, ricevuto, data_ricevuto, risolto, data_risolto, fattura, data_fattura, preventivo, + SELECT idxRichiesta, idxStato, idxCond, idxFornitore, cod_fornitore, cod_cond, nom_cond, dataRich, codCollabRich, genContatto, telContatto, messaggio, note, iscritta, ricevuto, data_ricevuto, risolto, data_risolto, fattura, data_fattura, preventivo, data_inizio_preventivo, data_fine_preventivo, primo_controllo, secondo_controllo, controllo_temporale FROM v_ElencolRich @@ -460,6 +460,7 @@ FROM v_ElencolRich + @@ -486,6 +487,19 @@ FROM v_ElencolRich + + + + dbo.stp_ER_getByCond + + + + + + + + + @@ -846,6 +860,7 @@ SELECT idxStato, stato, descrizione FROM AnagStati WHERE (idxStato = @idxStato)< + diff --git a/PUB/WebUserContols/mod_richiesteList.ascx b/PUB/WebUserContols/mod_richiesteList.ascx index 683327b..438acb9 100644 --- a/PUB/WebUserContols/mod_richiesteList.ascx +++ b/PUB/WebUserContols/mod_richiesteList.ascx @@ -69,27 +69,68 @@
Elenco Richieste Aperte Amministratore
-
+
Da
- +
-
A
+
A
- + +
+
+
+
+ + + + + + + + + + + + + + + <%-- + + + + + + + + + + + + + --%> + + + + + + + + + +
    +
  • Primo intervento
  • +
  • Primo intervento
  • +
  • Primo intervento
  • +
  • Primo intervento
  • +
  • Primo intervento
  • +
  • Primo intervento
  • +
+

With supporting text below as a natural lead-in to additional content.

+ Gestione Richieste
-
    -
  • Primo intervento
  • -
  • Primo intervento
  • -
  • Primo intervento
  • -
  • Primo intervento
  • -
  • Primo intervento
  • -
  • Primo intervento
  • -
-

With supporting text below as a natural lead-in to additional content.

- Gestione Richieste
diff --git a/PUB/WebUserContols/mod_richiesteList.ascx.designer.cs b/PUB/WebUserContols/mod_richiesteList.ascx.designer.cs index f2c7c72..18978e3 100644 --- a/PUB/WebUserContols/mod_richiesteList.ascx.designer.cs +++ b/PUB/WebUserContols/mod_richiesteList.ascx.designer.cs @@ -173,5 +173,23 @@ namespace PUB.WebUserContols { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.DropDownList ddlStatoMax; + + /// + /// Controllo grViewElRich. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.GridView grViewElRich; + + /// + /// Controllo odsElRich. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsElRich; } }