diff --git a/MP-TAB/Allarmi.aspx b/MP-TAB/Allarmi.aspx
new file mode 100644
index 00000000..b03dcf1a
--- /dev/null
+++ b/MP-TAB/Allarmi.aspx
@@ -0,0 +1,40 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Allarmi.aspx.cs" Inherits="MoonProTablet.Allarmi" %>
+
+
+<%@ Register Src="WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
+<%@ Register Src="~/WebUserControls/mod_elencoAllarmi.ascx" TagPrefix="uc1" TagName="mod_elencoAllarmi" %>
+
+
+
+
+
+
+
+
+
+
+
+ <%--
--%>
+
+
+
+
+
+
+
ELABORAZIONE IN CORSO
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MP-TAB/Allarmi.aspx.cs b/MP-TAB/Allarmi.aspx.cs
new file mode 100644
index 00000000..81e88f3e
--- /dev/null
+++ b/MP-TAB/Allarmi.aspx.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace MoonProTablet
+{
+ public partial class Allarmi : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+#if false
+ mod_controlliProd.eh_newVal += Mod_controlliProd_eh_newVal;
+ mod_controlliProd.eh_reset += Mod_controlliProd_eh_reset;
+#endif
+ }
+
+#if false
+ private void Mod_controlliProd_eh_reset(object sender, EventArgs e)
+ {
+ mod_elencoControlli.doUpdate();
+ }
+
+ private void Mod_controlliProd_eh_newVal(object sender, EventArgs e)
+ {
+ // ricarica pagina...
+ Response.Redirect(devicesAuthProxy.pagCorrente);
+ }
+#endif
+ }
+}
\ No newline at end of file
diff --git a/MP-TAB/Allarmi.aspx.designer.cs b/MP-TAB/Allarmi.aspx.designer.cs
new file mode 100644
index 00000000..30dc7cc9
--- /dev/null
+++ b/MP-TAB/Allarmi.aspx.designer.cs
@@ -0,0 +1,53 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace MoonProTablet
+{
+
+
+ public partial class Allarmi
+ {
+
+ ///
+ /// mod_dettMacchina1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
+
+ ///
+ /// updtRicerca control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.UpdateProgress updtRicerca;
+
+ ///
+ /// mod_elencoAllarmi control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::MoonProTablet.WebUserControls.mod_elencoAllarmi mod_elencoAllarmi;
+
+ ///
+ /// mod_directLinks control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks;
+ }
+}
diff --git a/MP-TAB/MP-TAB.csproj b/MP-TAB/MP-TAB.csproj
index 429709bd..34e10738 100644
--- a/MP-TAB/MP-TAB.csproj
+++ b/MP-TAB/MP-TAB.csproj
@@ -265,6 +265,7 @@
+
@@ -728,6 +729,7 @@
+
@@ -772,6 +774,13 @@
About.aspx
+
+ Allarmi.aspx
+ ASPXCodeBehind
+
+
+ Allarmi.aspx
+
@@ -1185,6 +1194,13 @@
mod_directLinks.ascx
+
+ mod_elencoAllarmi.ascx
+ ASPXCodeBehind
+
+
+ mod_elencoAllarmi.ascx
+
mod_elencoControlli.ascx
ASPXCodeBehind
diff --git a/MP-TAB/WebUserControls/mod_elencoAllarmi.ascx b/MP-TAB/WebUserControls/mod_elencoAllarmi.ascx
new file mode 100644
index 00000000..ec5a8624
--- /dev/null
+++ b/MP-TAB/WebUserControls/mod_elencoAllarmi.ascx
@@ -0,0 +1,56 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoAllarmi.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_elencoAllarmi" %>
+<%@ Register Src="~/WebUserControls/mod_selPeriodo.ascx" TagPrefix="uc1" TagName="mod_selPeriodo" %>
+<%@ Register Src="~/WebUserControls/cmp_selOdlOrd.ascx" TagPrefix="uc1" TagName="cmp_selOdlOrd" %>
+
+
+
+
+
+
+
+
+
+
+
+
+ <%--
+ --%>
+
+
+ <%--
--%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MP-TAB/WebUserControls/mod_elencoAllarmi.ascx.cs b/MP-TAB/WebUserControls/mod_elencoAllarmi.ascx.cs
new file mode 100644
index 00000000..2155456f
--- /dev/null
+++ b/MP-TAB/WebUserControls/mod_elencoAllarmi.ascx.cs
@@ -0,0 +1,51 @@
+using SteamWare;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace MoonProTablet.WebUserControls
+{
+ public partial class mod_elencoAllarmi : BaseUserControl
+ {
+ #region Protected Methods
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!Page.IsPostBack)
+ {
+ intervalloDate newIntervallo = new intervalloDate()
+ {
+ fine = DateTime.Today.AddDays(1),
+ inizio = DateTime.Today.AddDays(-7)
+ };
+ mod_selPeriodo.intervalloAnalisi = newIntervallo;
+ }
+ }
+
+ #endregion Protected Methods
+
+ #region Public Methods
+
+ public void doUpdate()
+ {
+ grView.DataBind();
+ }
+
+ ///
+ /// css dato status (0 = all OK, > 0 ALLARMI)
+ ///
+ ///
+ ///
+ public string cssByStatus(object rawStatus)
+ {
+ int status = 0;
+ int.TryParse($"{rawStatus}", out status);
+ return status > 0 ? "text-danger" : "text-success";
+ }
+
+ #endregion Public Methods
+ }
+}
\ No newline at end of file
diff --git a/MP-TAB/WebUserControls/mod_elencoAllarmi.ascx.designer.cs b/MP-TAB/WebUserControls/mod_elencoAllarmi.ascx.designer.cs
new file mode 100644
index 00000000..f824eb4c
--- /dev/null
+++ b/MP-TAB/WebUserControls/mod_elencoAllarmi.ascx.designer.cs
@@ -0,0 +1,53 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace MoonProTablet.WebUserControls
+{
+
+
+ public partial class mod_elencoAllarmi
+ {
+
+ ///
+ /// cmp_selOdlOrd control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::MoonProTablet.WebUserControls.cmp_selOdlOrd cmp_selOdlOrd;
+
+ ///
+ /// mod_selPeriodo control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::MoonProTablet.WebUserControls.mod_selPeriodo mod_selPeriodo;
+
+ ///
+ /// grView control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.GridView grView;
+
+ ///
+ /// ods control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+ }
+}
diff --git a/MapoDb/DS_applicazione.Designer.cs b/MapoDb/DS_applicazione.Designer.cs
index 6453af5b..f4dfa765 100644
--- a/MapoDb/DS_applicazione.Designer.cs
+++ b/MapoDb/DS_applicazione.Designer.cs
@@ -30626,44 +30626,53 @@ SELECT AlarmLogId, DtRif, MachineId, MemAddress, MemIndex, Status, ValDecoded, D
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT * FROM dbo.AlarmLog";
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_AL_getFiltCount";
+ this._commandCollection[1].CommandText = "dbo.stp_AL_getFilt";
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("@IdxMacchina", 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("@dtFrom", 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("@dtTo", 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("@showMulti", 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("@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;
- this._commandCollection[2].CommandText = "dbo.stp_AL_getFiltPaged";
+ this._commandCollection[2].CommandText = "dbo.stp_AL_getFiltCount";
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("@IdxMacchina", 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("@dtFrom", 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("@dtTo", 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("@showMulti", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maximumRows", 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("@startRowIndex", 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("@searchVal", 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_AlarmLog_insert";
+ this._commandCollection[3].CommandText = "dbo.stp_AL_getFiltPaged";
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("@DtRif", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MachineId", 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("@MemAddress", 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("@MemIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValDecoded", global::System.Data.SqlDbType.NVarChar, 2500, 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("@IdxMacchina", 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("@dtFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@showMulti", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maximumRows", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startRowIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[3].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[4] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[4].Connection = this.Connection;
+ this._commandCollection[4].CommandText = "dbo.stp_AlarmLog_insert";
+ 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("@DtRif", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MachineId", 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("@MemAddress", 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("@MemIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValDecoded", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -30690,12 +30699,47 @@ SELECT AlarmLogId, DtRif, MachineId, MemAddress, MemIndex, Status, ValDecoded, D
return dataTable;
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+ public virtual DS_applicazione.AlarmLogDataTable getFilt(string IdxMacchina, global::System.Nullable dtFrom, global::System.Nullable dtTo, global::System.Nullable showMulti) {
+ this.Adapter.SelectCommand = this.CommandCollection[1];
+ if ((IdxMacchina == null)) {
+ this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[1].Value = ((string)(IdxMacchina));
+ }
+ if ((dtFrom.HasValue == true)) {
+ this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(dtFrom.Value));
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ if ((dtTo.HasValue == true)) {
+ this.Adapter.SelectCommand.Parameters[3].Value = ((System.DateTime)(dtTo.Value));
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ if ((showMulti.HasValue == true)) {
+ this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(showMulti.Value));
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
+ }
+ DS_applicazione.AlarmLogDataTable dataTable = new DS_applicazione.AlarmLogDataTable();
+ this.Adapter.Fill(dataTable);
+ return dataTable;
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_applicazione.AlarmLogDataTable getFiltPaged(string IdxMacchina, global::System.Nullable dtFrom, global::System.Nullable dtTo, global::System.Nullable showMulti, global::System.Nullable maximumRows, global::System.Nullable startRowIndex, string searchVal) {
- this.Adapter.SelectCommand = this.CommandCollection[2];
+ this.Adapter.SelectCommand = this.CommandCollection[3];
if ((IdxMacchina == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
@@ -31005,7 +31049,7 @@ SELECT AlarmLogId, DtRif, MachineId, MemAddress, MemIndex, Status, ValDecoded, D
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual object getFiltCount(string IdxMacchina, global::System.Nullable dtFrom, global::System.Nullable dtTo, global::System.Nullable showMulti, string searchVal) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
if ((IdxMacchina == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
}
@@ -31063,7 +31107,7 @@ SELECT AlarmLogId, DtRif, MachineId, MemAddress, MemIndex, Status, ValDecoded, D
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int insertQuery(global::System.Nullable DtRif, string MachineId, string MemAddress, global::System.Nullable MemIndex, global::System.Nullable Status, string ValDecoded) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
if ((DtRif.HasValue == true)) {
command.Parameters[1].Value = ((System.DateTime)(DtRif.Value));
}
diff --git a/MapoDb/DS_applicazione.xsd b/MapoDb/DS_applicazione.xsd
index 67373a27..08414067 100644
--- a/MapoDb/DS_applicazione.xsd
+++ b/MapoDb/DS_applicazione.xsd
@@ -2951,6 +2951,20 @@ SELECT AlarmLogId, DtRif, MachineId, MemAddress, MemIndex, Status, ValDecoded, D
+
+
+
+ dbo.stp_AL_getFilt
+
+
+
+
+
+
+
+
+
+
diff --git a/MapoDb/DS_applicazione.xss b/MapoDb/DS_applicazione.xss
index cfc39c37..c91fbd4b 100644
--- a/MapoDb/DS_applicazione.xss
+++ b/MapoDb/DS_applicazione.xss
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
@@ -32,10 +32,10 @@
-
+
-
+