Merge branch 'release/UpdateManAlarmLog'

MP-SITE/MappaStato.aspx.designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <generato automaticamente>
-//     Codice generato da uno strumento.
+// <auto-generated>
+//     This code was generated by a tool.
 //
-//     Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-//     il codice viene rigenerato. 
-// </generato automaticamente>
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace MP_SITE
@@ -15,20 +15,20 @@ namespace MP_SITE
     {
 
         /// <summary>
-        /// Controllo repRows.
+        /// repRows control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater repRows;
 
         /// <summary>
-        /// Controllo odsRows.
+        /// odsRows control.
         /// </summary>
         /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsRows;
     }

MP-SITE/WebUserControls/mod_logAllarmi.ascx

@@ -0,0 +1,54 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_logAllarmi.ascx.cs" Inherits="MP_SITE.WebUserControls.mod_logAllarmi" %>
+
+
+<div class="row">
+    <div class="col-6 text-left">
+        <b>Filtro</b>
+    </div>
+    <div class="col-6 text-right">
+        <div class="input-group input-group-sm mb-2">
+            <asp:TextBox runat="server" ID="txtSearch" class="form-control" placeholder="ricerca" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged"></asp:TextBox>
+            <div class="input-group-append">
+                <asp:LinkButton runat="server" ID="lbtReset" class="btn btn-info" OnClick="lbtReset_Click"><i class="fa fa-refresh" aria-hidden="true"></i></asp:LinkButton>
+            </div>
+        </div>
+    </div>
+</div>
+
+<asp:GridView ID="grView" runat="server" CssClass="table table-striped table-sm" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="AlarmLogId" AllowSorting="True" AllowPaging="True">
+    <HeaderStyle CssClass="table-dark" />
+    <PagerStyle CssClass="active GridPager" />
+    <PagerSettings Mode="NumericFirstLast" />
+    <SelectedRowStyle CssClass="info" />
+    <EmptyDataTemplate>
+        Nessun record trovato
+    </EmptyDataTemplate>
+    <Columns>
+        <asp:BoundField DataField="DtRif" HeaderText="DtRif" ReadOnly="True" SortExpression="DtRif" ItemStyle-CssClass="text-nowrap" />
+        <asp:TemplateField HeaderText="Mem" SortExpression="MemAddress" ItemStyle-CssClass="text-nowrap">
+            <%--<EditItemTemplate>
+                <asp:Label ID="Label1" runat="server" Text='<%# Eval("MemAddress") %>'></asp:Label>
+            </EditItemTemplate>--%>
+            <ItemTemplate>
+                <asp:Label ID="Label1" runat="server" Text='<%# Eval("MemAddress") %>'></asp:Label>.
+                <asp:Label ID="Label2" runat="server" Text='<%# Eval("MemIndex") %>'></asp:Label>
+
+            </ItemTemplate>
+        </asp:TemplateField>
+        <asp:BoundField DataField="Status" HeaderText="Status" SortExpression="Status" />
+        <asp:BoundField DataField="ValDecoded" HeaderText="ValDecoded" SortExpression="ValDecoded" />
+        <%--<asp:BoundField DataField="DtNotify" HeaderText="DtNotify" ReadOnly="True" SortExpression="DtNotify" />--%>
+        <%--<asp:BoundField DataField="UserAck" HeaderText="UserAck" ReadOnly="True" SortExpression="UserAck" />--%>
+        <%--<asp:BoundField DataField="DtAck" HeaderText="DtAck" ReadOnly="True" SortExpression="DtAck" />--%>
+    </Columns>
+</asp:GridView>
+<%--EnableCaching="true" CacheDuration="60"--%>
+<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getFiltPaged" SelectCountMethod="getFiltCount" StartRowIndexParameterName="startRowIndex" MaximumRowsParameterName="maximumRows" TypeName="MapoDb.DS_applicazioneTableAdapters.AlarmLogTableAdapter" EnablePaging="true">
+    <SelectParameters>
+        <asp:SessionParameter Type="String" DefaultValue="0" SessionField="IdxMacchinaAlarmLog" Name="IdxMacchina" />
+        <asp:SessionParameter Type="DateTime" DefaultValue="" SessionField="_inizio" Name="dtFrom" />
+        <asp:SessionParameter Type="DateTime" SessionField="_fine" Name="dtTo" />
+        <asp:Parameter DefaultValue="true" Name="showMulti" Type="Boolean" />
+        <asp:ControlParameter ControlID="txtSearch" Name="searchVal" DefaultValue="" Type="String" />
+    </SelectParameters>
+</asp:ObjectDataSource>

MP-SITE/WebUserControls/mod_logAllarmi.ascx.cs

@@ -0,0 +1,73 @@
+using SteamWare;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace MP_SITE.WebUserControls
+{
+    public partial class mod_logAllarmi : baseProdControl
+    {
+        #region Public Methods
+
+        public override void aggiornamento()
+        {
+            if (memLayer.ML.CRI("_logLevel") > 5)
+            {
+                logger.lg.scriviLog("inizio caricamento dati FluxLog", tipoLog.INFO);
+            }
+            grView.PageSize = _numRighe;
+            ods.DataBind();
+            if (memLayer.ML.CRI("_logLevel") > 5)
+            {
+                logger.lg.scriviLog("fine caricamento dati FluxLog", tipoLog.INFO);
+            }
+            if (!Page.IsPostBack)
+            {
+                fixMacchina();
+            }
+        }
+
+        public void reportUpdt(object sender, EventArgs e)
+        {
+            reportUpdate();
+        }
+
+        #endregion Public Methods
+
+        #region Protected Methods
+
+        protected void lbtReset_Click(object sender, EventArgs e)
+        {
+            txtSearch.Text = "";
+        }
+
+        protected void txtSearch_TextChanged(object sender, EventArgs e)
+        {
+            grView.DataBind();
+        }
+
+        #endregion Protected Methods
+
+        #region Private Methods
+
+        private void fixMacchina()
+        {
+            string IdxMacc = memLayer.ML.StringSessionObj("IdxMacchina");
+            int idx = 0;
+            if (isMulti(IdxMacc))
+            {
+                idx = IdxMacc.IndexOf("#", StringComparison.OrdinalIgnoreCase);
+                if (idx > 0)
+                {
+                    IdxMacc = IdxMacc.Substring(0, IdxMacc.IndexOf("#", StringComparison.OrdinalIgnoreCase));
+                }
+            }
+            memLayer.ML.setSessionVal("IdxMacchinaAlarmLog", IdxMacc);
+        }
+
+        #endregion Private Methods
+    }
+}

MP-SITE/WebUserControls/mod_logAllarmi.ascx.designer.cs

@@ -0,0 +1,53 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MP_SITE.WebUserControls
+{
+
+
+    public partial class mod_logAllarmi
+    {
+
+        /// <summary>
+        /// txtSearch control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtSearch;
+
+        /// <summary>
+        /// lbtReset control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtReset;
+
+        /// <summary>
+        /// grView control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView grView;
+
+        /// <summary>
+        /// ods control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+    }
+}

MP-Site/MP-Site.csproj

@@ -475,6 +475,7 @@
     <Content Include="WebUserControls\mod_immagineStato.ascx" />
     <Content Include="WebUserControls\mod_infoAggiuntive.ascx" />
     <Content Include="WebUserControls\mod_listaStatiEventi.ascx" />
+    <Content Include="WebUserControls\mod_logAllarmi.ascx" />
     <Content Include="WebUserControls\mod_logControlli.ascx" />
     <Content Include="WebUserControls\mod_logEventi.ascx" />
     <Content Include="WebUserControls\mod_logFluxData.ascx" />
@@ -817,6 +818,13 @@
     <Compile Include="WebUserControls\mod_listaStatiEventi.ascx.designer.cs">
       <DependentUpon>mod_listaStatiEventi.ascx</DependentUpon>
     </Compile>
+    <Compile Include="WebUserControls\mod_logAllarmi.ascx.cs">
+      <DependentUpon>mod_logAllarmi.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\mod_logAllarmi.ascx.designer.cs">
+      <DependentUpon>mod_logAllarmi.ascx</DependentUpon>
+    </Compile>
     <Compile Include="WebUserControls\mod_logControlli.ascx.cs">
       <DependentUpon>mod_logControlli.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

MP-Site/WebUserControls/mod_listaStatiEventi.ascx

@@ -9,13 +9,14 @@
 <%@ Register Src="~/WebUserControls/mod_logControlli.ascx" TagPrefix="uc1" TagName="mod_logControlli" %>
 <%@ Register Src="~/WebUserControls/mod_logFluxData.ascx" TagPrefix="uc1" TagName="mod_logFluxData" %>
 <%@ Register Src="~/WebUserControls/mod_logTC.ascx" TagPrefix="uc1" TagName="mod_logTC" %>
+<%@ Register Src="~/WebUserControls/mod_logAllarmi.ascx" TagPrefix="uc1" TagName="mod_logAllarmi" %>
+
 
 <asp:TabContainer ID="TabContLogs" runat="server" ScrollBars="Auto" Visible="True" ActiveTabIndex="0">
     <asp:TabPanel ID="TabProduzione" runat="server" ScrollBars="Auto">
         <HeaderTemplate>
             <%: traduci("Produzione") %>
         </HeaderTemplate>
-
         <ContentTemplate>
             <uc1:mod_infoAggiuntive ID="mod_infoAggiuntive1" runat="server"></uc1:mod_infoAggiuntive>
         </ContentTemplate>
@@ -24,88 +25,74 @@
         <HeaderTemplate>
             <%: traduci("DatiConfermati") %>
         </HeaderTemplate>
-
         <ContentTemplate>
-
             <uc2:mod_datiConfermati ID="mod_datiConfermati1" runat="server" />
         </ContentTemplate>
     </asp:TabPanel>
     <asp:TabPanel ID="TabTC" runat="server" ScrollBars="Auto">
         <HeaderTemplate>
-
             <%: traduci("LogTempiCiclo") %>
         </HeaderTemplate>
-
         <ContentTemplate>
-
             <div class="px-1">
-
                 <uc1:mod_logTC runat="server" ID="mod_logTC" />
             </div>
         </ContentTemplate>
     </asp:TabPanel>
     <asp:TabPanel ID="TabLogStati" runat="server" ScrollBars="Auto">
         <HeaderTemplate>
-
             <%: traduci("LogStati") %>
         </HeaderTemplate>
-
         <ContentTemplate>
-
             <uc1:mod_logStati runat="server" ID="mod_logStati" />
         </ContentTemplate>
     </asp:TabPanel>
     <asp:TabPanel ID="TabLogEventi" runat="server" ScrollBars="Auto">
         <HeaderTemplate>
-
             <%: traduci("LogEventi") %>
         </HeaderTemplate>
-
         <ContentTemplate>
-
             <uc1:mod_logEventi runat="server" ID="mod_logEventi" />
         </ContentTemplate>
     </asp:TabPanel>
     <asp:TabPanel ID="TabLogControlli" runat="server" ScrollBars="Auto">
         <HeaderTemplate>
-
             <%: traduci("LogControlli") %>
         </HeaderTemplate>
-
         <ContentTemplate>
-
             <div class="px-1">
-
                 <uc1:mod_logControlli runat="server" ID="mod_logControlli" />
             </div>
         </ContentTemplate>
     </asp:TabPanel>
     <asp:TabPanel ID="TabLogScarti" runat="server" ScrollBars="Auto">
         <HeaderTemplate>
-
             <%: traduci("LogScarti") %>
         </HeaderTemplate>
-
         <ContentTemplate>
-
             <div class="px-1">
-
                 <uc1:mod_logScarti runat="server" ID="mod_logScarti" />
             </div>
         </ContentTemplate>
     </asp:TabPanel>
     <asp:TabPanel ID="TabFluxLog" runat="server" ScrollBars="Auto">
         <HeaderTemplate>
-
             <%: traduci("LogFluxData") %>
         </HeaderTemplate>
-
         <ContentTemplate>
-
             <div class="px-1">
-
                 <uc1:mod_logFluxData runat="server" ID="mod_logFluxData" />
             </div>
         </ContentTemplate>
     </asp:TabPanel>
+    <asp:TabPanel ID="TabAlarmLog" runat="server" ScrollBars="Auto">
+        <HeaderTemplate>
+            <%: traduci("LogAlarms") %>
+        </HeaderTemplate>
+        <ContentTemplate>
+            <div class="px-1">
+                <uc1:mod_logAllarmi runat="server" ID="mod_logAllarmi" />
+            </div>
+        </ContentTemplate>
+    </asp:TabPanel>
 </asp:TabContainer>

MP-Site/WebUserControls/mod_listaStatiEventi.ascx.cs

@@ -6,13 +6,6 @@ namespace MP_SITE.WebUserControls
 {
     public partial class mod_listaStatiEventi : baseUserControl
     {
-        #region Protected Fields
-
-        protected int _numRighe = 17;
-        protected resoconti _resoconti;
-
-        #endregion Protected Fields
-
         #region Public Events
 
         public event EventHandler eh_doUpdate;
@@ -58,44 +51,6 @@ namespace MP_SITE.WebUserControls
 
         #endregion Public Properties
 
-        #region Private Methods
-
-        private void Mod_logStati_eh_doUpdate(object sender, EventArgs e)
-        {
-            reportUpdate();
-        }
-
-        #endregion Private Methods
-
-        #region Protected Methods
-
-        protected override void Page_Load(object sender, EventArgs e)
-        {
-            _resoconti = new resoconti();
-            if (!Page.IsPostBack)
-            {
-                aggiornamento();
-            }
-            mod_logStati.eh_doUpdate += Mod_logStati_eh_doUpdate;
-        }
-
-        protected void reportUpdate()
-        {
-            // alzo l'evento d update/inserimento e ricarico cache...
-            if (eh_doUpdate != null)
-            {
-                eh_doUpdate(this, new EventArgs());
-            }
-        }
-
-        protected void txtRighe_TextChanged(object sender, EventArgs e)
-        {
-            //numRighe = Convert.ToInt32(txtRighe.Text);
-            aggiornamento();
-        }
-
-        #endregion Protected Methods
-
         #region Public Methods
 
         public void aggiornamento()
@@ -162,5 +117,50 @@ namespace MP_SITE.WebUserControls
         }
 
         #endregion Public Methods
+
+        #region Protected Fields
+
+        protected int _numRighe = 17;
+        protected resoconti _resoconti;
+
+        #endregion Protected Fields
+
+        #region Protected Methods
+
+        protected override void Page_Load(object sender, EventArgs e)
+        {
+            _resoconti = new resoconti();
+            if (!Page.IsPostBack)
+            {
+                aggiornamento();
+            }
+            mod_logStati.eh_doUpdate += Mod_logStati_eh_doUpdate;
+        }
+
+        protected void reportUpdate()
+        {
+            // alzo l'evento d update/inserimento e ricarico cache...
+            if (eh_doUpdate != null)
+            {
+                eh_doUpdate(this, new EventArgs());
+            }
+        }
+
+        protected void txtRighe_TextChanged(object sender, EventArgs e)
+        {
+            //numRighe = Convert.ToInt32(txtRighe.Text);
+            aggiornamento();
+        }
+
+        #endregion Protected Methods
+
+        #region Private Methods
+
+        private void Mod_logStati_eh_doUpdate(object sender, EventArgs e)
+        {
+            reportUpdate();
+        }
+
+        #endregion Private Methods
     }
 }

MP-Site/WebUserControls/mod_listaStatiEventi.ascx.designer.cs

@@ -166,5 +166,23 @@ namespace MP_SITE.WebUserControls
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::MP_SITE.WebUserControls.mod_logFluxData mod_logFluxData;
+
+        /// <summary>
+        /// TabAlarmLog control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.TabPanel TabAlarmLog;
+
+        /// <summary>
+        /// mod_logAllarmi control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MP_SITE.WebUserControls.mod_logAllarmi mod_logAllarmi;
     }
 }

MP-Site/WebUserControls/mod_logFluxData.ascx.cs

@@ -38,7 +38,6 @@ namespace MP_SITE.WebUserControls
         protected void lbtReset_Click(object sender, EventArgs e)
         {
             txtSearch.Text = "";
-            //grView.DataBind();
         }
 
         protected void txtSearch_TextChanged(object sender, EventArgs e)

MP-Site/WebUserControls/mod_periodoAnalisi.ascx.cs

@@ -3,338 +3,367 @@ using System;
 
 namespace MP_SITE.WebUserControls
 {
-  public partial class mod_periodoAnalisi : System.Web.UI.UserControl
-  {
-    #region area protected
+    public partial class mod_periodoAnalisi : System.Web.UI.UserControl
+    {
+        #region Public Events
 
-    protected intervalloDate _intervallo;
+        public event EventHandler eh_doUpdate;
 
-    protected bool dtModStarted
-    {
-      get
-      {
-        return btnUpdate.Visible;
-      }
-    }
+        #endregion Public Events
 
-    protected override void OnInit(EventArgs e)
-    {
-      if (!Page.IsPostBack && !dtModStarted)
-      {
-        base.OnInit(e);
-        setIntervallo();
-        setDurataMin();
-      }
-    }
+        #region Public Properties
 
-    /// <summary>
-    /// gestione del selettore rapido dell'intervallo temporale...
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected void ddlPeriodo_SelectedIndexChanged(object sender, EventArgs e)
-    {
-      // verifico cosa sia cambiato ed imposto date...
-      datario _datario = new datario();
-      switch (ddlPeriodo.SelectedValue)
-      {
-        case "oggi":
-          _intervallo = _datario.giornata(DateTime.Now);
-          break;
-        case "ieri":
-          _intervallo = _datario.giornata(DateTime.Now.AddDays(-1));
-          break;
-        case "ultimi 7gg":
-          _intervallo = _datario.ultimiGiorni(DateTime.Now, 7);
-          break;
-        case "questa settimana":
-          _intervallo = _datario.questaSett(DateTime.Now);
-          break;
-        case "ultimi 30gg":
-          _intervallo = _datario.ultimiGiorni(DateTime.Now, 30);
-          break;
-        case "questo mese":
-          _intervallo = _datario.questoMese(DateTime.Now);
-          break;
-        default:
-          break;
-      }
-      if ((intervalloAnalisi.inizio != _intervallo.inizio) || (intervalloAnalisi.fine != _intervallo.fine))
-      {
-        verificaCoerenzaDate();
-        aggiornaDateMostrate(false);
-        // mostro btn update
-        btnUpdate.Visible = true;
-      }
-    }
-    /// <summary>
-    /// effettua update delle date mostrate da intervallo analisi (ed eventualmente riporta update...)
-    /// </summary>
-    /// <param name="doReportUpdate"></param>
-    private void aggiornaDateMostrate(bool doReportUpdate)
-    {
-      scriviDate();
-      if (doReportUpdate)
-      {
-        reportUpdate();
-      }
-    }
-    /// <summary>
-    /// scrive nuove date in controllo
-    /// </summary>
-    private void scriviDate()
-    {
-      // se intervallo non è valorizzato leggo da sessione...
-      if (!_intervallo.isValid)
-      {
-        _intervallo = intervalloAnalisi;
-      }
-      txtInizio.Text = _intervallo.inizio.ToShortDateString();
-      ddlOraInizio.SelectedValue = _intervallo.inizio.Hour.ToString("00");
-      txtFine.Text = _intervallo.fine.ToShortDateString();
-      ddlOraFine.SelectedValue = _intervallo.fine.Hour.ToString("00");
-      // se è 1 sett seleziono quello, altrimenti primo...
-      if (_intervallo.fine.Subtract(_intervallo.inizio).Days == 7)
-      {
-        ddlPeriodo.SelectedIndex =4;
-      }
-      else
-      {
-        setPeriodoFree();
-      }
-    }
-
-    private void setIntervallo()
-    {
-      intervalloDate _intervallo;
-      try
-      {
-        _intervallo = (intervalloDate)memLayer.ML.objSessionObj("_intervallo");
-      }
-      catch
-      {
-        _intervallo = new intervalloDate();
-        _intervallo.inizio = DateTime.Now.AddDays(-7);
-        _intervallo.fine = DateTime.Now;
-        memLayer.ML.setSessionVal("_intervallo", _intervallo);
-        memLayer.ML.setSessionVal("_inizio", _intervallo.inizio);
-        memLayer.ML.setSessionVal("_fine", _intervallo.fine);
-      }
-      scriviDate();
-    }
-    private void setDurataMin()
-    {
-      int _durataMin;
-      if (memLayer.ML.isInSessionObject("_durataMin"))
-      {
-        _durataMin = memLayer.ML.IntSessionObj("_durataMin");
-      }
-      else
-      {
-        _durataMin = 0;
-        memLayer.ML.setSessionVal("_durataMin", _durataMin);
-      }
-      txtDurataMin.Text = _durataMin.ToString();
-    }
-    protected void Page_Load(object sender, EventArgs e)
-    {
-      if (!Page.IsPostBack)
-      {
-        txtInizio.ToolTip = "inizio periodo di riferimento per i dati mostrati";
-        txtFine.ToolTip = "fine periodo di riferimento per i dati mostrati";
-        lblDurataMin.Text = "Visualizza eventi con durata superiore a";
-      }
-    }
-
-
-    private void aggiornaPeriodo()
-    {
-      _intervallo = new intervalloDate();
-      // calcolo tempi arrotondati
-      int oraInizio = Convert.ToInt32(ddlOraInizio.SelectedValue);
-      int oraFine = Convert.ToInt32(ddlOraFine.SelectedValue);
-      _intervallo.inizio = Convert.ToDateTime(txtInizio.Text).AddHours(oraInizio);
-      _intervallo.fine = Convert.ToDateTime(txtFine.Text).AddHours(oraFine);
-      verificaCoerenzaDate();
-      int _durataMin;
-      _durataMin = Convert.ToInt32(txtDurataMin.Text);
-      memLayer.ML.setSessionVal("_durataMin", _durataMin);
-      reportUpdate();
-
-    }
-    /// <summary>
-    /// verifica che le date dell'intervallo siano coerenti (inizio < fine)
-    /// </summary>
-    private void verificaCoerenzaDate()
-    {
-      // controllo date siano coerenti (fine > inizio)...
-      if (_intervallo.inizio >= _intervallo.fine)
-      {
-        // controllo non siano date successive ad oggi...
-        if (_intervallo.fine > DateTime.Now)
+        public intervalloDate intervalloAnalisi
         {
-          _intervallo.fine = DateTime.Now;
+            get
+            {
+                return (intervalloDate)memLayer.ML.objSessionObj("_intervallo");
+            }
+            set
+            {
+                intervalloDate interv = value;
+                memLayer.ML.setSessionVal("_intervallo", interv);
+                memLayer.ML.setSessionVal("_inizio", interv.inizio);
+                memLayer.ML.setSessionVal("_fine", interv.fine);
+            }
         }
-        _intervallo.inizio = _intervallo.fine.AddDays(-1);
-      }
-      //intervalloAnalisi = _intervallo;
-      aggiornaDateMostrate(false);
-    }
-    /// <summary>
-    /// evento cambio testo data inizio
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected void txtInizio_TextChanged(object sender, EventArgs e)
-    {
-      // imposto il selettore a discesa...
-      setPeriodoFree();
-      // mostro btn update
-      btnUpdate.Visible = true;
-    }
-    /// <summary>
-    /// evento cambio testo data fine
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected void txtFine_TextChanged(object sender, EventArgs e)
-    {
-      // imposto il selettore a discesa...
-      setPeriodoFree();
-      // mostro btn update
-      btnUpdate.Visible = true;
-    }
-    /// <summary>
-    /// in questo caso faccio udpate periodo mostrato
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected void btnUpdate_Click(object sender, EventArgs e)
-    {
-      aggiornaPeriodo();
-      // nascondo btn update
-      btnUpdate.Visible = false;
-    }
-    /// <summary>
-    /// riporta aggiornamento a controller
-    /// </summary>
-    protected void reportUpdate()
-    {
-      intervalloAnalisi = _intervallo;
-      // alzo l'evento d update/inserimento e ricarico cache...
-      if (eh_doUpdate != null)
-      {
-        eh_doUpdate(this, new EventArgs());
-      }
-    }
 
-    #endregion
+        #endregion Public Properties
 
-    #region area public
+        #region Public Methods
 
-    public intervalloDate intervalloAnalisi
-    {
-      get
-      {
-        return (intervalloDate)memLayer.ML.objSessionObj("_intervallo");
-      }
-      set
-      {
-        intervalloDate interv = value;
-        memLayer.ML.setSessionVal("_intervallo", interv);
-        memLayer.ML.setSessionVal("_inizio", interv.inizio);
-        memLayer.ML.setSessionVal("_fine", interv.fine);
-      }
-    }
-    /// <summary>
-    /// effettua update
-    /// </summary>
-    /// <param name="doReportUpdate"></param>
-    public void doUpdate(bool doReportUpdate)
-    {
-      aggiornaDateMostrate(doReportUpdate);
-    }
-    /// <summary>
-    /// imposta periodo libero di selezione
-    /// </summary>
-    public void setPeriodoFree()
-    {
-      ddlPeriodo.SelectedIndex = 0;
-    }
-
-    #region gestione eventi
-
-    public event EventHandler eh_doUpdate;
-
-    #endregion
-
-    /// <summary>
-    /// effettua uno zoom 2 X sulle date attuali
-    /// </summary>
-    public void dateZoom()
-    {
-      // calcolo zoom 2X
-      double intervMinutiOrig = intervalloAnalisi.fine.Subtract(intervalloAnalisi.inizio).TotalMinutes;
-      // leggo data in cui lo zoom era centrato...
-      DateTime centroZoom = Convert.ToDateTime(memLayer.ML.objSessionObj("zoomCenter"));
-      // calcolo posizione relativa zoom...
-      double posizioneZoom = centroZoom.Subtract(intervalloAnalisi.inizio).TotalMinutes / intervMinutiOrig;
-      // init!
-      _intervallo = intervalloAnalisi;
-      // verifico che azione fare
-      if (posizioneZoom < 0.25) // se è nel 1/4 lascio zoom inalterato e "vado a sx" di 1/2 intervallo
-      {
-        if (intervMinutiOrig > 120)
+        /// <summary>
+        /// effettua uno zoom 2 X sulle date attuali
+        /// </summary>
+        public void dateZoom()
         {
-          _intervallo.inizio = _intervallo.inizio.AddMinutes(-intervMinutiOrig / 2.0);
-          _intervallo.fine = _intervallo.fine.AddMinutes(-intervMinutiOrig / 2.0);
-        }
-        else
-        {
-          _intervallo.inizio = _intervallo.inizio.AddMinutes(-60);
-          _intervallo.fine = _intervallo.fine.AddMinutes(-60);
-        }
-      }
-      else if (posizioneZoom > 0.75) // se è nel 3/4 lascio zoom inalterato e "vado a dx"
-      {
-        // mi imposto al max tra spostamento di 1/2 e l'ultimo dato disponibile...
-        if (intervMinutiOrig > 120)
-        {
-          _intervallo.fine = _intervallo.fine.AddMinutes(intervMinutiOrig / 2.0);
-          if (_intervallo.fine > DateTime.Now)
-          {
-            _intervallo.fine = DateTime.Now;
-          }
-          _intervallo.inizio = _intervallo.fine.AddMinutes(-intervMinutiOrig);
-        }
-        else
-        {
-          _intervallo.inizio = _intervallo.inizio.AddMinutes(60);
-          _intervallo.fine = _intervallo.fine.AddMinutes(60);
-        }
-      }
-      else // zoom!!!
-      {
-        if (intervMinutiOrig > 120)
-        {
-          _intervallo.inizio = _intervallo.inizio.AddMinutes(intervMinutiOrig / 4.0);
-          _intervallo.fine = _intervallo.fine.AddMinutes(-intervMinutiOrig / 4.0);
-        }
-        else // 1 ora di zoom!
-        {
-          _intervallo.inizio = _intervallo.inizio.Date.AddHours(_intervallo.inizio.TimeOfDay.Hours);
-          _intervallo.fine = _intervallo.inizio.AddHours(1);
-        }
-      }
-      // arrotondo all'ora...
-      _intervallo.inizio = _intervallo.inizio.Date.AddHours(_intervallo.inizio.TimeOfDay.Hours);
-      _intervallo.fine = _intervallo.fine.Date.AddHours(_intervallo.fine.TimeOfDay.Hours);
-      // aggiorno in sessione
-      intervalloAnalisi = _intervallo;                
+            // calcolo zoom 2X
+            double intervMinutiOrig = intervalloAnalisi.fine.Subtract(intervalloAnalisi.inizio).TotalMinutes;
+            // leggo data in cui lo zoom era centrato...
+            DateTime centroZoom = Convert.ToDateTime(memLayer.ML.objSessionObj("zoomCenter"));
+            // calcolo posizione relativa zoom...
+            double posizioneZoom = centroZoom.Subtract(intervalloAnalisi.inizio).TotalMinutes / intervMinutiOrig;
+            // init!
+            _intervallo = intervalloAnalisi;
+            // verifico che azione fare
+            if (posizioneZoom < 0.25) // se è nel 1/4 lascio zoom inalterato e "vado a sx" di 1/2 intervallo
+            {
+                if (intervMinutiOrig > 120)
+                {
+                    _intervallo.inizio = _intervallo.inizio.AddMinutes(-intervMinutiOrig / 2.0);
+                    _intervallo.fine = _intervallo.fine.AddMinutes(-intervMinutiOrig / 2.0);
+                }
+                else
+                {
+                    _intervallo.inizio = _intervallo.inizio.AddMinutes(-60);
+                    _intervallo.fine = _intervallo.fine.AddMinutes(-60);
+                }
+            }
+            else if (posizioneZoom > 0.75) // se è nel 3/4 lascio zoom inalterato e "vado a dx"
+            {
+                // mi imposto al max tra spostamento di 1/2 e l'ultimo dato disponibile...
+                if (intervMinutiOrig > 120)
+                {
+                    _intervallo.fine = _intervallo.fine.AddMinutes(intervMinutiOrig / 2.0);
+                    if (_intervallo.fine > DateTime.Now)
+                    {
+                        _intervallo.fine = DateTime.Now;
+                    }
+                    _intervallo.inizio = _intervallo.fine.AddMinutes(-intervMinutiOrig);
+                }
+                else
+                {
+                    _intervallo.inizio = _intervallo.inizio.AddMinutes(60);
+                    _intervallo.fine = _intervallo.fine.AddMinutes(60);
+                }
+            }
+            else // zoom!!!
+            {
+                if (intervMinutiOrig > 120)
+                {
+                    _intervallo.inizio = _intervallo.inizio.AddMinutes(intervMinutiOrig / 4.0);
+                    _intervallo.fine = _intervallo.fine.AddMinutes(-intervMinutiOrig / 4.0);
+                }
+                else // 1 ora di zoom!
+                {
+                    _intervallo.inizio = _intervallo.inizio.Date.AddHours(_intervallo.inizio.TimeOfDay.Hours);
+                    _intervallo.fine = _intervallo.inizio.AddHours(1);
+                }
+            }
+            // arrotondo all'ora...
+            _intervallo.inizio = _intervallo.inizio.Date.AddHours(_intervallo.inizio.TimeOfDay.Hours);
+            _intervallo.fine = _intervallo.fine.Date.AddHours(_intervallo.fine.TimeOfDay.Hours);
+            // aggiorno in sessione
+            intervalloAnalisi = _intervallo;
 
-      Response.Redirect(Request.Url.AbsoluteUri);
+            Response.Redirect(Request.Url.AbsoluteUri);
+        }
+
+        /// <summary>
+        /// effettua update
+        /// </summary>
+        /// <param name="doReportUpdate"></param>
+        public void doUpdate(bool doReportUpdate)
+        {
+            aggiornaDateMostrate(doReportUpdate);
+        }
+
+        /// <summary>
+        /// imposta periodo libero di selezione
+        /// </summary>
+        public void setPeriodoFree()
+        {
+            ddlPeriodo.SelectedIndex = 0;
+        }
+
+        #endregion Public Methods
+
+        #region Protected Fields
+
+        protected intervalloDate _intervallo;
+
+        #endregion Protected Fields
+
+        #region Protected Properties
+
+        protected bool dtModStarted
+        {
+            get
+            {
+                return btnUpdate.Visible;
+            }
+        }
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        /// <summary>
+        /// in questo caso faccio udpate periodo mostrato
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUpdate_Click(object sender, EventArgs e)
+        {
+            aggiornaPeriodo();
+            // nascondo btn update
+            btnUpdate.Visible = false;
+        }
+
+        /// <summary>
+        /// gestione del selettore rapido dell'intervallo temporale...
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPeriodo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            // verifico cosa sia cambiato ed imposto date...
+            datario _datario = new datario();
+            switch (ddlPeriodo.SelectedValue)
+            {
+                case "oggi":
+                    _intervallo = _datario.giornata(DateTime.Now);
+                    break;
+
+                case "ieri":
+                    _intervallo = _datario.giornata(DateTime.Now.AddDays(-1));
+                    break;
+
+                case "ultimi 7gg":
+                    _intervallo = _datario.ultimiGiorni(DateTime.Now, 7);
+                    break;
+
+                case "questa settimana":
+                    _intervallo = _datario.questaSett(DateTime.Now);
+                    break;
+
+                case "ultimi 30gg":
+                    _intervallo = _datario.ultimiGiorni(DateTime.Now, 30);
+                    break;
+
+                case "questo mese":
+                    _intervallo = _datario.questoMese(DateTime.Now);
+                    break;
+
+                default:
+                    break;
+            }
+            if ((intervalloAnalisi.inizio != _intervallo.inizio) || (intervalloAnalisi.fine != _intervallo.fine))
+            {
+                verificaCoerenzaDate();
+                aggiornaDateMostrate(false);
+                // mostro btn update
+                btnUpdate.Visible = true;
+            }
+        }
+
+        protected override void OnInit(EventArgs e)
+        {
+            if (!Page.IsPostBack && !dtModStarted)
+            {
+                base.OnInit(e);
+                setIntervallo();
+                setDurataMin();
+            }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!Page.IsPostBack)
+            {
+                txtInizio.ToolTip = "inizio periodo di riferimento per i dati mostrati";
+                txtFine.ToolTip = "fine periodo di riferimento per i dati mostrati";
+                lblDurataMin.Text = "Visualizza eventi con durata superiore a";
+            }
+        }
+
+        /// <summary>
+        /// riporta aggiornamento a controller
+        /// </summary>
+        protected void reportUpdate()
+        {
+            intervalloAnalisi = _intervallo;
+            // alzo l'evento d update/inserimento e ricarico cache...
+            if (eh_doUpdate != null)
+            {
+                eh_doUpdate(this, new EventArgs());
+            }
+        }
+
+        /// <summary>
+        /// evento cambio testo data fine
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void txtFine_TextChanged(object sender, EventArgs e)
+        {
+            // imposto il selettore a discesa...
+            setPeriodoFree();
+            // mostro btn update
+            btnUpdate.Visible = true;
+        }
+
+        /// <summary>
+        /// evento cambio testo data inizio
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void txtInizio_TextChanged(object sender, EventArgs e)
+        {
+            // imposto il selettore a discesa...
+            setPeriodoFree();
+            // mostro btn update
+            btnUpdate.Visible = true;
+        }
+
+        #endregion Protected Methods
+
+        #region Private Methods
+
+        /// <summary>
+        /// effettua update delle date mostrate da intervallo analisi (ed eventualmente riporta update...)
+        /// </summary>
+        /// <param name="doReportUpdate"></param>
+        private void aggiornaDateMostrate(bool doReportUpdate)
+        {
+            scriviDate();
+            if (doReportUpdate)
+            {
+                reportUpdate();
+            }
+        }
+
+        private void aggiornaPeriodo()
+        {
+            _intervallo = new intervalloDate();
+            // calcolo tempi arrotondati
+            int oraInizio = Convert.ToInt32(ddlOraInizio.SelectedValue);
+            int oraFine = Convert.ToInt32(ddlOraFine.SelectedValue);
+            _intervallo.inizio = Convert.ToDateTime(txtInizio.Text).AddHours(oraInizio);
+            _intervallo.fine = Convert.ToDateTime(txtFine.Text).AddHours(oraFine);
+            verificaCoerenzaDate();
+            int _durataMin;
+            _durataMin = Convert.ToInt32(txtDurataMin.Text);
+            memLayer.ML.setSessionVal("_durataMin", _durataMin);
+            reportUpdate();
+        }
+
+        /// <summary>
+        /// scrive nuove date in controllo
+        /// </summary>
+        private void scriviDate()
+        {
+            // se intervallo non è valorizzato leggo da sessione...
+            if (!_intervallo.isValid)
+            {
+                _intervallo = intervalloAnalisi;
+            }
+            txtInizio.Text = _intervallo.inizio.ToShortDateString();
+            ddlOraInizio.SelectedValue = _intervallo.inizio.Hour.ToString("00");
+            txtFine.Text = _intervallo.fine.ToShortDateString();
+            ddlOraFine.SelectedValue = _intervallo.fine.Hour.ToString("00");
+            // se è 1 sett seleziono quello, altrimenti primo...
+            if (_intervallo.fine.Subtract(_intervallo.inizio).Days == 7)
+            {
+                ddlPeriodo.SelectedIndex = 4;
+            }
+            else
+            {
+                setPeriodoFree();
+            }
+        }
+
+        private void setDurataMin()
+        {
+            int _durataMin;
+            if (memLayer.ML.isInSessionObject("_durataMin"))
+            {
+                _durataMin = memLayer.ML.IntSessionObj("_durataMin");
+            }
+            else
+            {
+                _durataMin = 0;
+                memLayer.ML.setSessionVal("_durataMin", _durataMin);
+            }
+            txtDurataMin.Text = _durataMin.ToString();
+        }
+
+        private void setIntervallo()
+        {
+            intervalloDate _intervallo;
+            try
+            {
+                _intervallo = (intervalloDate)memLayer.ML.objSessionObj("_intervallo");
+            }
+            catch
+            {
+                _intervallo = new intervalloDate();
+                _intervallo.inizio = DateTime.Now.AddDays(-3);
+                _intervallo.fine = DateTime.Now;
+                memLayer.ML.setSessionVal("_intervallo", _intervallo);
+                memLayer.ML.setSessionVal("_inizio", _intervallo.inizio);
+                memLayer.ML.setSessionVal("_fine", _intervallo.fine);
+            }
+            scriviDate();
+        }
+
+        /// <summary> verifica che le date dell'intervallo siano coerenti (inizio < fine) </summary>
+        private void verificaCoerenzaDate()
+        {
+            // controllo date siano coerenti (fine > inizio)...
+            if (_intervallo.inizio >= _intervallo.fine)
+            {
+                // controllo non siano date successive ad oggi...
+                if (_intervallo.fine > DateTime.Now)
+                {
+                    _intervallo.fine = DateTime.Now;
+                }
+                _intervallo.inizio = _intervallo.fine.AddDays(-1);
+            }
+            //intervalloAnalisi = _intervallo;
+            aggiornaDateMostrate(false);
+        }
+
+        #endregion Private Methods
     }
-
-    #endregion
-  }
 }

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" %>
+
+
+<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
+      <div class="container-flow m-3" role="main">
+        <div class="row">
+            <div class="col-12 col-md-8 col-lg-9 col-xl-10">
+                <div class="my-2">
+                    <uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
+                </div>
+                <%--<uc1:mod_controlliProd runat="server" ID="mod_controlliProd" />--%>
+                <asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="true">
+                    <ProgressTemplate>
+                        <div id="progress_back">
+                        </div>
+                        <div id="progress_top" class="text-center text-warning align-middle">
+                            <i class="fa fa-spinner fa-pulse"></i>&nbsp;
+              <b>ELABORAZIONE IN CORSO</b>
+                            <i class="fa fa-spinner fa-pulse"></i>&nbsp;
+              <div class="progress">
+                  <div class="progress-bar progress-bar-striped bg-success progress-bar-animated" role="progressbar" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100" style="width: 75%"></div>
+              </div>
+                        </div>
+                    </ProgressTemplate>
+                </asp:UpdateProgress>
+                <uc1:mod_elencoAllarmi runat="server" id="mod_elencoAllarmi" />
+            </div>
+            <div class="col-12 col-md-4 col-lg-3 col-xl-2">
+                <uc1:mod_directLinks runat="server" ID="mod_directLinks" />
+            </div>
+        </div>
+    </div>
+</asp:Content>

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
+    }
+}

MP-TAB/Allarmi.aspx.designer.cs

@@ -0,0 +1,53 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MoonProTablet
+{
+
+
+    public partial class Allarmi
+    {
+
+        /// <summary>
+        /// mod_dettMacchina1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
+
+        /// <summary>
+        /// updtRicerca control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdateProgress updtRicerca;
+
+        /// <summary>
+        /// mod_elencoAllarmi control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_elencoAllarmi mod_elencoAllarmi;
+
+        /// <summary>
+        /// mod_directLinks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks;
+    }
+}

MP-TAB/MP-TAB.csproj

@@ -265,6 +265,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="About.aspx" />
+    <Content Include="Allarmi.aspx" />
     <Content Include="App_Readme\Elmah.txt" />
     <Content Include="App_Readme\README_SteamWare.txt" />
     <Content Include="App_Readme\SteamWare_demo\example-config-table.txt" />
@@ -728,6 +729,7 @@
     <Content Include="WebUserControls\mod_dettTurni.ascx" />
     <Content Include="WebUserControls\mod_dichiarazione.ascx" />
     <Content Include="WebUserControls\mod_directLinks.ascx" />
+    <Content Include="WebUserControls\mod_elencoAllarmi.ascx" />
     <Content Include="WebUserControls\mod_elencoControlli.ascx" />
     <Content Include="WebUserControls\mod_elencoScarti.ascx" />
     <Content Include="WebUserControls\mod_enrollByAuthKey.ascx" />
@@ -772,6 +774,13 @@
     <Compile Include="About.aspx.designer.cs">
       <DependentUpon>About.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Allarmi.aspx.cs">
+      <DependentUpon>Allarmi.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Allarmi.aspx.designer.cs">
+      <DependentUpon>Allarmi.aspx</DependentUpon>
+    </Compile>
     <Compile Include="App_Start\BundleConfig.cs" />
     <Compile Include="App_Start\MP_Startup.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
@@ -1185,6 +1194,13 @@
     <Compile Include="WebUserControls\mod_directLinks.ascx.designer.cs">
       <DependentUpon>mod_directLinks.ascx</DependentUpon>
     </Compile>
+    <Compile Include="WebUserControls\mod_elencoAllarmi.ascx.cs">
+      <DependentUpon>mod_elencoAllarmi.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="WebUserControls\mod_elencoAllarmi.ascx.designer.cs">
+      <DependentUpon>mod_elencoAllarmi.ascx</DependentUpon>
+    </Compile>
     <Compile Include="WebUserControls\mod_elencoControlli.ascx.cs">
       <DependentUpon>mod_elencoControlli.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

MP-TAB/Update.aspx.cs

@@ -14,6 +14,7 @@ namespace MoonProTablet
         {
             // update vocabolario...
             memLayer.ML.flushRegisteredCache();
+            DataWrap.DW.resetVocabolario();
             // rimando a pag precedente
             Response.Redirect("MappaStato");
         }

MP-TAB/WebUserControls/mod_elencoAllarmi.ascx

@@ -0,0 +1,60 @@
+<%@ 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" %>
+
+<div class="row small">
+    <div class="col-12">
+        <uc1:mod_selPeriodo runat="server" ID="mod_selPeriodo" />
+        <asp:GridView ID="grView" runat="server" CssClass="table table-striped table-dark table-sm" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="AlarmLogId" AllowSorting="true" AllowPaging="true" PageSize="10">
+            <Columns>
+                <asp:TemplateField HeaderText="Elenco Allarmi <i class='fa fa-sort'></i>" SortExpression="DtRif" HeaderStyle-CssClass="btn btn-sm btn-block btn-secondary text-info" HeaderStyle-ForeColor="White">
+                    <ItemTemplate>
+                        <div class="row">
+                            <div class="col-7 small">
+                                <div>
+                                    Mem: <b>
+                                        <asp:Label ID="Label5" runat="server" Text='<%# Eval("MemAddress") %>' />.
+                                        <asp:Label ID="Label2" runat="server" Text='<%# Eval("MemIndex") %>' /></b>
+                                </div>
+                                <div>
+                                    Val: <b>
+                                        <asp:Label ID="Label4" runat="server" CssClass='<%# cssByStatus(Eval("Status")) %>' Text='<%# Eval("ValDecoded") %>' /></b>
+                                </div>
+                            </div>
+                            <div class="col-1 px-0 text-center">
+                                <%--<i runat="server" class="fa fa-check-circle fa-3x text-success" aria-hidden="true" visible='<%# Convert.ToBoolean(Eval("EsitoOK")) %>'></i>
+                                <i runat="server" class="fa fa-ban fa-3x text-danger" aria-hidden="true" visible='<%# !Convert.ToBoolean(Eval("EsitoOK")) %>'></i>--%>
+                            </div>
+                            <div class="col-4 text-right small">
+                                <div class="text-truncate">
+                                    <asp:Label ID="Label1" runat="server" Text='<%# Eval("DtRif","{0:ddd dd.MM.yy HH:mm:ss}") %>' />
+                                    <i class="fa fa-clock-o" aria-hidden="true"></i>
+                                </div>
+                                <div class="text-truncate" runat="server" id="divUser" visible='<%# hasAck(Eval("UserAck")) %>'>
+                                    <b>
+                                        <asp:Label ID="Label3" runat="server" Text='<%# Eval("UserAck") %>' /></b>
+                                    <i class="fa fa-user" aria-hidden="true"></i>
+                                </div>
+                                <div class="text-truncate" runat="server" id="divAck" visible='<%# !hasAck(Eval("UserAck")) %>'>
+                                    <asp:LinkButton runat="server" ID="lbkDoAck" CssClass="btn btn-sm btn-warning py-0" ToolTip='<%# traduci("lblUserAck") %>' OnClick="lbkDoAck_Click" CommandArgument='<%# Eval("AlarmLogId") %>' OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaUserAck") %>'>Set <i class="fa fa-exclamation-triangle" aria-hidden="true"></i></asp:LinkButton>
+                                </div>
+                            </div>
+                            <%--<div class="col-12 small">
+                                <i runat="server" id="iNote" visible='<%# Eval("Note").ToString()!="" %>'>Nota:
+                  <asp:Label ID="Label6" runat="server" CssClass="text-warning" Text='<%# Eval("Note") %>' /></i>
+                            </div>--%>
+                        </div>
+                    </ItemTemplate>
+                </asp:TemplateField>
+            </Columns>
+        </asp:GridView>
+        <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getFilt" TypeName="MapoDb.DS_ApplicazioneTableAdapters.AlarmLogTableAdapter">
+            <SelectParameters>
+                <asp:SessionParameter Type="String" DefaultValue="0" SessionField="IdxMacchinaControlli" Name="IdxMacchina" />
+                <asp:SessionParameter Type="DateTime" DefaultValue="" SessionField="_inizio" Name="dtFrom" />
+                <asp:SessionParameter Type="DateTime" DefaultValue="" SessionField="_fine" Name="dtTo" />
+                <asp:Parameter DefaultValue="false" Name="showMulti" Type="Boolean" />
+            </SelectParameters>
+        </asp:ObjectDataSource>
+    </div>
+</div>

MP-TAB/WebUserControls/mod_elencoAllarmi.ascx.cs

@@ -0,0 +1,81 @@
+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();
+        }
+
+        /// <summary>
+        /// css dato status (0 = all OK, > 0 ALLARMI)
+        /// </summary>
+        /// <param name="status"></param>
+        /// <returns></returns>
+        public string cssByStatus(object rawStatus)
+        {
+            int status = 0;
+            int.TryParse($"{rawStatus}", out status);
+            return status > 0 ? "text-danger" : "text-success";
+        }
+
+        /// <summary>
+        /// Indica se ci sia registrato ACK utente
+        /// </summary>
+        /// <param name="rawUser"></param>
+        /// <returns></returns>
+        public bool hasAck(object rawUser)
+        {
+            return !string.IsNullOrEmpty($"{rawUser}");
+        }
+
+
+        #endregion Public Methods
+
+        protected void lbkDoAck_Click(object sender, EventArgs e)
+        {
+            // recupero button
+            LinkButton lbtn = (LinkButton)sender;
+            if (lbtn != null)
+            {
+                var rawAlarmId = lbtn.CommandArgument;
+                int AlarmId = 0;
+                int.TryParse(rawAlarmId, out AlarmId);
+                if (AlarmId > 0)
+                {
+                    // salvo ACK allarme 
+                    DataLayerObj.taAlarmLog.setAck(AlarmId, DateTime.Now, $"{DataLayerObj.MatrOpr} - {DataLayerObj.CognomeNomeOpr}");
+                    // ricarico
+                    doUpdate();
+                }
+            }
+        }
+    }
+}

MP-TAB/WebUserControls/mod_elencoAllarmi.ascx.designer.cs

@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MoonProTablet.WebUserControls
+{
+
+
+    public partial class mod_elencoAllarmi
+    {
+
+        /// <summary>
+        /// mod_selPeriodo control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_selPeriodo mod_selPeriodo;
+
+        /// <summary>
+        /// grView control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.GridView grView;
+
+        /// <summary>
+        /// ods control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+    }
+}

MapoDb/AlarmsArchive.cs

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 namespace MapoDb
 {
   /// <summary>
-  /// Classe gestione ALLARMI coem eventi speciali (documenti registrati su MongoDb)
+  /// Classe gestione ALLARMI come eventi speciali (documenti registrati su MongoDb)
   /// </summary>
   public class AlarmsArchive
   {

MapoDb/DS_applicazione.Designer.cs

@@ -11189,16 +11189,28 @@ namespace MapoDb {
             
             private global::System.Data.DataColumn columnDtRif;
             
+            private global::System.Data.DataColumn columnDuration;
+            
             private global::System.Data.DataColumn columnMachineId;
             
             private global::System.Data.DataColumn columnMemAddress;
             
             private global::System.Data.DataColumn columnMemIndex;
             
-            private global::System.Data.DataColumn columnStatus;
+            private global::System.Data.DataColumn columnStatusVal;
             
             private global::System.Data.DataColumn columnValDecoded;
             
+            private global::System.Data.DataColumn columnDtNotify;
+            
+            private global::System.Data.DataColumn columnUserAck;
+            
+            private global::System.Data.DataColumn columnDtAck;
+            
+            private global::System.Data.DataColumn columnReqNotify;
+            
+            private global::System.Data.DataColumn columnReqAck;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public AlarmLogDataTable() {
@@ -11248,6 +11260,14 @@ namespace MapoDb {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn DurationColumn {
+                get {
+                    return this.columnDuration;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public global::System.Data.DataColumn MachineIdColumn {
@@ -11274,9 +11294,9 @@ namespace MapoDb {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public global::System.Data.DataColumn StatusColumn {
+            public global::System.Data.DataColumn StatusValColumn {
                 get {
-                    return this.columnStatus;
+                    return this.columnStatusVal;
                 }
             }
             
@@ -11288,6 +11308,46 @@ namespace MapoDb {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn DtNotifyColumn {
+                get {
+                    return this.columnDtNotify;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn UserAckColumn {
+                get {
+                    return this.columnUserAck;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn DtAckColumn {
+                get {
+                    return this.columnDtAck;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn ReqNotifyColumn {
+                get {
+                    return this.columnReqNotify;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn ReqAckColumn {
+                get {
+                    return this.columnReqAck;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -11325,16 +11385,22 @@ namespace MapoDb {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public AlarmLogRow AddAlarmLogRow(System.DateTime DtRif, string MachineId, string MemAddress, int MemIndex, int Status, string ValDecoded) {
+            public AlarmLogRow AddAlarmLogRow(System.DateTime DtRif, decimal Duration, string MachineId, string MemAddress, int MemIndex, int StatusVal, string ValDecoded, System.DateTime DtNotify, string UserAck, System.DateTime DtAck, int ReqNotify, int ReqAck) {
                 AlarmLogRow rowAlarmLogRow = ((AlarmLogRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
                         DtRif,
+                        Duration,
                         MachineId,
                         MemAddress,
                         MemIndex,
-                        Status,
-                        ValDecoded};
+                        StatusVal,
+                        ValDecoded,
+                        DtNotify,
+                        UserAck,
+                        DtAck,
+                        ReqNotify,
+                        ReqAck};
                 rowAlarmLogRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowAlarmLogRow);
                 return rowAlarmLogRow;
@@ -11366,11 +11432,17 @@ namespace MapoDb {
             internal void InitVars() {
                 this.columnAlarmLogId = base.Columns["AlarmLogId"];
                 this.columnDtRif = base.Columns["DtRif"];
+                this.columnDuration = base.Columns["Duration"];
                 this.columnMachineId = base.Columns["MachineId"];
                 this.columnMemAddress = base.Columns["MemAddress"];
                 this.columnMemIndex = base.Columns["MemIndex"];
-                this.columnStatus = base.Columns["Status"];
+                this.columnStatusVal = base.Columns["StatusVal"];
                 this.columnValDecoded = base.Columns["ValDecoded"];
+                this.columnDtNotify = base.Columns["DtNotify"];
+                this.columnUserAck = base.Columns["UserAck"];
+                this.columnDtAck = base.Columns["DtAck"];
+                this.columnReqNotify = base.Columns["ReqNotify"];
+                this.columnReqAck = base.Columns["ReqAck"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -11380,16 +11452,28 @@ namespace MapoDb {
                 base.Columns.Add(this.columnAlarmLogId);
                 this.columnDtRif = new global::System.Data.DataColumn("DtRif", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnDtRif);
+                this.columnDuration = new global::System.Data.DataColumn("Duration", typeof(decimal), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnDuration);
                 this.columnMachineId = new global::System.Data.DataColumn("MachineId", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnMachineId);
                 this.columnMemAddress = new global::System.Data.DataColumn("MemAddress", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnMemAddress);
                 this.columnMemIndex = new global::System.Data.DataColumn("MemIndex", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnMemIndex);
-                this.columnStatus = new global::System.Data.DataColumn("Status", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnStatus);
+                this.columnStatusVal = new global::System.Data.DataColumn("StatusVal", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnStatusVal);
                 this.columnValDecoded = new global::System.Data.DataColumn("ValDecoded", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnValDecoded);
+                this.columnDtNotify = new global::System.Data.DataColumn("DtNotify", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnDtNotify);
+                this.columnUserAck = new global::System.Data.DataColumn("UserAck", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnUserAck);
+                this.columnDtAck = new global::System.Data.DataColumn("DtAck", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnDtAck);
+                this.columnReqNotify = new global::System.Data.DataColumn("ReqNotify", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnReqNotify);
+                this.columnReqAck = new global::System.Data.DataColumn("ReqAck", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnReqAck);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnAlarmLogId}, true));
                 this.columnAlarmLogId.AutoIncrement = true;
@@ -11399,14 +11483,21 @@ namespace MapoDb {
                 this.columnAlarmLogId.ReadOnly = true;
                 this.columnAlarmLogId.Unique = true;
                 this.columnDtRif.AllowDBNull = false;
+                this.columnDuration.AllowDBNull = false;
                 this.columnMachineId.AllowDBNull = false;
                 this.columnMachineId.MaxLength = 50;
                 this.columnMemAddress.AllowDBNull = false;
                 this.columnMemAddress.MaxLength = 50;
                 this.columnMemIndex.AllowDBNull = false;
-                this.columnStatus.AllowDBNull = false;
+                this.columnStatusVal.AllowDBNull = false;
                 this.columnValDecoded.AllowDBNull = false;
                 this.columnValDecoded.MaxLength = 2500;
+                this.columnDtNotify.AllowDBNull = false;
+                this.columnUserAck.AllowDBNull = false;
+                this.columnUserAck.MaxLength = 50;
+                this.columnDtAck.AllowDBNull = false;
+                this.columnReqNotify.ReadOnly = true;
+                this.columnReqAck.ReadOnly = true;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -15963,6 +16054,17 @@ namespace MapoDb {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public decimal Duration {
+                get {
+                    return ((decimal)(this[this.tableAlarmLog.DurationColumn]));
+                }
+                set {
+                    this[this.tableAlarmLog.DurationColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public string MachineId {
@@ -15998,12 +16100,12 @@ namespace MapoDb {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public int Status {
+            public int StatusVal {
                 get {
-                    return ((int)(this[this.tableAlarmLog.StatusColumn]));
+                    return ((int)(this[this.tableAlarmLog.StatusValColumn]));
                 }
                 set {
-                    this[this.tableAlarmLog.StatusColumn] = value;
+                    this[this.tableAlarmLog.StatusValColumn] = value;
                 }
             }
             
@@ -16017,6 +16119,95 @@ namespace MapoDb {
                     this[this.tableAlarmLog.ValDecodedColumn] = value;
                 }
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public System.DateTime DtNotify {
+                get {
+                    return ((global::System.DateTime)(this[this.tableAlarmLog.DtNotifyColumn]));
+                }
+                set {
+                    this[this.tableAlarmLog.DtNotifyColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string UserAck {
+                get {
+                    return ((string)(this[this.tableAlarmLog.UserAckColumn]));
+                }
+                set {
+                    this[this.tableAlarmLog.UserAckColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public System.DateTime DtAck {
+                get {
+                    return ((global::System.DateTime)(this[this.tableAlarmLog.DtAckColumn]));
+                }
+                set {
+                    this[this.tableAlarmLog.DtAckColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public int ReqNotify {
+                get {
+                    try {
+                        return ((int)(this[this.tableAlarmLog.ReqNotifyColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'ReqNotify\' in table \'AlarmLog\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableAlarmLog.ReqNotifyColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public int ReqAck {
+                get {
+                    try {
+                        return ((int)(this[this.tableAlarmLog.ReqAckColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'ReqAck\' in table \'AlarmLog\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableAlarmLog.ReqAckColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsReqNotifyNull() {
+                return this.IsNull(this.tableAlarmLog.ReqNotifyColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetReqNotifyNull() {
+                this[this.tableAlarmLog.ReqNotifyColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsReqAckNull() {
+                return this.IsNull(this.tableAlarmLog.ReqAckColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetReqAckNull() {
+                this[this.tableAlarmLog.ReqAckColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -30473,48 +30664,18 @@ SELECT TagCode, TagDescr, DisplOrd, CssClass FROM AnagTags WHERE (TagCode = @Tag
             tableMapping.DataSetTable = "AlarmLog";
             tableMapping.ColumnMappings.Add("AlarmLogId", "AlarmLogId");
             tableMapping.ColumnMappings.Add("DtRif", "DtRif");
+            tableMapping.ColumnMappings.Add("Duration", "Duration");
             tableMapping.ColumnMappings.Add("MachineId", "MachineId");
             tableMapping.ColumnMappings.Add("MemAddress", "MemAddress");
             tableMapping.ColumnMappings.Add("MemIndex", "MemIndex");
-            tableMapping.ColumnMappings.Add("Status", "Status");
+            tableMapping.ColumnMappings.Add("StatusVal", "StatusVal");
             tableMapping.ColumnMappings.Add("ValDecoded", "ValDecoded");
+            tableMapping.ColumnMappings.Add("DtNotify", "DtNotify");
+            tableMapping.ColumnMappings.Add("UserAck", "UserAck");
+            tableMapping.ColumnMappings.Add("DtAck", "DtAck");
+            tableMapping.ColumnMappings.Add("ReqNotify", "ReqNotify");
+            tableMapping.ColumnMappings.Add("ReqAck", "ReqAck");
             this._adapter.TableMappings.Add(tableMapping);
-            this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
-            this._adapter.DeleteCommand.Connection = this.Connection;
-            this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[FluxLog] WHERE (([IdxMacchina] = @Original_IdxMacchina) AND ([" +
-                "dtEvento] = @Original_dtEvento) AND ([CodFlux] = @Original_CodFlux) AND ([Valore" +
-                "] = @Original_Valore) AND ([Cnt] = @Original_Cnt))";
-            this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxMacchina", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dtEvento", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dtEvento", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodFlux", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodFlux", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Valore", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Valore", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cnt", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
-            this._adapter.InsertCommand.Connection = this.Connection;
-            this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[FluxLog] ([IdxMacchina], [dtEvento], [CodFlux], [Valore], [Cnt]) VALUES (@IdxMacchina, @dtEvento, @CodFlux, @Valore, @Cnt);
-SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = @CodFlux) AND (IdxMacchina = @IdxMacchina) AND (dtEvento = @dtEvento)";
-            this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtEvento", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dtEvento", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodFlux", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodFlux", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Valore", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Valore", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cnt", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
-            this._adapter.UpdateCommand.Connection = this.Connection;
-            this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[FluxLog] SET [IdxMacchina] = @IdxMacchina, [dtEvento] = @dtEvento, [CodFlux] = @CodFlux, [Valore] = @Valore, [Cnt] = @Cnt WHERE (([IdxMacchina] = @Original_IdxMacchina) AND ([dtEvento] = @Original_dtEvento) AND ([CodFlux] = @Original_CodFlux) AND ([Valore] = @Original_Valore) AND ([Cnt] = @Original_Cnt));
-SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = @CodFlux) AND (IdxMacchina = @IdxMacchina) AND (dtEvento = @dtEvento)";
-            this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dtEvento", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dtEvento", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodFlux", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodFlux", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Valore", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Valore", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cnt", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxMacchina", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dtEvento", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dtEvento", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodFlux", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodFlux", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Valore", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Valore", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
-            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Cnt", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -30527,22 +30688,68 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
         [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[2];
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7];
             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].CommandText = "SELECT *\r\nFROM v_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_AlarmLog_insert";
+            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("@DtRif", 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("@MachineId", 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("@MemAddress", 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("@MemIndex", 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("@Status", 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("@ValDecoded", global::System.Data.SqlDbType.NVarChar, 2500, 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("@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[2] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[2].Connection = this.Connection;
+            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("@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_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("@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_AL_insertQuery";
+            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("@StatusVal", 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, "", "", ""));
+            this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[5].Connection = this.Connection;
+            this._commandCollection[5].CommandText = "dbo.stp_AL_setAck";
+            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("@AlarmLogId", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtAck", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserAck", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[6].Connection = this.Connection;
+            this._commandCollection[6].CommandText = "dbo.stp_AL_setNotify";
+            this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AlarmLogId", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtNotify", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -30572,180 +30779,154 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
         [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")]
-        public virtual int Update(DS_applicazione.AlarmLogDataTable dataTable) {
-            return this.Adapter.Update(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")]
-        public virtual int Update(DS_applicazione dataSet) {
-            return this.Adapter.Update(dataSet, "AlarmLog");
-        }
-        
-        [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")]
-        public virtual int Update(global::System.Data.DataRow dataRow) {
-            return this.Adapter.Update(new global::System.Data.DataRow[] {
-                        dataRow});
-        }
-        
-        [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")]
-        public virtual int Update(global::System.Data.DataRow[] dataRows) {
-            return this.Adapter.Update(dataRows);
-        }
-        
-        [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.Delete, true)]
-        public virtual int Delete(string Original_IdxMacchina, System.DateTime Original_dtEvento, string Original_CodFlux, string Original_Valore, int Original_Cnt) {
-            if ((Original_IdxMacchina == null)) {
-                throw new global::System.ArgumentNullException("Original_IdxMacchina");
-            }
-            else {
-                this.Adapter.DeleteCommand.Parameters[0].Value = ((string)(Original_IdxMacchina));
-            }
-            this.Adapter.DeleteCommand.Parameters[1].Value = ((System.DateTime)(Original_dtEvento));
-            if ((Original_CodFlux == null)) {
-                throw new global::System.ArgumentNullException("Original_CodFlux");
-            }
-            else {
-                this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_CodFlux));
-            }
-            if ((Original_Valore == null)) {
-                throw new global::System.ArgumentNullException("Original_Valore");
-            }
-            else {
-                this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_Valore));
-            }
-            this.Adapter.DeleteCommand.Parameters[4].Value = ((int)(Original_Cnt));
-            global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
-            if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) 
-                        != global::System.Data.ConnectionState.Open)) {
-                this.Adapter.DeleteCommand.Connection.Open();
-            }
-            try {
-                int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery();
-                return returnValue;
-            }
-            finally {
-                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
-                    this.Adapter.DeleteCommand.Connection.Close();
-                }
-            }
-        }
-        
-        [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.Insert, true)]
-        public virtual int Insert(string IdxMacchina, System.DateTime dtEvento, string CodFlux, string Valore, int Cnt) {
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_applicazione.AlarmLogDataTable getFilt(string IdxMacchina, global::System.Nullable<global::System.DateTime> dtFrom, global::System.Nullable<global::System.DateTime> dtTo, global::System.Nullable<bool> showMulti) {
+            this.Adapter.SelectCommand = this.CommandCollection[1];
             if ((IdxMacchina == null)) {
-                throw new global::System.ArgumentNullException("IdxMacchina");
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.InsertCommand.Parameters[0].Value = ((string)(IdxMacchina));
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(IdxMacchina));
             }
-            this.Adapter.InsertCommand.Parameters[1].Value = ((System.DateTime)(dtEvento));
-            if ((CodFlux == null)) {
-                throw new global::System.ArgumentNullException("CodFlux");
+            if ((dtFrom.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(dtFrom.Value));
             }
             else {
-                this.Adapter.InsertCommand.Parameters[2].Value = ((string)(CodFlux));
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
             }
-            if ((Valore == null)) {
-                throw new global::System.ArgumentNullException("Valore");
+            if ((dtTo.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[3].Value = ((System.DateTime)(dtTo.Value));
             }
             else {
-                this.Adapter.InsertCommand.Parameters[3].Value = ((string)(Valore));
+                this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
             }
-            this.Adapter.InsertCommand.Parameters[4].Value = ((int)(Cnt));
-            global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
-            if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) 
-                        != global::System.Data.ConnectionState.Open)) {
-                this.Adapter.InsertCommand.Connection.Open();
+            if ((showMulti.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(showMulti.Value));
             }
-            try {
-                int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery();
-                return returnValue;
-            }
-            finally {
-                if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
-                    this.Adapter.InsertCommand.Connection.Close();
-                }
+            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.Update, true)]
-        public virtual int Update(string IdxMacchina, System.DateTime dtEvento, string CodFlux, string Valore, int Cnt, string Original_IdxMacchina, System.DateTime Original_dtEvento, string Original_CodFlux, string Original_Valore, int Original_Cnt) {
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
+        public virtual DS_applicazione.AlarmLogDataTable getFiltPaged(string IdxMacchina, global::System.Nullable<global::System.DateTime> dtFrom, global::System.Nullable<global::System.DateTime> dtTo, global::System.Nullable<bool> showMulti, global::System.Nullable<int> maximumRows, global::System.Nullable<int> startRowIndex, string searchVal) {
+            this.Adapter.SelectCommand = this.CommandCollection[3];
             if ((IdxMacchina == null)) {
-                throw new global::System.ArgumentNullException("IdxMacchina");
+                this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(IdxMacchina));
+                this.Adapter.SelectCommand.Parameters[1].Value = ((string)(IdxMacchina));
             }
-            this.Adapter.UpdateCommand.Parameters[1].Value = ((System.DateTime)(dtEvento));
-            if ((CodFlux == null)) {
-                throw new global::System.ArgumentNullException("CodFlux");
+            if ((dtFrom.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(dtFrom.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(CodFlux));
+                this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
             }
-            if ((Valore == null)) {
-                throw new global::System.ArgumentNullException("Valore");
+            if ((dtTo.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[3].Value = ((System.DateTime)(dtTo.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(Valore));
+                this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
             }
-            this.Adapter.UpdateCommand.Parameters[4].Value = ((int)(Cnt));
-            if ((Original_IdxMacchina == null)) {
-                throw new global::System.ArgumentNullException("Original_IdxMacchina");
+            if ((showMulti.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[4].Value = ((bool)(showMulti.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_IdxMacchina));
+                this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
             }
-            this.Adapter.UpdateCommand.Parameters[6].Value = ((System.DateTime)(Original_dtEvento));
-            if ((Original_CodFlux == null)) {
-                throw new global::System.ArgumentNullException("Original_CodFlux");
+            if ((maximumRows.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[5].Value = ((int)(maximumRows.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_CodFlux));
+                this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value;
             }
-            if ((Original_Valore == null)) {
-                throw new global::System.ArgumentNullException("Original_Valore");
+            if ((startRowIndex.HasValue == true)) {
+                this.Adapter.SelectCommand.Parameters[6].Value = ((int)(startRowIndex.Value));
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_Valore));
+                this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value;
             }
-            this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_Cnt));
-            global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
-            if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
+            if ((searchVal == null)) {
+                this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.SelectCommand.Parameters[7].Value = ((string)(searchVal));
+            }
+            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")]
+        public virtual object getFiltCount(string IdxMacchina, global::System.Nullable<global::System.DateTime> dtFrom, global::System.Nullable<global::System.DateTime> dtTo, global::System.Nullable<bool> showMulti, string searchVal) {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
+            if ((IdxMacchina == null)) {
+                command.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[1].Value = ((string)(IdxMacchina));
+            }
+            if ((dtFrom.HasValue == true)) {
+                command.Parameters[2].Value = ((System.DateTime)(dtFrom.Value));
+            }
+            else {
+                command.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            if ((dtTo.HasValue == true)) {
+                command.Parameters[3].Value = ((System.DateTime)(dtTo.Value));
+            }
+            else {
+                command.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            if ((showMulti.HasValue == true)) {
+                command.Parameters[4].Value = ((bool)(showMulti.Value));
+            }
+            else {
+                command.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            if ((searchVal == null)) {
+                command.Parameters[5].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[5].Value = ((string)(searchVal));
+            }
+            global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+            if (((command.Connection.State & global::System.Data.ConnectionState.Open) 
                         != global::System.Data.ConnectionState.Open)) {
-                this.Adapter.UpdateCommand.Connection.Open();
+                command.Connection.Open();
             }
+            object returnValue;
             try {
-                int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery();
-                return returnValue;
+                returnValue = command.ExecuteScalar();
             }
             finally {
                 if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
-                    this.Adapter.UpdateCommand.Connection.Close();
+                    command.Connection.Close();
                 }
             }
+            if (((returnValue == null) 
+                        || (returnValue.GetType() == typeof(global::System.DBNull)))) {
+                return null;
+            }
+            else {
+                return ((object)(returnValue));
+            }
         }
         
         [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")]
-        public virtual int insertQuery(global::System.Nullable<global::System.DateTime> DtRif, string MachineId, string MemAddress, global::System.Nullable<int> MemIndex, global::System.Nullable<int> Status, string ValDecoded) {
-            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
+        public virtual int insertQuery(global::System.Nullable<global::System.DateTime> DtRif, string MachineId, string MemAddress, global::System.Nullable<int> MemIndex, global::System.Nullable<int> StatusVal, string ValDecoded) {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
             if ((DtRif.HasValue == true)) {
                 command.Parameters[1].Value = ((System.DateTime)(DtRif.Value));
             }
@@ -30770,8 +30951,8 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             else {
                 command.Parameters[4].Value = global::System.DBNull.Value;
             }
-            if ((Status.HasValue == true)) {
-                command.Parameters[5].Value = ((int)(Status.Value));
+            if ((StatusVal.HasValue == true)) {
+                command.Parameters[5].Value = ((int)(StatusVal.Value));
             }
             else {
                 command.Parameters[5].Value = global::System.DBNull.Value;
@@ -30798,6 +30979,80 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             }
             return returnValue;
         }
+        
+        [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")]
+        public virtual int setAck(global::System.Nullable<int> AlarmLogId, global::System.Nullable<global::System.DateTime> DtAck, string UserAck) {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
+            if ((AlarmLogId.HasValue == true)) {
+                command.Parameters[1].Value = ((int)(AlarmLogId.Value));
+            }
+            else {
+                command.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            if ((DtAck.HasValue == true)) {
+                command.Parameters[2].Value = ((System.DateTime)(DtAck.Value));
+            }
+            else {
+                command.Parameters[2].Value = global::System.DBNull.Value;
+            }
+            if ((UserAck == null)) {
+                command.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            else {
+                command.Parameters[3].Value = ((string)(UserAck));
+            }
+            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", "17.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        public virtual int setNotify(global::System.Nullable<int> AlarmLogId, global::System.Nullable<global::System.DateTime> DtNotify) {
+            global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
+            if ((AlarmLogId.HasValue == true)) {
+                command.Parameters[1].Value = ((int)(AlarmLogId.Value));
+            }
+            else {
+                command.Parameters[1].Value = global::System.DBNull.Value;
+            }
+            if ((DtNotify.HasValue == true)) {
+                command.Parameters[2].Value = ((System.DateTime)(DtNotify.Value));
+            }
+            else {
+                command.Parameters[2].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;
+        }
     }
 }
 

MapoDb/DS_applicazione.xsd

@@ -2867,84 +2867,119 @@ FROM v_DD_exp
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="AlarmLogTableAdapter" GeneratorDataComponentClassName="AlarmLogTableAdapter" Name="AlarmLog" UserDataComponentName="AlarmLogTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.AlarmLog" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
-                <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [dbo].[FluxLog] WHERE (([IdxMacchina] = @Original_IdxMacchina) AND ([dtEvento] = @Original_dtEvento) AND ([CodFlux] = @Original_CodFlux) AND ([Valore] = @Original_Valore) AND ([Cnt] = @Original_Cnt))</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="IdxMacchina" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_dtEvento" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dtEvento" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodFlux" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodFlux" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Valore" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Valore" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Cnt" SourceColumnNullMapping="false" SourceVersion="Original" />
-                    </Parameters>
-                  </DbCommand>
-                </DeleteCommand>
-                <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [dbo].[FluxLog] ([IdxMacchina], [dtEvento], [CodFlux], [Valore], [Cnt]) VALUES (@IdxMacchina, @dtEvento, @CodFlux, @Valore, @Cnt);
-SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = @CodFlux) AND (IdxMacchina = @IdxMacchina) AND (dtEvento = @dtEvento)</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="IdxMacchina" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@dtEvento" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dtEvento" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodFlux" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodFlux" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Valore" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Valore" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                    </Parameters>
-                  </DbCommand>
-                </InsertCommand>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.v_AlarmLog" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT * FROM dbo.AlarmLog</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT *
+FROM v_AlarmLog</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
-                <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [dbo].[FluxLog] SET [IdxMacchina] = @IdxMacchina, [dtEvento] = @dtEvento, [CodFlux] = @CodFlux, [Valore] = @Valore, [Cnt] = @Cnt WHERE (([IdxMacchina] = @Original_IdxMacchina) AND ([dtEvento] = @Original_dtEvento) AND ([CodFlux] = @Original_CodFlux) AND ([Valore] = @Original_Valore) AND ([Cnt] = @Original_Cnt));
-SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux = @CodFlux) AND (IdxMacchina = @IdxMacchina) AND (dtEvento = @dtEvento)</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="IdxMacchina" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@dtEvento" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dtEvento" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@CodFlux" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodFlux" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Valore" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Valore" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Cnt" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="IdxMacchina" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_dtEvento" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="dtEvento" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_CodFlux" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="CodFlux" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Valore" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Valore" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Cnt" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Cnt" SourceColumnNullMapping="false" SourceVersion="Original" />
-                    </Parameters>
-                  </DbCommand>
-                </UpdateCommand>
               </DbSource>
             </MainSource>
             <Mappings>
               <Mapping SourceColumn="AlarmLogId" DataSetColumn="AlarmLogId" />
               <Mapping SourceColumn="DtRif" DataSetColumn="DtRif" />
+              <Mapping SourceColumn="Duration" DataSetColumn="Duration" />
               <Mapping SourceColumn="MachineId" DataSetColumn="MachineId" />
               <Mapping SourceColumn="MemAddress" DataSetColumn="MemAddress" />
               <Mapping SourceColumn="MemIndex" DataSetColumn="MemIndex" />
-              <Mapping SourceColumn="Status" DataSetColumn="Status" />
+              <Mapping SourceColumn="StatusVal" DataSetColumn="StatusVal" />
               <Mapping SourceColumn="ValDecoded" DataSetColumn="ValDecoded" />
+              <Mapping SourceColumn="DtNotify" DataSetColumn="DtNotify" />
+              <Mapping SourceColumn="UserAck" DataSetColumn="UserAck" />
+              <Mapping SourceColumn="DtAck" DataSetColumn="DtAck" />
+              <Mapping SourceColumn="ReqNotify" DataSetColumn="ReqNotify" />
+              <Mapping SourceColumn="ReqAck" DataSetColumn="ReqAck" />
             </Mappings>
             <Sources>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_AlarmLog_insert" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertQuery" Modifier="Public" Name="insertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="insertQuery">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_AL_getFilt" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFilt" GetMethodModifier="Public" GetMethodName="getFilt" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFilt" UserSourceName="getFilt">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
-                    <CommandText>dbo.stp_AlarmLog_insert</CommandText>
+                    <CommandText>dbo.stp_AL_getFilt</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtFrom" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtTo" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@showMulti" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_AL_getFiltCount" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="getFiltCount" Modifier="Public" Name="getFiltCount" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="getFiltCount">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_AL_getFiltCount</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtFrom" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtTo" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@showMulti" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@searchVal" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_AL_getFiltPaged" DbObjectType="StoredProcedure" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="getFiltPaged" GetMethodModifier="Public" GetMethodName="getFiltPaged" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="getFiltPaged" UserSourceName="getFiltPaged">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_AL_getFiltPaged</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtFrom" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dtTo" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@showMulti" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@maximumRows" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@startRowIndex" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@searchVal" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_AL_insertQuery" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="insertQuery" Modifier="Public" Name="insertQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="insertQuery">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_AL_insertQuery</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@DtRif" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@MachineId" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@MemAddress" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@MemIndex" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Status" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@StatusVal" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@ValDecoded" Precision="0" ProviderType="NVarChar" Scale="0" Size="2500" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
               </DbSource>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_AL_setAck" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="setAck" Modifier="Public" Name="setAck" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="setAck">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_AL_setAck</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@AlarmLogId" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@DtAck" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@UserAck" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_AL_setNotify" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="setNotify" Modifier="Public" Name="setNotify" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy3" UserSourceName="setNotify">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.stp_AL_setNotify</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@AlarmLogId" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@DtNotify" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
             </Sources>
           </TableAdapter>
         </Tables>
@@ -3791,6 +3826,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             <xs:sequence>
               <xs:element name="AlarmLogId" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="AlarmLogId" msprop:Generator_ColumnPropNameInTable="AlarmLogIdColumn" msprop:Generator_ColumnVarNameInTable="columnAlarmLogId" msprop:Generator_UserColumnName="AlarmLogId" type="xs:int" />
               <xs:element name="DtRif" msprop:Generator_ColumnPropNameInRow="DtRif" msprop:Generator_ColumnPropNameInTable="DtRifColumn" msprop:Generator_ColumnVarNameInTable="columnDtRif" msprop:Generator_UserColumnName="DtRif" type="xs:dateTime" />
+              <xs:element name="Duration" msprop:Generator_ColumnPropNameInRow="Duration" msprop:Generator_ColumnPropNameInTable="DurationColumn" msprop:Generator_ColumnVarNameInTable="columnDuration" msprop:Generator_UserColumnName="Duration" type="xs:decimal" />
               <xs:element name="MachineId" msprop:Generator_ColumnPropNameInRow="MachineId" msprop:Generator_ColumnPropNameInTable="MachineIdColumn" msprop:Generator_ColumnVarNameInTable="columnMachineId" msprop:Generator_UserColumnName="MachineId">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3806,7 +3842,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
                 </xs:simpleType>
               </xs:element>
               <xs:element name="MemIndex" msprop:Generator_ColumnPropNameInRow="MemIndex" msprop:Generator_ColumnPropNameInTable="MemIndexColumn" msprop:Generator_ColumnVarNameInTable="columnMemIndex" msprop:Generator_UserColumnName="MemIndex" type="xs:int" />
-              <xs:element name="Status" msprop:Generator_ColumnPropNameInRow="Status" msprop:Generator_ColumnPropNameInTable="StatusColumn" msprop:Generator_ColumnVarNameInTable="columnStatus" msprop:Generator_UserColumnName="Status" type="xs:int" />
+              <xs:element name="StatusVal" msprop:Generator_ColumnPropNameInRow="StatusVal" msprop:Generator_ColumnPropNameInTable="StatusValColumn" msprop:Generator_ColumnVarNameInTable="columnStatusVal" msprop:Generator_UserColumnName="StatusVal" type="xs:int" />
               <xs:element name="ValDecoded" msprop:Generator_ColumnPropNameInRow="ValDecoded" msprop:Generator_ColumnPropNameInTable="ValDecodedColumn" msprop:Generator_ColumnVarNameInTable="columnValDecoded" msprop:Generator_UserColumnName="ValDecoded">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -3814,6 +3850,17 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="DtNotify" msprop:Generator_ColumnPropNameInRow="DtNotify" msprop:Generator_ColumnPropNameInTable="DtNotifyColumn" msprop:Generator_ColumnVarNameInTable="columnDtNotify" msprop:Generator_UserColumnName="DtNotify" type="xs:dateTime" />
+              <xs:element name="UserAck" msprop:Generator_ColumnPropNameInRow="UserAck" msprop:Generator_ColumnPropNameInTable="UserAckColumn" msprop:Generator_ColumnVarNameInTable="columnUserAck" msprop:Generator_UserColumnName="UserAck">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="DtAck" msprop:Generator_ColumnPropNameInRow="DtAck" msprop:Generator_ColumnPropNameInTable="DtAckColumn" msprop:Generator_ColumnVarNameInTable="columnDtAck" msprop:Generator_UserColumnName="DtAck" type="xs:dateTime" />
+              <xs:element name="ReqNotify" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="ReqNotify" msprop:Generator_ColumnPropNameInTable="ReqNotifyColumn" msprop:Generator_ColumnVarNameInTable="columnReqNotify" msprop:Generator_UserColumnName="ReqNotify" type="xs:int" minOccurs="0" />
+              <xs:element name="ReqAck" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="ReqAck" msprop:Generator_ColumnPropNameInTable="ReqAckColumn" msprop:Generator_ColumnVarNameInTable="columnReqAck" msprop:Generator_UserColumnName="ReqAck" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>

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.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="745" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="820" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:Macchine2FamiglieMacchine" ZOrder="30" X="553" Y="715" Height="115" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:FamiglieMacchine" ZOrder="32" X="519" Y="1007" Height="115" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
@@ -12,7 +12,7 @@
     <Shape ID="DesignTable:TransizioneStati" ZOrder="28" X="870" Y="916" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:StatoMacchine" ZOrder="12" X="4" Y="770" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:AnagraficaStati" ZOrder="16" X="303" Y="454" Height="210" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:EventList" ZOrder="2" X="920" Y="145" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:EventList" ZOrder="3" X="920" Y="145" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:AnagraficaEventi" ZOrder="37" X="1285" Y="228" Height="134" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
     <Shape ID="DesignTable:DiarioDiBordo" ZOrder="23" X="230" Y="-18" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:TransizioneEventi" ZOrder="34" X="1279" Y="409" Height="210" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
@@ -30,12 +30,12 @@
     <Shape ID="DesignTable:SignalLog" ZOrder="24" X="18" Y="523" Height="191" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:AnagArticoli" ZOrder="27" X="627" Y="31" Height="191" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:MSFD" ZOrder="18" X="974" Y="1361" Height="343" Width="193" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:FluxLog" ZOrder="1" X="4" Y="1406" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:FluxLog" ZOrder="2" X="4" Y="1406" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
     <Shape ID="DesignTable:AnagraficaGruppi" ZOrder="13" X="331" Y="1133" Height="191" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
-    <Shape ID="DesignTable:RigheMacchine" ZOrder="10" X="1293" Y="26" Height="97" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:RigheMacchine" ZOrder="10" X="1293" Y="22" Height="97" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
     <Shape ID="DesignTable:AnagTags" ZOrder="9" X="336" Y="1347" Height="172" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
     <Shape ID="DesignTable:DiarioDichiarazioni" ZOrder="4" X="325" Y="1566" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:AlarmLog" ZOrder="3" X="1" Y="1695" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:AlarmLog" ZOrder="1" X="1" Y="1672" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_AnagTags_DiarioDichiarazioni" ZOrder="8" LineWidth="11">

MapoDb/DataLayer.cs

@@ -3790,6 +3790,11 @@ namespace MapoDb
                         // aggiungo
                         innovations.Add(item);
                     }
+                    else
+                    // altrimenti aggiorno campo name...
+                    {
+                        trovato.name = item.name;
+                    }
                 }
                 // serializzo e salvo
                 string serVal = JsonConvert.SerializeObject(innovations);