From f796fd2365c6ee40b56620c8e2f5060da4c425b8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 15 Mar 2017 17:59:30 +0100 Subject: [PATCH] aggiunta visualizzazione della richiesta email + btn x aggiungere emailReq... --- XPS/WebUserControls/mod_elencoComm.ascx | 81 +++++++++--- XPS/WebUserControls/mod_elencoComm.ascx.cs | 14 +++ XPS/WebUserControls/mod_testata.ascx | 9 +- XPS/WebUserControls/mod_testata.ascx.cs | 4 +- .../mod_testata.ascx.designer.cs | 4 +- XPS_data/DS_applicazione.Designer.cs | 117 ++++++++++++++++-- XPS_data/DS_applicazione.xsd | 29 ++++- XPS_data/DS_applicazione.xss | 4 +- 8 files changed, 221 insertions(+), 41 deletions(-) diff --git a/XPS/WebUserControls/mod_elencoComm.ascx b/XPS/WebUserControls/mod_elencoComm.ascx index 2c96533..b9a8b37 100644 --- a/XPS/WebUserControls/mod_elencoComm.ascx +++ b/XPS/WebUserControls/mod_elencoComm.ascx @@ -30,7 +30,9 @@ -
+ +
+
@@ -67,7 +69,9 @@ + @@ -89,11 +93,21 @@
- - 09:0014:00
+ + + 09:00 + 14:00 + +
+
-    -
+    + + + + + +

@@ -108,8 +122,13 @@
-    -
+    + + + + + + @@ -133,10 +152,19 @@ - + + +
-
- + + + + + + + + + @@ -144,6 +172,13 @@ + + + + + + + @@ -152,14 +187,22 @@ - num: + num: +
- del: + del: + - + + + + - + + + + @@ -172,7 +215,9 @@
-
+ +
+
@@ -203,7 +248,9 @@ - + + + diff --git a/XPS/WebUserControls/mod_elencoComm.ascx.cs b/XPS/WebUserControls/mod_elencoComm.ascx.cs index 69c24d6..cff48a2 100644 --- a/XPS/WebUserControls/mod_elencoComm.ascx.cs +++ b/XPS/WebUserControls/mod_elencoComm.ascx.cs @@ -773,6 +773,20 @@ namespace XPS.WebUserControls // stampo! reportPrinter.obj.printReport(reportRichiesto.Barcode, memLayer.ML.confReadString("printerBarcode"), lnkBtn.CommandArgument); } + + /// + /// aggiungo richeista email! + /// + /// + /// + protected void lbAddEmailReq_Click(object sender, EventArgs e) + { + LinkButton lnkBtn = (LinkButton)sender; + // registro richiesta email... + XPS_data.XPS.obj.taObj.updEmailReq(true, user_std.UtSn.utente, DateTime.Now, lnkBtn.CommandArgument); + // update! + grView.DataBind(); + } /// /// fix ricerche in cambio pagina /// diff --git a/XPS/WebUserControls/mod_testata.ascx b/XPS/WebUserControls/mod_testata.ascx index f1601d0..29c007a 100644 --- a/XPS/WebUserControls/mod_testata.ascx +++ b/XPS/WebUserControls/mod_testata.ascx @@ -10,14 +10,17 @@
  • - + + + + <%-- --%>
    • <%--
  • <%: nomePag %> -
    • --%> -
  • +
    • +
  • --%>
    • diff --git a/XPS/WebUserControls/mod_testata.ascx.cs b/XPS/WebUserControls/mod_testata.ascx.cs index 882ace5..688789f 100644 --- a/XPS/WebUserControls/mod_testata.ascx.cs +++ b/XPS/WebUserControls/mod_testata.ascx.cs @@ -35,8 +35,8 @@ namespace XPS.WebUserControls PagCorrente(); updateTreeMenu(); } - // fix componenti - hlHome.DataBind(); + //// fix componenti + //hlHome.DataBind(); } } diff --git a/XPS/WebUserControls/mod_testata.ascx.designer.cs b/XPS/WebUserControls/mod_testata.ascx.designer.cs index 42a9964..1499dba 100644 --- a/XPS/WebUserControls/mod_testata.ascx.designer.cs +++ b/XPS/WebUserControls/mod_testata.ascx.designer.cs @@ -31,13 +31,13 @@ namespace XPS.WebUserControls { protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; /// - /// hlHome control. + /// lbnUpdate control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.HyperLink hlHome; + protected global::System.Web.UI.WebControls.LinkButton lbnUpdate; /// /// lbnUpdate2 control. diff --git a/XPS_data/DS_applicazione.Designer.cs b/XPS_data/DS_applicazione.Designer.cs index fc9263f..df71b1d 100644 --- a/XPS_data/DS_applicazione.Designer.cs +++ b/XPS_data/DS_applicazione.Designer.cs @@ -1737,6 +1737,8 @@ namespace XPS_data { private global::System.Data.DataColumn columnmaxCodStato; + private global::System.Data.DataColumn columnemailReq; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public v_commesseDataTable() { @@ -1930,6 +1932,14 @@ namespace XPS_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn emailReqColumn { + get { + return this.columnemailReq; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1987,7 +1997,8 @@ namespace XPS_data { string minStato, string maxStato, string minCodStato, - string maxCodStato) { + string maxCodStato, + bool emailReq) { v_commesseRow rowv_commesseRow = ((v_commesseRow)(this.NewRow())); object[] columnValuesArray = new object[] { Cod, @@ -2009,7 +2020,8 @@ namespace XPS_data { minStato, maxStato, minCodStato, - maxCodStato}; + maxCodStato, + emailReq}; rowv_commesseRow.ItemArray = columnValuesArray; this.Rows.Add(rowv_commesseRow); return rowv_commesseRow; @@ -2059,6 +2071,7 @@ namespace XPS_data { this.columnmaxStato = base.Columns["maxStato"]; this.columnminCodStato = base.Columns["minCodStato"]; this.columnmaxCodStato = base.Columns["maxCodStato"]; + this.columnemailReq = base.Columns["emailReq"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2104,6 +2117,8 @@ namespace XPS_data { base.Columns.Add(this.columnminCodStato); this.columnmaxCodStato = new global::System.Data.DataColumn("maxCodStato", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnmaxCodStato); + this.columnemailReq = new global::System.Data.DataColumn("emailReq", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnemailReq); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnCod}, true)); this.columnCod.AllowDBNull = false; @@ -6999,6 +7014,22 @@ namespace XPS_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool emailReq { + get { + try { + return ((bool)(this[this.tablev_commesse.emailReqColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'emailReq\' in table \'v_commesse\' is DBNull.", e); + } + } + set { + this[this.tablev_commesse.emailReqColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsStatoNull() { @@ -7226,6 +7257,18 @@ namespace XPS_data { public void SetmaxCodStatoNull() { this[this.tablev_commesse.maxCodStatoColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsemailReqNull() { + return this.IsNull(this.tablev_commesse.emailReqColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetemailReqNull() { + this[this.tablev_commesse.emailReqColumn] = global::System.Convert.DBNull; + } } /// @@ -12122,6 +12165,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT tableMapping.ColumnMappings.Add("maxStato", "maxStato"); tableMapping.ColumnMappings.Add("minCodStato", "minCodStato"); tableMapping.ColumnMappings.Add("maxCodStato", "maxCodStato"); + tableMapping.ColumnMappings.Add("emailReq", "emailReq"); this._adapter.TableMappings.Add(tableMapping); } @@ -12129,7 +12173,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitConnection() { this._connection = new global::System.Data.SqlClient.SqlConnection(); - this._connection.ConnectionString = global::XPS_data.Properties.Settings.Default.Equa_XPSConnectionString; + this._connection.ConnectionString = global::XPS_data.Properties.Settings.Default.Equa_AnagraficaConnectionString; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12141,13 +12185,13 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT this._commandCollection[0].CommandText = "SELECT * FROM v_commesse ORDER BY DataArrivo DESC"; 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].Connection = new global::System.Data.SqlClient.SqlConnection(global::XPS_data.Properties.Settings.Default.Equa_XPSConnectionString); this._commandCollection[1].CommandText = "dbo.stp_vElComm_getByCod"; 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("@Cod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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].Connection = new global::System.Data.SqlClient.SqlConnection(global::XPS_data.Properties.Settings.Default.Equa_XPSConnectionString); this._commandCollection[2].CommandText = "dbo.stp_vElComm_getByCodFiltro"; 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, "", "", "")); @@ -12155,7 +12199,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFiltro", 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("@DataFiltroTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].Connection = new global::System.Data.SqlClient.SqlConnection(global::XPS_data.Properties.Settings.Default.Equa_XPSConnectionString); this._commandCollection[3].CommandText = "dbo.sp_creaSetObj"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].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, "", "", "")); @@ -12169,13 +12213,13 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@note", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@emailReq", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].Connection = new global::System.Data.SqlClient.SqlConnection(global::XPS_data.Properties.Settings.Default.Equa_XPSConnectionString); this._commandCollection[4].CommandText = "dbo.sp_delObj"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Cod", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); - this._commandCollection[5].Connection = this.Connection; + this._commandCollection[5].Connection = new global::System.Data.SqlClient.SqlConnection(global::XPS_data.Properties.Settings.Default.Equa_XPSConnectionString); this._commandCollection[5].CommandText = "dbo.stp_IstObjUpdateMag"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].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, "", "", "")); @@ -12790,7 +12834,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, DataRif, IdxObjMamma, Note, ExtKey, DueDate, LeadTime, LeadTimeUM, UserCreaz, @@ -12848,6 +12892,15 @@ FROM IstObj"; this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataMod", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxObjCommon", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[8].Connection = this.Connection; + this._commandCollection[8].CommandText = "dbo.stp_IstObj_updEmailReq"; + this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@emailReq", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataMod", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxObj", 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()] @@ -14001,6 +14054,52 @@ FROM IstObj"; } return returnValue; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int updEmailReq(global::System.Nullable emailReq, string UserMod, global::System.Nullable DataMod, string IdxObj) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8]; + if ((emailReq.HasValue == true)) { + command.Parameters[1].Value = ((bool)(emailReq.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((UserMod == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(UserMod)); + } + if ((DataMod.HasValue == true)) { + command.Parameters[3].Value = ((System.DateTime)(DataMod.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((IdxObj == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(IdxObj)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/XPS_data/DS_applicazione.xsd b/XPS_data/DS_applicazione.xsd index 58bc851..984e066 100644 --- a/XPS_data/DS_applicazione.xsd +++ b/XPS_data/DS_applicazione.xsd @@ -2,9 +2,10 @@ - + + @@ -236,7 +237,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT - + SELECT * FROM v_commesse ORDER BY DataArrivo DESC @@ -266,6 +267,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT + @@ -625,6 +627,20 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data + + + + dbo.stp_IstObj_updEmailReq + + + + + + + + + + @@ -1379,6 +1395,7 @@ WHERE (IdxObj = @IdxObj) + @@ -2024,10 +2041,10 @@ WHERE (IdxObj = @IdxObj) - - - - + + + + \ No newline at end of file diff --git a/XPS_data/DS_applicazione.xss b/XPS_data/DS_applicazione.xss index 7509906..7e6b2be 100644 --- a/XPS_data/DS_applicazione.xss +++ b/XPS_data/DS_applicazione.xss @@ -4,12 +4,12 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - +
- + +