diff --git a/C2P/WebUserControls/mod_listValues.ascx b/C2P/WebUserControls/mod_listValues.ascx index fb58e9d..f2169d5 100644 --- a/C2P/WebUserControls/mod_listValues.ascx +++ b/C2P/WebUserControls/mod_listValues.ascx @@ -3,30 +3,47 @@
-
- <%-- - --%> +
- + --- Select ---
+
+ + + + +
+
+
+
+ <%: traduci("TableName") %>: + +
+
+ <%: traduci("FieldName") %>: + +
+
+ <%: traduci("value") %>: + +
+
+ + + <%: traduci("insertNew") %> + +
+
+
- - - - - - - -

@@ -36,40 +53,26 @@ - - + - <%: traduci("Reset") %> - <%----%> - - - - - - - - - - - - + - + - + @@ -85,7 +88,7 @@ - <%: traduci("btnNewListVal") %> + <%-- <%: traduci("btnNewListVal") %>--%> @@ -96,10 +99,10 @@    - - + + @@ -108,8 +111,6 @@ - - @@ -127,8 +128,6 @@ - - + /// dimensione pagina grid view + /// + public int pageSize + { + get + { + return grView.PageSize; + } + set + { + grView.PageSize = value; } - checkFixOds(); } /// /// effettua traduzione del lemma @@ -35,37 +49,12 @@ namespace C2P.WebUserControls return user_std.UtSn.Traduci(lemma); } /// - /// update dei controlli filtraggio - /// - private void checkFixOds() - { - //ods.FilterExpression = " (value like '%{0}%' OR label like '%{0}%' OR (CONVERT(ordinal, 'System.String') LIKE '%{0}%')) "; - //// reimposto il filtro dell'ODS - //if (mod_filtroTableName.isChecked) - //{ - // //ods.FilterExpression += string.Format(" AND TableName ='{0}' ", mod_filtroTableName.valore); - //} - - //doUpdate(); - } - /// - /// selezionato un valore x elenco tabelle - /// - /// - /// - public void eh_selectedTable(object sender, EventArgs e) - { - checkFixOds(); - } - /// /// effettuo update /// private void doUpdate() { - //grView.SelectedIndex = -1; - //grView.DataBind(); } - + /// /// reset selezione /// @@ -81,12 +70,26 @@ namespace C2P.WebUserControls /// /// /// - protected void btnShowFooter(object sender, EventArgs e) + protected void btnShowInsert(object sender, EventArgs e) { - // deseleziono e nascondo pnl statistiche... - grView.ShowFooter = true;// !grView.ShowFooter; + // SE HO SELEZIONATO UN VALORE!!! + if (ddlTable.SelectedIndex > 0) + { + // inverto visibilità insert nuovi valori + divInsert.Visible = !divInsert.Visible; + if (divInsert.Visible) + { + lblBtnShowNew.Text = traduci("btnHideNewListVal"); + // precompilo valori tabella + txtTableName.Text = ddlTable.SelectedValue; + } + else + { + lblBtnShowNew.Text = traduci("btnNewListVal"); + } + } } - + /// /// evento post "aggancio" del grView x traduzione headers /// @@ -116,5 +119,28 @@ namespace C2P.WebUserControls lblNumRec.Text = ""; } } + + protected void ddlTable_SelectedIndexChanged(object sender, EventArgs e) + { + // se seleziono valore "vuoto" resetto... + if (ddlTable.SelectedIndex == 0) + { + lblBtnShowNew.Text = traduci("btnNewListVal"); + divInsert.Visible = false; + } + else + { + txtTableName.Text = ddlTable.SelectedValue; + } + } + + protected void btnDoInsert_Click(object sender, EventArgs e) + { + // effettua insert! + C2P_Data.DtProxy.man.taListVal.insertQuery(txtTableName.Text.Trim(), txtFieldName.Text.Trim(), txtvalue.Text.Trim(), txtvalue.Text.Trim(), 999); + // refresh dati! + grView.DataBind(); + } + } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_listValues.ascx.designer.cs b/C2P/WebUserControls/mod_listValues.ascx.designer.cs index 2122de1..93b5617 100644 --- a/C2P/WebUserControls/mod_listValues.ascx.designer.cs +++ b/C2P/WebUserControls/mod_listValues.ascx.designer.cs @@ -21,6 +21,69 @@ namespace C2P.WebUserControls { /// protected global::System.Web.UI.WebControls.DropDownList ddlTable; + /// + /// lbShowNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbShowNew; + + /// + /// lblBtnShowNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblBtnShowNew; + + /// + /// divInsert control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divInsert; + + /// + /// txtTableName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtTableName; + + /// + /// txtFieldName control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtFieldName; + + /// + /// txtvalue control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtvalue; + + /// + /// btnDoInsert control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btnDoInsert; + /// /// grView control. /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index f6225c2..13f9a22 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 8d1f5d7..c843d18 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 51c4904..d6a66f3 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P/listValues.aspx.cs b/C2P/listValues.aspx.cs index ba2d4e9..8860359 100644 --- a/C2P/listValues.aspx.cs +++ b/C2P/listValues.aspx.cs @@ -17,7 +17,21 @@ namespace C2P { protected void Page_Load(object sender, EventArgs e) { - + if (!Page.IsPostBack) + { + mod_righePag1.numRowPag = 20; + mod_listValues1.pageSize = mod_righePag1.numRowPag; + } + mod_righePag1.eh_newNum += mod_righePag1_eh_newNum; + } + /// + /// aggiornato numero righe datagrid... aggiorno visualizzazione + /// + /// + /// + void mod_righePag1_eh_newNum(object sender, EventArgs e) + { + mod_listValues1.pageSize = mod_righePag1.numRowPag; } } } diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.application b/C2P_CronJob/bin/Release/C2P_CronJob.application index 4bd9178..75de1e2 100644 --- a/C2P_CronJob/bin/Release/C2P_CronJob.application +++ b/C2P_CronJob/bin/Release/C2P_CronJob.application @@ -11,7 +11,7 @@ - IYlH6VeosGu8LOAtifdUhl52MkM= + taT5BiGNZZ+LWmRMzw/u5XyQsuI= diff --git a/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest b/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest index 6029b6f..f7b9754 100644 --- a/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest +++ b/C2P_CronJob/bin/Release/C2P_CronJob.exe.manifest @@ -84,19 +84,19 @@ - ooAv2hDI7Nsi55yrL2bl9oyCGTU= + unZeFfAWmYGBhWfyz9WSrwwOSAw= - + - HdlVtB5eqlnmon0JtsWi+iEnaaE= + gZxKP41d2JYiccCGmakjfhi9p+k= diff --git a/C2P_CronJob/bin/Release/C2P_Data.dll b/C2P_CronJob/bin/Release/C2P_Data.dll index 8d1f5d7..ef6d7e8 100644 Binary files a/C2P_CronJob/bin/Release/C2P_Data.dll and b/C2P_CronJob/bin/Release/C2P_Data.dll differ diff --git a/C2P_Data/DS_Utility.Designer.cs b/C2P_Data/DS_Utility.Designer.cs index 158fc91..17b21e2 100644 --- a/C2P_Data/DS_Utility.Designer.cs +++ b/C2P_Data/DS_Utility.Designer.cs @@ -12025,22 +12025,50 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN [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[3]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT TableName, FieldName, value, label, ordinal FROM dbo.ListValues"; 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_listValues_getByTable"; + this._commandCollection[1].CommandText = "dbo.stp_listValues_delete"; 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("@TableName", 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("@Original_TableName", 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("@Original_FieldName", 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("@Original_value", global::System.Data.SqlDbType.NVarChar, 10, 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].CommandText = "dbo.stp_listValues_getDistTable"; + this._commandCollection[2].CommandText = "dbo.stp_listValues_getByTable"; 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("@TableName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, 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].CommandText = "dbo.stp_listValues_getDistTable"; + 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, "", "", "")); + this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "dbo.stp_listValues_insNew"; + 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("@TableName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FieldName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@value", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@label", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ordinal", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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].CommandText = "dbo.stp_listValues_update"; + 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, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_TableName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FieldName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_value", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@label", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ordinal", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12072,7 +12100,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Utility.ListValuesDataTable getByTable(string TableName) { - this.Adapter.SelectCommand = this.CommandCollection[1]; + this.Adapter.SelectCommand = this.CommandCollection[2]; if ((TableName == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -12089,7 +12117,7 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Utility.ListValuesDataTable getDistTableName() { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; DS_Utility.ListValuesDataTable dataTable = new DS_Utility.ListValuesDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -12322,6 +12350,150 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN public virtual int Update(string label, global::System.Nullable ordinal, string Original_TableName, string Original_FieldName, string Original_value, string Original_label, global::System.Nullable Original_ordinal) { return this.Update(Original_TableName, Original_FieldName, Original_value, label, ordinal, Original_TableName, Original_FieldName, Original_value, Original_label, Original_ordinal); } + + [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 deleteQuery(string Original_TableName, string Original_FieldName, string Original_value) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((Original_TableName == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_TableName)); + } + if ((Original_FieldName == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(Original_FieldName)); + } + if ((Original_value == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(Original_value)); + } + 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; + } + + [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 insertQuery(string TableName, string FieldName, string value, string label, global::System.Nullable ordinal) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + if ((TableName == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(TableName)); + } + if ((FieldName == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(FieldName)); + } + if ((value == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(value)); + } + if ((label == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(label)); + } + if ((ordinal.HasValue == true)) { + command.Parameters[5].Value = ((int)(ordinal.Value)); + } + else { + command.Parameters[5].Value = global::System.DBNull.Value; + } + 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; + } + + [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 updateQuery(string Original_TableName, string Original_FieldName, string Original_value, string label, global::System.Nullable ordinal) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + if ((Original_TableName == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_TableName)); + } + if ((Original_FieldName == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(Original_FieldName)); + } + if ((Original_value == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(Original_value)); + } + if ((label == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(label)); + } + if ((ordinal.HasValue == true)) { + command.Parameters[5].Value = ((int)(ordinal.Value)); + } + else { + command.Parameters[5].Value = global::System.DBNull.Value; + } + 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/C2P_Data/DS_Utility.xsd b/C2P_Data/DS_Utility.xsd index cc1e3d5..7edc091 100644 --- a/C2P_Data/DS_Utility.xsd +++ b/C2P_Data/DS_Utility.xsd @@ -561,6 +561,19 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN + + + + dbo.stp_listValues_delete + + + + + + + + + @@ -582,6 +595,36 @@ SELECT TableName, FieldName, value, label, ordinal FROM ListValues WHERE (FieldN + + + + dbo.stp_listValues_insNew + + + + + + + + + + + + + + + dbo.stp_listValues_update + + + + + + + + + + + @@ -718,7 +761,7 @@ ORDER BY DataRich DESC - + @@ -738,7 +781,7 @@ ORDER BY DataRich DESC - + @@ -758,7 +801,7 @@ ORDER BY DataRich DESC - + @@ -778,7 +821,7 @@ ORDER BY DataRich DESC - + @@ -798,7 +841,7 @@ ORDER BY DataRich DESC - + @@ -818,7 +861,7 @@ ORDER BY DataRich DESC - + @@ -848,7 +891,7 @@ ORDER BY DataRich DESC - + @@ -869,7 +912,7 @@ ORDER BY DataRich DESC - + @@ -889,7 +932,7 @@ ORDER BY DataRich DESC - + @@ -909,7 +952,7 @@ ORDER BY DataRich DESC - + @@ -929,7 +972,7 @@ ORDER BY DataRich DESC - + @@ -941,14 +984,14 @@ ORDER BY DataRich DESC - + - + @@ -960,7 +1003,7 @@ ORDER BY DataRich DESC - + @@ -974,14 +1017,14 @@ ORDER BY DataRich DESC - + - + @@ -1016,7 +1059,7 @@ ORDER BY DataRich DESC - + @@ -1036,7 +1079,7 @@ ORDER BY DataRich DESC - + @@ -1069,7 +1112,7 @@ ORDER BY DataRich DESC - + diff --git a/C2P_Data/DS_Utility.xss b/C2P_Data/DS_Utility.xss index 340856a..9e56aec 100644 --- a/C2P_Data/DS_Utility.xss +++ b/C2P_Data/DS_Utility.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -21,7 +21,7 @@ - + diff --git a/C2P_Data/DtProxy.cs b/C2P_Data/DtProxy.cs index 50001e0..76b1b93 100644 --- a/C2P_Data/DtProxy.cs +++ b/C2P_Data/DtProxy.cs @@ -70,6 +70,7 @@ namespace C2P_Data taOH = new DS_UtilityTableAdapters.OrderHistTableAdapter(); taSC2C = new DS_UtilityTableAdapters.StdCost2createTableAdapter(); taImpTL = new DS_UtilityTableAdapters.Import_TicketListTableAdapter(); + taListVal = new DS_UtilityTableAdapters.ListValuesTableAdapter(); } /// /// effettua setup dei connection strings da web.config della singola applicazione @@ -91,6 +92,7 @@ namespace C2P_Data taOH.Connection.ConnectionString = connStr; taSC2C.Connection.ConnectionString = connStr; taImpTL.Connection.ConnectionString = connStr; + taListVal.Connection.ConnectionString = connStr; } #endregion @@ -110,6 +112,7 @@ namespace C2P_Data public DS_UtilityTableAdapters.OrderHistTableAdapter taOH; public DS_UtilityTableAdapters.StdCost2createTableAdapter taSC2C; public DS_UtilityTableAdapters.Import_TicketListTableAdapter taImpTL; + public DS_UtilityTableAdapters.ListValuesTableAdapter taListVal; public static DtProxy man = new DtProxy(); diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index 8d1f5d7..ef6d7e8 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Project/bin/Output/C2P_DB.dacpac b/C2P_Project/bin/Output/C2P_DB.dacpac index b719c60..6eb0c1b 100644 Binary files a/C2P_Project/bin/Output/C2P_DB.dacpac and b/C2P_Project/bin/Output/C2P_DB.dacpac differ diff --git a/C2P_Project/bin/Output/C2P_Project.dll b/C2P_Project/bin/Output/C2P_Project.dll index 2724cc7..7912b19 100644 Binary files a/C2P_Project/bin/Output/C2P_Project.dll and b/C2P_Project/bin/Output/C2P_Project.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 8d1f5d7..c843d18 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index 8bb956e..fa28083 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 51c4904..d6a66f3 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 1beef45..3fe0612 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.157.450")] -[assembly: AssemblyFileVersion("2.2.157.450")] +[assembly: AssemblyVersion("2.2.158.452")] +[assembly: AssemblyFileVersion("2.2.158.452")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 43c7157..9a2644d 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.157.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.2.157.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.2.158.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.2.158.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+