+
-
-
+
Descrizione
-
+
-
@@ -46,85 +55,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+ <%--
--%>
+
+
<%--
--%>
-
-
-
-
-
-
-
-
-
-
- <%--
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /
-
-
-
-
-
-
-
-
- --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
index 19a947b..e42915a 100644
--- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
+++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
@@ -29,6 +29,8 @@ namespace MP_MAG.WebUserControls
grView.PageSize = cmp_numRow.numRow;
txtData.Text = $"{DateTime.Today:yyyy-MM-dd}";
txtData.Visible = false;
+ txtKeyFilt.Visible = false;
+ txtKeyFilt.Text = "";
divAddNew.Visible = false;
}
cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh;
@@ -103,7 +105,7 @@ namespace MP_MAG.WebUserControls
// calcolo quante pedane ho...
try
{
- var tabAL = MagDataLayer.man.taEAL.getBySearch(true, DateTime.Today, "*");
+ var tabAL = MagDataLayer.man.taEAL.getBySearch(true, DateTime.Today, "*", "*");
newNum = tabAL.Count + 1;
}
catch
@@ -116,5 +118,45 @@ namespace MP_MAG.WebUserControls
{
grView.DataBind();
}
+ ///
+ /// Avvia stampa report pedana
+ ///
+ ///
+ ///
+ protected void lbtPrint_Click(object sender, EventArgs e)
+ {
+ // lancio il report x la pedana del giorno... filtro è la DATA...
+ }
+
+ protected void txtKeyFilt_TextChanged(object sender, EventArgs e)
+ {
+
+ }
+
+ protected void chkFiltKey_CheckedChanged(object sender, EventArgs e)
+ {
+ txtKeyFilt.Visible = chkFiltKey.Checked;
+ if (!chkFiltKey.Checked)
+ {
+ txtKeyFilt.Text = "";
+ }
+ }
+ ///
+ /// Impostazione filtro
+ ///
+ ///
+ ///
+ protected void lbtSelFilt_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ LinkButton lbtSend = (LinkButton)sender;
+ txtKeyFilt.Visible = true;
+ chkFiltKey.Checked = true;
+ txtKeyFilt.Text = lbtSend.CommandArgument;
+ }
+ catch
+ { }
+ }
}
}
\ No newline at end of file
diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.designer.cs
index 75f11f7..b41c037 100644
--- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.designer.cs
+++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.designer.cs
@@ -14,6 +14,24 @@ namespace MP_MAG.WebUserControls
public partial class cmp_elencoPedane
{
+ ///
+ /// Controllo chkFiltKey.
+ ///
+ ///
+ /// 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.CheckBox chkFiltKey;
+
+ ///
+ /// Controllo txtKeyFilt.
+ ///
+ ///
+ /// 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.TextBox txtKeyFilt;
+
///
/// Controllo lbtShowAdd.
///
@@ -41,6 +59,15 @@ namespace MP_MAG.WebUserControls
///
protected global::System.Web.UI.WebControls.TextBox txtData;
+ ///
+ /// Controllo lbtPrint.
+ ///
+ ///
+ /// 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.LinkButton lbtPrint;
+
///
/// Controllo divAddNew.
///
diff --git a/MagData/DS_Mag.Designer.cs b/MagData/DS_Mag.Designer.cs
index 079a75c..ef7013c 100644
--- a/MagData/DS_Mag.Designer.cs
+++ b/MagData/DS_Mag.Designer.cs
@@ -6223,7 +6223,7 @@ namespace MagData.DS_MagTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_ElencoAL";
@@ -6235,6 +6235,7 @@ namespace MagData.DS_MagTableAdapters {
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("@FiltDate", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DayRef", 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("@KeyFilt", 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("@SearchVal", 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;
@@ -6245,6 +6246,14 @@ namespace MagData.DS_MagTableAdapters {
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Flusso", 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("@CodSoggetto", 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("@Descr", 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_EAL_updateFilt";
+ 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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_AL", global::System.Data.SqlDbType.NVarChar, 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("@KeyFilt", global::System.Data.SqlDbType.NVarChar, 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("@Descr", 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()]
@@ -6275,7 +6284,7 @@ namespace MagData.DS_MagTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
- public virtual DS_Mag.ElencoALDataTable getBySearch(global::System.Nullable
FiltDate, global::System.Nullable DayRef, string SearchVal) {
+ public virtual DS_Mag.ElencoALDataTable getBySearch(global::System.Nullable FiltDate, global::System.Nullable DayRef, string KeyFilt, string SearchVal) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((FiltDate.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((bool)(FiltDate.Value));
@@ -6289,11 +6298,17 @@ namespace MagData.DS_MagTableAdapters {
else {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
- if ((SearchVal == null)) {
+ if ((KeyFilt == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.SelectCommand.Parameters[3].Value = ((string)(SearchVal));
+ this.Adapter.SelectCommand.Parameters[3].Value = ((string)(KeyFilt));
+ }
+ if ((SearchVal == null)) {
+ this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[4].Value = ((string)(SearchVal));
}
DS_Mag.ElencoALDataTable dataTable = new DS_Mag.ElencoALDataTable();
this.Adapter.Fill(dataTable);
@@ -6334,6 +6349,46 @@ namespace MagData.DS_MagTableAdapters {
this.Adapter.Fill(dataTable);
return dataTable;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ public virtual int updateFilt(string Original_AL, string KeyFilt, string Descr) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
+ if ((Original_AL == null)) {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[1].Value = ((string)(Original_AL));
+ }
+ if ((KeyFilt == null)) {
+ command.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[2].Value = ((string)(KeyFilt));
+ }
+ if ((Descr == null)) {
+ command.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[3].Value = ((string)(Descr));
+ }
+ 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/MagData/DS_Mag.xsd b/MagData/DS_Mag.xsd
index 7cc682c..3afb4d6 100644
--- a/MagData/DS_Mag.xsd
+++ b/MagData/DS_Mag.xsd
@@ -360,6 +360,7 @@ FROM v_ElencoAL
+
@@ -379,6 +380,19 @@ FROM v_ElencoAL
+
+
+
+ dbo.stp_EAL_updateFilt
+
+
+
+
+
+
+
+
+
@@ -389,7 +403,7 @@ FROM v_ElencoAL
-
+
@@ -464,7 +478,7 @@ FROM v_ElencoAL
-
+
@@ -619,7 +633,7 @@ FROM v_ElencoAL
-
+
@@ -646,7 +660,7 @@ FROM v_ElencoAL
-
+
@@ -713,7 +727,7 @@ FROM v_ElencoAL
-
+
@@ -733,7 +747,7 @@ FROM v_ElencoAL
-
+
diff --git a/MagData/DS_Mag.xss b/MagData/DS_Mag.xss
index c8aad24..9e49b01 100644
--- a/MagData/DS_Mag.xss
+++ b/MagData/DS_Mag.xss
@@ -6,12 +6,12 @@
-->
-
+
-
-
+
+
\ No newline at end of file