diff --git a/Jenkinsfile b/Jenkinsfile
index 0236acca..f573fb8a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=709']) {
+        withEnv(['NEXT_BUILD_NUMBER=710']) {
           // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'MAPO'
diff --git a/MP-Tablet/Content/flashing.css b/MP-Tablet/Content/flashing.css
index c40ffac3..3ad75330 100644
--- a/MP-Tablet/Content/flashing.css
+++ b/MP-Tablet/Content/flashing.css
@@ -1,6 +1,6 @@
 .flashingRed {
   animation-duration: 0.75s;
-  animation-timing-function: linear;
+  animation-timing-function: steps(2);
   animation-iteration-count: infinite;
   animation-direction: alternate;
   animation-play-state: running;
@@ -9,9 +9,13 @@
 }
 @keyframes flsRed {
   from {
-    border: 5px solid #dc3545;
+    color: #ffc107;
+    background-color: #c82332;
+    /*border: 5px solid #dc3545;*/
   }
   to {
-    border: 5px solid #ffc107;
+    color: #FFF;
+    background-color: #ecb100;
+    /*border: 5px solid #ffc107;*/
   }
 }
\ No newline at end of file
diff --git a/MP-Tablet/Content/flashing.less b/MP-Tablet/Content/flashing.less
index d9fb8565..ff51fc48 100644
--- a/MP-Tablet/Content/flashing.less
+++ b/MP-Tablet/Content/flashing.less
@@ -1,6 +1,6 @@
 .flashingRed {
   animation-duration: 0.75s;
-  animation-timing-function: linear;
+  animation-timing-function: steps(2);
   animation-iteration-count: infinite;
   animation-direction: alternate;
   animation-play-state: running;
@@ -10,10 +10,14 @@
 
 @keyframes flsRed {
   from {
-    border: 5px solid #dc3545;
+    color: #ffc107;
+    background-color: #c82332;
+    /*border: 5px solid #dc3545;*/
   }
 
   to {
-    border: 5px solid #ffc107;
+    color: #FFF;
+    background-color: #ecb100;
+    /*border: 5px solid #ffc107;*/
   }
 }
diff --git a/MP-Tablet/Content/flashing.min.css b/MP-Tablet/Content/flashing.min.css
index d04fdb2c..f5d59906 100644
--- a/MP-Tablet/Content/flashing.min.css
+++ b/MP-Tablet/Content/flashing.min.css
@@ -1 +1 @@
-.flashingRed{animation-duration:.75s;animation-timing-function:linear;animation-iteration-count:infinite;animation-direction:alternate;animation-play-state:running;animation-name:flsRed;transform:translateZ(0);}@keyframes flsRed{from{border:5px solid #dc3545;}to{border:5px solid #ffc107;}}
\ No newline at end of file
+.flashingRed{animation-duration:.75s;animation-timing-function:steps(2);animation-iteration-count:infinite;animation-direction:alternate;animation-play-state:running;animation-name:flsRed;transform:translateZ(0);}@keyframes flsRed{from{color:#ffc107;background-color:#c82332;}to{color:#fff;background-color:#ecb100;}}
\ No newline at end of file
diff --git a/MP-Tablet/DettaglioMacchina.aspx b/MP-Tablet/DettaglioMacchina.aspx
index 73235320..270f4694 100644
--- a/MP-Tablet/DettaglioMacchina.aspx
+++ b/MP-Tablet/DettaglioMacchina.aspx
@@ -12,7 +12,6 @@
   <div class="container-flow m-3" role="main">
     <div class="row">
       <div class="col-12 col-sm-8 col-md-9 col-xl-10">
-        <asp:LinkButton runat="server" ID="lbtFermate" CssClass="btn btn-block btn-lg btn-danger flashingRed text-warning mb-2"><i class="fa fa-lg fa-bell"></i>  DICH. FERMATA</asp:LinkButton>
         <uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
         <%--statistiche produzione--%>
         <div class="card bg-dark mb-2">
diff --git a/MP-Tablet/DettaglioMacchina.aspx.cs b/MP-Tablet/DettaglioMacchina.aspx.cs
index 046cbd53..7605db11 100644
--- a/MP-Tablet/DettaglioMacchina.aspx.cs
+++ b/MP-Tablet/DettaglioMacchina.aspx.cs
@@ -26,7 +26,6 @@ namespace MoonProTablet
       if (!Page.IsPostBack)
       {
         Session["TipoLink"] = "DetMacc";
-        lbtFermate.Visible = showInsFermata;
       }
       mod_confProd1.eh_inserting += mod_confProd1_eh_inserting;
       mod_confProd1.eh_newVal += mod_confProd1_eh_newVal;
@@ -53,19 +52,5 @@ namespace MoonProTablet
     {
       mod_dettMacchina1.doUpdate();
     }
-    /// <summary>
-    /// Determina se dato lo stato dell'impianto si debba mostrare btn fermata perché
-    /// - impianto fermo
-    /// - fermo > xx min (da web.config, es 20')
-    /// </summary>
-    public bool showInsFermata
-    {
-      get
-      {
-        bool answ = true;
-
-        return answ;
-      }
-    }
   }
 }
\ No newline at end of file
diff --git a/MP-Tablet/DettaglioMacchina.aspx.designer.cs b/MP-Tablet/DettaglioMacchina.aspx.designer.cs
index b5faed02..d4591224 100644
--- a/MP-Tablet/DettaglioMacchina.aspx.designer.cs
+++ b/MP-Tablet/DettaglioMacchina.aspx.designer.cs
@@ -12,15 +12,6 @@ namespace MoonProTablet {
     
     public partial class DettaglioMacchina {
         
-        /// <summary>
-        /// Controllo lbtFermate.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton lbtFermate;
-        
         /// <summary>
         /// Controllo mod_dettMacchina1.
         /// </summary>
diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config
index ffb82cfd..1854a51b 100644
--- a/MP-Tablet/Web.config
+++ b/MP-Tablet/Web.config
@@ -52,6 +52,8 @@
     <!--impostazione cambio tempo calcolato tra minuti-ore-gg-->
     <add key="maxMinuti" value="60" />
     <add key="maxOre" value="1440" />
+    <!--gestione check / warning-->
+    <add key="durMinWarning" value="20"/>
     <!--refresh MSE-->
     <add key="refrMSE_0" value="1001" />
     <add key="intUpdatePagina_ms" value="1000" />
diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx
index c5b52812..9e778322 100644
--- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx
+++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx
@@ -5,6 +5,9 @@
     <div class="row">
       <asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
         <ItemTemplate>
+          <div class="col-12">
+            <asp:HyperLink runat="server" ID="hlFermate" CssClass="btn btn-block btn-lg flashingRed mb-2 p-3" NavigateUrl="~/Fermate.aspx" Visible='<%# showInsFermata(Eval("IdxStato"),Eval("Durata")) %>'><i class="fa fa-lg fa-exclamation-triangle"></i> DICHIARARE FERMO <i class="fa fa-lg fa-exclamation-triangle"></i></asp:HyperLink>
+          </div>
           <div class="col-9 col-sm-10">
             <div class="card text-white mapBlock rCAll">
               <div class='card <%# Eval("Semaforo") %> p-0 m-0 rCAll'>
diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
index 4436018a..e9ef0715 100644
--- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
+++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx.cs
@@ -1,4 +1,5 @@
-using SteamWare;
+using MapoDb;
+using SteamWare;
 using System;
 using System.Web.UI;
 
@@ -41,6 +42,7 @@ namespace MoonProTablet.WebUserControls
       {
         Response.Redirect("~/MappaStato.aspx");
       }
+      //hlFermate.Visible = showInsFermata;
     }
     /// <summary>
     /// url completo immagine
@@ -78,7 +80,7 @@ namespace MoonProTablet.WebUserControls
     /// <param name="sender"></param>
     /// <param name="e"></param>
     protected void Timer1_Tick(object sender, EventArgs e)
-    { 
+    {
       // sollevo evento!
       if (eh_reqRemoveModal != null)
       {
@@ -103,5 +105,30 @@ namespace MoonProTablet.WebUserControls
         dmTimer.Enabled = value;
       }
     }
+    /// <summary>
+    /// Determina se dato lo stato dell'impianto si debba mostrare btn fermata perché
+    /// - fermo > xx min (da web.config, es 20')
+    /// - impianto fermo (controllando idxStato: priorità > 1)
+    /// </summary>
+    public bool showInsFermata(object _idxStato, object _durata)
+    {
+      int idxStato = 0;
+      int durata = 0;
+      int durMinWarning = memLayer.ML.CRI("durMinWarning");
+      int.TryParse(_idxStato.ToString(), out idxStato);
+      int.TryParse(_durata.ToString(), out durata);
+      bool answ = false;
+      if (durata >= durMinWarning)
+      {
+        try
+        {
+          // in questo caso controllo idxStato... e recupero priorità se > 1 --> richiesta qualifica
+          answ = (DataLayer.obj.taAnagStati.GetByIdx(idxStato)[0].Priorita > 1);
+        }
+        catch
+        { }
+      }
+      return answ;
+    }
   }
 }
\ No newline at end of file
diff --git a/MapoDb/DS_applicazione.Designer.cs b/MapoDb/DS_applicazione.Designer.cs
index 8c910d89..40c02f75 100644
--- a/MapoDb/DS_applicazione.Designer.cs
+++ b/MapoDb/DS_applicazione.Designer.cs
@@ -2870,6 +2870,12 @@ namespace MapoDb {
             
             private global::System.Data.DataColumn columnSemaforo;
             
+            private global::System.Data.DataColumn columnPriorita;
+            
+            private global::System.Data.DataColumn columnClasseTempo;
+            
+            private global::System.Data.DataColumn columnShowArticolo;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public AnagraficaStatiDataTable() {
@@ -2927,6 +2933,30 @@ namespace MapoDb {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn PrioritaColumn {
+                get {
+                    return this.columnPriorita;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn ClasseTempoColumn {
+                get {
+                    return this.columnClasseTempo;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn ShowArticoloColumn {
+                get {
+                    return this.columnShowArticolo;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -2964,12 +2994,15 @@ namespace MapoDb {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public AnagraficaStatiRow AddAnagraficaStatiRow(int IdxStato, string Descrizione, string Semaforo) {
+            public AnagraficaStatiRow AddAnagraficaStatiRow(int IdxStato, string Descrizione, string Semaforo, int Priorita, string ClasseTempo, bool ShowArticolo) {
                 AnagraficaStatiRow rowAnagraficaStatiRow = ((AnagraficaStatiRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         IdxStato,
                         Descrizione,
-                        Semaforo};
+                        Semaforo,
+                        Priorita,
+                        ClasseTempo,
+                        ShowArticolo};
                 rowAnagraficaStatiRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowAnagraficaStatiRow);
                 return rowAnagraficaStatiRow;
@@ -3002,6 +3035,9 @@ namespace MapoDb {
                 this.columnIdxStato = base.Columns["IdxStato"];
                 this.columnDescrizione = base.Columns["Descrizione"];
                 this.columnSemaforo = base.Columns["Semaforo"];
+                this.columnPriorita = base.Columns["Priorita"];
+                this.columnClasseTempo = base.Columns["ClasseTempo"];
+                this.columnShowArticolo = base.Columns["ShowArticolo"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3013,12 +3049,19 @@ namespace MapoDb {
                 base.Columns.Add(this.columnDescrizione);
                 this.columnSemaforo = new global::System.Data.DataColumn("Semaforo", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnSemaforo);
+                this.columnPriorita = new global::System.Data.DataColumn("Priorita", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnPriorita);
+                this.columnClasseTempo = new global::System.Data.DataColumn("ClasseTempo", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnClasseTempo);
+                this.columnShowArticolo = new global::System.Data.DataColumn("ShowArticolo", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnShowArticolo);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnIdxStato}, true));
                 this.columnIdxStato.AllowDBNull = false;
                 this.columnIdxStato.Unique = true;
                 this.columnDescrizione.MaxLength = 50;
                 this.columnSemaforo.MaxLength = 50;
+                this.columnClasseTempo.MaxLength = 50;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10400,6 +10443,54 @@ namespace MapoDb {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int Priorita {
+                get {
+                    try {
+                        return ((int)(this[this.tableAnagraficaStati.PrioritaColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("Il valore della colonna \'Priorita\' nella tabella \'AnagraficaStati\' è DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableAnagraficaStati.PrioritaColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public string ClasseTempo {
+                get {
+                    try {
+                        return ((string)(this[this.tableAnagraficaStati.ClasseTempoColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("Il valore della colonna \'ClasseTempo\' nella tabella \'AnagraficaStati\' è DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableAnagraficaStati.ClasseTempoColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool ShowArticolo {
+                get {
+                    try {
+                        return ((bool)(this[this.tableAnagraficaStati.ShowArticoloColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("Il valore della colonna \'ShowArticolo\' nella tabella \'AnagraficaStati\' è DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableAnagraficaStati.ShowArticoloColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public bool IsDescrizioneNull() {
@@ -10424,6 +10515,42 @@ namespace MapoDb {
                 this[this.tableAnagraficaStati.SemaforoColumn] = global::System.Convert.DBNull;
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool IsPrioritaNull() {
+                return this.IsNull(this.tableAnagraficaStati.PrioritaColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void SetPrioritaNull() {
+                this[this.tableAnagraficaStati.PrioritaColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool IsClasseTempoNull() {
+                return this.IsNull(this.tableAnagraficaStati.ClasseTempoColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void SetClasseTempoNull() {
+                this[this.tableAnagraficaStati.ClasseTempoColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool IsShowArticoloNull() {
+                return this.IsNull(this.tableAnagraficaStati.ShowArticoloColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void SetShowArticoloNull() {
+                this[this.tableAnagraficaStati.ShowArticoloColumn] = global::System.Convert.DBNull;
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public TransizioneStatiRow[] GetTransizioneStatiRows() {
@@ -16651,41 +16778,58 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
             tableMapping.ColumnMappings.Add("IdxStato", "IdxStato");
             tableMapping.ColumnMappings.Add("Descrizione", "Descrizione");
             tableMapping.ColumnMappings.Add("Semaforo", "Semaforo");
+            tableMapping.ColumnMappings.Add("Priorita", "Priorita");
+            tableMapping.ColumnMappings.Add("ClasseTempo", "ClasseTempo");
+            tableMapping.ColumnMappings.Add("ShowArticolo", "ShowArticolo");
             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].[AnagraficaStati] WHERE (([IdxStato] = @Original_IdxStato) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ((@IsNull_Semaforo = 1 AND [Semaforo] IS NULL) OR ([Semaforo] = @Original_Semaforo)))";
+            this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[AnagraficaStati] WHERE (([IdxStato] = @Original_IdxStato) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ((@IsNull_Semaforo = 1 AND [Semaforo] IS NULL) OR ([Semaforo] = @Original_Semaforo)) AND ((@IsNull_Priorita = 1 AND [Priorita] IS NULL) OR ([Priorita] = @Original_Priorita)) AND ((@IsNull_ClasseTempo = 1 AND [ClasseTempo] IS NULL) OR ([ClasseTempo] = @Original_ClasseTempo)) AND ((@IsNull_ShowArticolo = 1 AND [ShowArticolo] IS NULL) OR ([ShowArticolo] = @Original_ShowArticolo)))";
             this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxStato", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxStato", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Descrizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Semaforo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Semaforo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Semaforo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Semaforo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Priorita", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Priorita", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Priorita", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Priorita", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ClasseTempo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClasseTempo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ClasseTempo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClasseTempo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ShowArticolo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ShowArticolo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ShowArticolo", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ShowArticolo", 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].[AnagraficaStati] ([IdxStato], [Descrizione], [Semaforo]) VALUES (@IdxStato, @Descrizione, @Semaforo);
-                      SELECT IdxStato, Descrizione, Semaforo FROM AnagraficaStati WHERE (IdxStato = @IdxStato)
-                    ";
+            this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[AnagraficaStati] ([IdxStato], [Descrizione], [Semaforo], [Priorita], [ClasseTempo], [ShowArticolo]) VALUES (@IdxStato, @Descrizione, @Semaforo, @Priorita, @ClasseTempo, @ShowArticolo);
+SELECT IdxStato, Descrizione, Semaforo, Priorita, ClasseTempo, ShowArticolo FROM AnagraficaStati WHERE (IdxStato = @IdxStato)";
             this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxStato", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxStato", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Semaforo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Semaforo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Priorita", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Priorita", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ClasseTempo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClasseTempo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShowArticolo", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ShowArticolo", 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].[AnagraficaStati] SET [IdxStato] = @IdxStato, [Descrizione] = @Descrizione, [Semaforo] = @Semaforo WHERE (([IdxStato] = @Original_IdxStato) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ((@IsNull_Semaforo = 1 AND [Semaforo] IS NULL) OR ([Semaforo] = @Original_Semaforo)));
-                      SELECT IdxStato, Descrizione, Semaforo FROM AnagraficaStati WHERE (IdxStato = @IdxStato)
-                    ";
+            this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[AnagraficaStati] SET [IdxStato] = @IdxStato, [Descrizione] = @Descrizione, [Semaforo] = @Semaforo, [Priorita] = @Priorita, [ClasseTempo] = @ClasseTempo, [ShowArticolo] = @ShowArticolo WHERE (([IdxStato] = @Original_IdxStato) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ((@IsNull_Semaforo = 1 AND [Semaforo] IS NULL) OR ([Semaforo] = @Original_Semaforo)) AND ((@IsNull_Priorita = 1 AND [Priorita] IS NULL) OR ([Priorita] = @Original_Priorita)) AND ((@IsNull_ClasseTempo = 1 AND [ClasseTempo] IS NULL) OR ([ClasseTempo] = @Original_ClasseTempo)) AND ((@IsNull_ShowArticolo = 1 AND [ShowArticolo] IS NULL) OR ([ShowArticolo] = @Original_ShowArticolo)));
+SELECT IdxStato, Descrizione, Semaforo, Priorita, ClasseTempo, ShowArticolo FROM AnagraficaStati WHERE (IdxStato = @IdxStato)";
             this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxStato", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxStato", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Semaforo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Semaforo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Priorita", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Priorita", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ClasseTempo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClasseTempo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShowArticolo", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ShowArticolo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxStato", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxStato", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Descrizione", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Descrizione", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Descrizione", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Semaforo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Semaforo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
             this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Semaforo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Semaforo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Priorita", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Priorita", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Priorita", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Priorita", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ClasseTempo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClasseTempo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ClasseTempo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClasseTempo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ShowArticolo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ShowArticolo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
+            this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ShowArticolo", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ShowArticolo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -16701,7 +16845,7 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "SELECT IdxStato, Descrizione, Semaforo FROM dbo.AnagraficaStati";
+            this._commandCollection[0].CommandText = "SELECT * FROM dbo.AnagraficaStati";
             this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
             this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[1].Connection = this.Connection;
@@ -16780,7 +16924,7 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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(int Original_IdxStato, string Original_Descrizione, string Original_Semaforo) {
+        public virtual int Delete(int Original_IdxStato, string Original_Descrizione, string Original_Semaforo, global::System.Nullable<int> Original_Priorita, string Original_ClasseTempo, global::System.Nullable<bool> Original_ShowArticolo) {
             this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_IdxStato));
             if ((Original_Descrizione == null)) {
                 this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1));
@@ -16798,6 +16942,30 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
                 this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0));
                 this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_Semaforo));
             }
+            if ((Original_Priorita.HasValue == true)) {
+                this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[6].Value = ((int)(Original_Priorita.Value));
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value;
+            }
+            if ((Original_ClasseTempo == null)) {
+                this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_ClasseTempo));
+            }
+            if ((Original_ShowArticolo.HasValue == true)) {
+                this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0));
+                this.Adapter.DeleteCommand.Parameters[10].Value = ((bool)(Original_ShowArticolo.Value));
+            }
+            else {
+                this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1));
+                this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value;
+            }
             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)) {
@@ -16818,7 +16986,7 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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(int IdxStato, string Descrizione, string Semaforo) {
+        public virtual int Insert(int IdxStato, string Descrizione, string Semaforo, global::System.Nullable<int> Priorita, string ClasseTempo, global::System.Nullable<bool> ShowArticolo) {
             this.Adapter.InsertCommand.Parameters[0].Value = ((int)(IdxStato));
             if ((Descrizione == null)) {
                 this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -16832,6 +17000,24 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
             else {
                 this.Adapter.InsertCommand.Parameters[2].Value = ((string)(Semaforo));
             }
+            if ((Priorita.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[3].Value = ((int)(Priorita.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            if ((ClasseTempo == null)) {
+                this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[4].Value = ((string)(ClasseTempo));
+            }
+            if ((ShowArticolo.HasValue == true)) {
+                this.Adapter.InsertCommand.Parameters[5].Value = ((bool)(ShowArticolo.Value));
+            }
+            else {
+                this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value;
+            }
             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)) {
@@ -16852,7 +17038,7 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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(int IdxStato, string Descrizione, string Semaforo, int Original_IdxStato, string Original_Descrizione, string Original_Semaforo) {
+        public virtual int Update(int IdxStato, string Descrizione, string Semaforo, global::System.Nullable<int> Priorita, string ClasseTempo, global::System.Nullable<bool> ShowArticolo, int Original_IdxStato, string Original_Descrizione, string Original_Semaforo, global::System.Nullable<int> Original_Priorita, string Original_ClasseTempo, global::System.Nullable<bool> Original_ShowArticolo) {
             this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(IdxStato));
             if ((Descrizione == null)) {
                 this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -16866,22 +17052,64 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
             else {
                 this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(Semaforo));
             }
-            this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Original_IdxStato));
-            if ((Original_Descrizione == null)) {
-                this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(1));
+            if ((Priorita.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[3].Value = ((int)(Priorita.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value;
+            }
+            if ((ClasseTempo == null)) {
+                this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(ClasseTempo));
+            }
+            if ((ShowArticolo.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[5].Value = ((bool)(ShowArticolo.Value));
+            }
+            else {
                 this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value;
             }
+            this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(Original_IdxStato));
+            if ((Original_Descrizione == null)) {
+                this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value;
+            }
             else {
-                this.Adapter.UpdateCommand.Parameters[4].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_Descrizione));
+                this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_Descrizione));
             }
             if ((Original_Semaforo == null)) {
-                this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(1));
-                this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value;
+                this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value;
             }
             else {
-                this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(0));
-                this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_Semaforo));
+                this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_Semaforo));
+            }
+            if ((Original_Priorita.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(Original_Priorita.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value;
+            }
+            if ((Original_ClasseTempo == null)) {
+                this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value;
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_ClasseTempo));
+            }
+            if ((Original_ShowArticolo.HasValue == true)) {
+                this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0));
+                this.Adapter.UpdateCommand.Parameters[16].Value = ((bool)(Original_ShowArticolo.Value));
+            }
+            else {
+                this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1));
+                this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
             }
             global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
             if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) 
@@ -16903,8 +17131,8 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.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 Descrizione, string Semaforo, int Original_IdxStato, string Original_Descrizione, string Original_Semaforo) {
-            return this.Update(Original_IdxStato, Descrizione, Semaforo, Original_IdxStato, Original_Descrizione, Original_Semaforo);
+        public virtual int Update(string Descrizione, string Semaforo, global::System.Nullable<int> Priorita, string ClasseTempo, global::System.Nullable<bool> ShowArticolo, int Original_IdxStato, string Original_Descrizione, string Original_Semaforo, global::System.Nullable<int> Original_Priorita, string Original_ClasseTempo, global::System.Nullable<bool> Original_ShowArticolo) {
+            return this.Update(Original_IdxStato, Descrizione, Semaforo, Priorita, ClasseTempo, ShowArticolo, Original_IdxStato, Original_Descrizione, Original_Semaforo, Original_Priorita, Original_ClasseTempo, Original_ShowArticolo);
         }
     }
     
diff --git a/MapoDb/DS_applicazione.xsd b/MapoDb/DS_applicazione.xsd
index 50852503..d32441d6 100644
--- a/MapoDb/DS_applicazione.xsd
+++ b/MapoDb/DS_applicazione.xsd
@@ -435,53 +435,67 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="AnagraficaStatiTableAdapter" GeneratorDataComponentClassName="AnagraficaStatiTableAdapter" Name="AnagraficaStati" UserDataComponentName="AnagraficaStatiTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="Mapo_ColMecc.dbo.AnagraficaStati" 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">
+              <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.AnagraficaStati" 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].[AnagraficaStati] WHERE (([IdxStato] = @Original_IdxStato) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ((@IsNull_Semaforo = 1 AND [Semaforo] IS NULL) OR ([Semaforo] = @Original_Semaforo)))</CommandText>
+                    <CommandText>DELETE FROM [dbo].[AnagraficaStati] WHERE (([IdxStato] = @Original_IdxStato) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ((@IsNull_Semaforo = 1 AND [Semaforo] IS NULL) OR ([Semaforo] = @Original_Semaforo)) AND ((@IsNull_Priorita = 1 AND [Priorita] IS NULL) OR ([Priorita] = @Original_Priorita)) AND ((@IsNull_ClasseTempo = 1 AND [ClasseTempo] IS NULL) OR ([ClasseTempo] = @Original_ClasseTempo)) AND ((@IsNull_ShowArticolo = 1 AND [ShowArticolo] IS NULL) OR ([ShowArticolo] = @Original_ShowArticolo)))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IdxStato" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxStato" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Descrizione" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Descrizione" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Descrizione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Descrizione" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Semaforo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Semaforo" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Semaforo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Semaforo" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Priorita" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Priorita" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Priorita" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Priorita" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ClasseTempo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ClasseTempo" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_ClasseTempo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ClasseTempo" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ShowArticolo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ShowArticolo" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ShowArticolo" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ShowArticolo" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>
-                      INSERT INTO [dbo].[AnagraficaStati] ([IdxStato], [Descrizione], [Semaforo]) VALUES (@IdxStato, @Descrizione, @Semaforo);
-                      SELECT IdxStato, Descrizione, Semaforo FROM AnagraficaStati WHERE (IdxStato = @IdxStato)
-                    </CommandText>
+                    <CommandText>INSERT INTO [dbo].[AnagraficaStati] ([IdxStato], [Descrizione], [Semaforo], [Priorita], [ClasseTempo], [ShowArticolo]) VALUES (@IdxStato, @Descrizione, @Semaforo, @Priorita, @ClasseTempo, @ShowArticolo);
+SELECT IdxStato, Descrizione, Semaforo, Priorita, ClasseTempo, ShowArticolo FROM AnagraficaStati WHERE (IdxStato = @IdxStato)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IdxStato" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxStato" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Descrizione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Descrizione" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Semaforo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Semaforo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Priorita" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Priorita" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ClasseTempo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ClasseTempo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ShowArticolo" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ShowArticolo" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT IdxStato, Descrizione, Semaforo FROM dbo.AnagraficaStati</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT * FROM dbo.AnagraficaStati</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>
-                      UPDATE [dbo].[AnagraficaStati] SET [IdxStato] = @IdxStato, [Descrizione] = @Descrizione, [Semaforo] = @Semaforo WHERE (([IdxStato] = @Original_IdxStato) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ((@IsNull_Semaforo = 1 AND [Semaforo] IS NULL) OR ([Semaforo] = @Original_Semaforo)));
-                      SELECT IdxStato, Descrizione, Semaforo FROM AnagraficaStati WHERE (IdxStato = @IdxStato)
-                    </CommandText>
+                    <CommandText>UPDATE [dbo].[AnagraficaStati] SET [IdxStato] = @IdxStato, [Descrizione] = @Descrizione, [Semaforo] = @Semaforo, [Priorita] = @Priorita, [ClasseTempo] = @ClasseTempo, [ShowArticolo] = @ShowArticolo WHERE (([IdxStato] = @Original_IdxStato) AND ((@IsNull_Descrizione = 1 AND [Descrizione] IS NULL) OR ([Descrizione] = @Original_Descrizione)) AND ((@IsNull_Semaforo = 1 AND [Semaforo] IS NULL) OR ([Semaforo] = @Original_Semaforo)) AND ((@IsNull_Priorita = 1 AND [Priorita] IS NULL) OR ([Priorita] = @Original_Priorita)) AND ((@IsNull_ClasseTempo = 1 AND [ClasseTempo] IS NULL) OR ([ClasseTempo] = @Original_ClasseTempo)) AND ((@IsNull_ShowArticolo = 1 AND [ShowArticolo] IS NULL) OR ([ShowArticolo] = @Original_ShowArticolo)));
+SELECT IdxStato, Descrizione, Semaforo, Priorita, ClasseTempo, ShowArticolo FROM AnagraficaStati WHERE (IdxStato = @IdxStato)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IdxStato" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxStato" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Descrizione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Descrizione" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Semaforo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Semaforo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Priorita" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Priorita" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ClasseTempo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ClasseTempo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ShowArticolo" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ShowArticolo" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IdxStato" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxStato" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Descrizione" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Descrizione" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Descrizione" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Descrizione" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Semaforo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Semaforo" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_Semaforo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="Semaforo" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_Priorita" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Priorita" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Priorita" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Priorita" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ClasseTempo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ClasseTempo" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_ClasseTempo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ClasseTempo" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ShowArticolo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ShowArticolo" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ShowArticolo" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ShowArticolo" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -491,6 +505,9 @@ SELECT IdxMacchina, IdxStato, InizioStato, Value, CodArticolo, TempoCicloBase, P
               <Mapping SourceColumn="IdxStato" DataSetColumn="IdxStato" />
               <Mapping SourceColumn="Descrizione" DataSetColumn="Descrizione" />
               <Mapping SourceColumn="Semaforo" DataSetColumn="Semaforo" />
+              <Mapping SourceColumn="Priorita" DataSetColumn="Priorita" />
+              <Mapping SourceColumn="ClasseTempo" DataSetColumn="ClasseTempo" />
+              <Mapping SourceColumn="ShowArticolo" DataSetColumn="ShowArticolo" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="Mapo_ColMecc.dbo.AnagraficaStati" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="GetByIdx" GetMethodModifier="Public" GetMethodName="GetByIdx" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByIdx" UserSourceName="GetByIdx">
@@ -2635,6 +2652,15 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="Priorita" msprop:Generator_ColumnVarNameInTable="columnPriorita" msprop:Generator_ColumnPropNameInRow="Priorita" msprop:Generator_ColumnPropNameInTable="PrioritaColumn" msprop:Generator_UserColumnName="Priorita" type="xs:int" minOccurs="0" />
+              <xs:element name="ClasseTempo" msprop:Generator_ColumnVarNameInTable="columnClasseTempo" msprop:Generator_ColumnPropNameInRow="ClasseTempo" msprop:Generator_ColumnPropNameInTable="ClasseTempoColumn" msprop:Generator_UserColumnName="ClasseTempo" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="ShowArticolo" msprop:Generator_ColumnVarNameInTable="columnShowArticolo" msprop:Generator_ColumnPropNameInRow="ShowArticolo" msprop:Generator_ColumnPropNameInTable="ShowArticoloColumn" msprop:Generator_UserColumnName="ShowArticolo" type="xs:boolean" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -2904,7 +2930,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="MicroStatoMacchina" msprop:Generator_TableClassName="MicroStatoMacchinaDataTable" msprop:Generator_TableVarName="tableMicroStatoMacchina" msprop:Generator_TablePropName="MicroStatoMacchina" msprop:Generator_RowDeletingName="MicroStatoMacchinaRowDeleting" msprop:Generator_RowChangingName="MicroStatoMacchinaRowChanging" msprop:Generator_RowEvHandlerName="MicroStatoMacchinaRowChangeEventHandler" msprop:Generator_RowDeletedName="MicroStatoMacchinaRowDeleted" msprop:Generator_UserTableName="MicroStatoMacchina" msprop:Generator_RowChangedName="MicroStatoMacchinaRowChanged" msprop:Generator_RowEvArgName="MicroStatoMacchinaRowChangeEvent" msprop:Generator_RowClassName="MicroStatoMacchinaRow">
+        <xs:element name="MicroStatoMacchina" msprop:Generator_TableClassName="MicroStatoMacchinaDataTable" msprop:Generator_TableVarName="tableMicroStatoMacchina" msprop:Generator_RowChangedName="MicroStatoMacchinaRowChanged" msprop:Generator_TablePropName="MicroStatoMacchina" msprop:Generator_RowDeletingName="MicroStatoMacchinaRowDeleting" msprop:Generator_RowChangingName="MicroStatoMacchinaRowChanging" msprop:Generator_RowEvHandlerName="MicroStatoMacchinaRowChangeEventHandler" msprop:Generator_RowDeletedName="MicroStatoMacchinaRowDeleted" msprop:Generator_RowClassName="MicroStatoMacchinaRow" msprop:Generator_UserTableName="MicroStatoMacchina" msprop:Generator_RowEvArgName="MicroStatoMacchinaRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -2926,7 +2952,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="LinkMenuJQM" msprop:Generator_TableClassName="LinkMenuJQMDataTable" msprop:Generator_TableVarName="tableLinkMenuJQM" msprop:Generator_TablePropName="LinkMenuJQM" msprop:Generator_RowDeletingName="LinkMenuJQMRowDeleting" msprop:Generator_RowChangingName="LinkMenuJQMRowChanging" msprop:Generator_RowEvHandlerName="LinkMenuJQMRowChangeEventHandler" msprop:Generator_RowDeletedName="LinkMenuJQMRowDeleted" msprop:Generator_UserTableName="LinkMenuJQM" msprop:Generator_RowChangedName="LinkMenuJQMRowChanged" msprop:Generator_RowEvArgName="LinkMenuJQMRowChangeEvent" msprop:Generator_RowClassName="LinkMenuJQMRow">
+        <xs:element name="LinkMenuJQM" msprop:Generator_TableClassName="LinkMenuJQMDataTable" msprop:Generator_TableVarName="tableLinkMenuJQM" msprop:Generator_RowChangedName="LinkMenuJQMRowChanged" msprop:Generator_TablePropName="LinkMenuJQM" msprop:Generator_RowDeletingName="LinkMenuJQMRowDeleting" msprop:Generator_RowChangingName="LinkMenuJQMRowChanging" msprop:Generator_RowEvHandlerName="LinkMenuJQMRowChangeEventHandler" msprop:Generator_RowDeletedName="LinkMenuJQMRowDeleted" msprop:Generator_RowClassName="LinkMenuJQMRow" msprop:Generator_UserTableName="LinkMenuJQM" msprop:Generator_RowEvArgName="LinkMenuJQMRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idxLink" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxLink" msprop:Generator_ColumnPropNameInRow="idxLink" msprop:Generator_ColumnPropNameInTable="idxLinkColumn" msprop:Generator_UserColumnName="idxLink" type="xs:int" />
@@ -2962,7 +2988,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="RemoteRebootLog" msprop:Generator_TableClassName="RemoteRebootLogDataTable" msprop:Generator_TableVarName="tableRemoteRebootLog" msprop:Generator_TablePropName="RemoteRebootLog" msprop:Generator_RowDeletingName="RemoteRebootLogRowDeleting" msprop:Generator_RowChangingName="RemoteRebootLogRowChanging" msprop:Generator_RowEvHandlerName="RemoteRebootLogRowChangeEventHandler" msprop:Generator_RowDeletedName="RemoteRebootLogRowDeleted" msprop:Generator_UserTableName="RemoteRebootLog" msprop:Generator_RowChangedName="RemoteRebootLogRowChanged" msprop:Generator_RowEvArgName="RemoteRebootLogRowChangeEvent" msprop:Generator_RowClassName="RemoteRebootLogRow">
+        <xs:element name="RemoteRebootLog" msprop:Generator_TableClassName="RemoteRebootLogDataTable" msprop:Generator_TableVarName="tableRemoteRebootLog" msprop:Generator_RowChangedName="RemoteRebootLogRowChanged" msprop:Generator_TablePropName="RemoteRebootLog" msprop:Generator_RowDeletingName="RemoteRebootLogRowDeleting" msprop:Generator_RowChangingName="RemoteRebootLogRowChanging" msprop:Generator_RowEvHandlerName="RemoteRebootLogRowChangeEventHandler" msprop:Generator_RowDeletedName="RemoteRebootLogRowDeleted" msprop:Generator_RowClassName="RemoteRebootLogRow" msprop:Generator_UserTableName="RemoteRebootLog" msprop:Generator_RowEvArgName="RemoteRebootLogRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idxReboot" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxReboot" msprop:Generator_ColumnPropNameInRow="idxReboot" msprop:Generator_ColumnPropNameInTable="idxRebootColumn" msprop:Generator_UserColumnName="idxReboot" type="xs:int" />
@@ -2998,7 +3024,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ParetoDurate" msprop:Generator_TableClassName="ParetoDurateDataTable" msprop:Generator_TableVarName="tableParetoDurate" msprop:Generator_TablePropName="ParetoDurate" msprop:Generator_RowDeletingName="ParetoDurateRowDeleting" msprop:Generator_RowChangingName="ParetoDurateRowChanging" msprop:Generator_RowEvHandlerName="ParetoDurateRowChangeEventHandler" msprop:Generator_RowDeletedName="ParetoDurateRowDeleted" msprop:Generator_UserTableName="ParetoDurate" msprop:Generator_RowChangedName="ParetoDurateRowChanged" msprop:Generator_RowEvArgName="ParetoDurateRowChangeEvent" msprop:Generator_RowClassName="ParetoDurateRow">
+        <xs:element name="ParetoDurate" msprop:Generator_TableClassName="ParetoDurateDataTable" msprop:Generator_TableVarName="tableParetoDurate" msprop:Generator_RowChangedName="ParetoDurateRowChanged" msprop:Generator_TablePropName="ParetoDurate" msprop:Generator_RowDeletingName="ParetoDurateRowDeleting" msprop:Generator_RowChangingName="ParetoDurateRowChanging" msprop:Generator_RowEvHandlerName="ParetoDurateRowChangeEventHandler" msprop:Generator_RowDeletedName="ParetoDurateRowDeleted" msprop:Generator_RowClassName="ParetoDurateRow" msprop:Generator_UserTableName="ParetoDurate" msprop:Generator_RowEvArgName="ParetoDurateRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxMacchina" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina" minOccurs="0">
@@ -3015,7 +3041,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="SignalLog" msprop:Generator_TableClassName="SignalLogDataTable" msprop:Generator_TableVarName="tableSignalLog" msprop:Generator_RowChangedName="SignalLogRowChanged" msprop:Generator_TablePropName="SignalLog" msprop:Generator_RowDeletingName="SignalLogRowDeleting" msprop:Generator_RowChangingName="SignalLogRowChanging" msprop:Generator_RowEvHandlerName="SignalLogRowChangeEventHandler" msprop:Generator_RowDeletedName="SignalLogRowDeleted" msprop:Generator_RowClassName="SignalLogRow" msprop:Generator_UserTableName="SignalLog" msprop:Generator_RowEvArgName="SignalLogRowChangeEvent">
+        <xs:element name="SignalLog" msprop:Generator_TableClassName="SignalLogDataTable" msprop:Generator_TableVarName="tableSignalLog" msprop:Generator_TablePropName="SignalLog" msprop:Generator_RowDeletingName="SignalLogRowDeleting" msprop:Generator_RowChangingName="SignalLogRowChanging" msprop:Generator_RowEvHandlerName="SignalLogRowChangeEventHandler" msprop:Generator_RowDeletedName="SignalLogRowDeleted" msprop:Generator_UserTableName="SignalLog" msprop:Generator_RowChangedName="SignalLogRowChanged" msprop:Generator_RowEvArgName="SignalLogRowChangeEvent" msprop:Generator_RowClassName="SignalLogRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idxMsg" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidxMsg" msprop:Generator_ColumnPropNameInRow="idxMsg" msprop:Generator_ColumnPropNameInTable="idxMsgColumn" msprop:Generator_UserColumnName="idxMsg" type="xs:int" />
@@ -3039,7 +3065,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="AnagArticoli" msprop:Generator_TableClassName="AnagArticoliDataTable" msprop:Generator_TableVarName="tableAnagArticoli" msprop:Generator_TablePropName="AnagArticoli" msprop:Generator_RowDeletingName="AnagArticoliRowDeleting" msprop:Generator_RowChangingName="AnagArticoliRowChanging" msprop:Generator_RowEvHandlerName="AnagArticoliRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagArticoliRowDeleted" msprop:Generator_UserTableName="AnagArticoli" msprop:Generator_RowChangedName="AnagArticoliRowChanged" msprop:Generator_RowEvArgName="AnagArticoliRowChangeEvent" msprop:Generator_RowClassName="AnagArticoliRow">
+        <xs:element name="AnagArticoli" msprop:Generator_TableClassName="AnagArticoliDataTable" msprop:Generator_TableVarName="tableAnagArticoli" msprop:Generator_RowChangedName="AnagArticoliRowChanged" msprop:Generator_TablePropName="AnagArticoli" msprop:Generator_RowDeletingName="AnagArticoliRowDeleting" msprop:Generator_RowChangingName="AnagArticoliRowChanging" msprop:Generator_RowEvHandlerName="AnagArticoliRowChangeEventHandler" msprop:Generator_RowDeletedName="AnagArticoliRowDeleted" msprop:Generator_RowClassName="AnagArticoliRow" msprop:Generator_UserTableName="AnagArticoli" msprop:Generator_RowEvArgName="AnagArticoliRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="CodArticolo" msprop:Generator_ColumnVarNameInTable="columnCodArticolo" msprop:Generator_ColumnPropNameInRow="CodArticolo" msprop:Generator_ColumnPropNameInTable="CodArticoloColumn" msprop:Generator_UserColumnName="CodArticolo">
@@ -3074,7 +3100,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="MSFD" msprop:Generator_TableClassName="MSFDDataTable" msprop:Generator_TableVarName="tableMSFD" msprop:Generator_TablePropName="MSFD" msprop:Generator_RowDeletingName="MSFDRowDeleting" msprop:Generator_RowChangingName="MSFDRowChanging" msprop:Generator_RowEvHandlerName="MSFDRowChangeEventHandler" msprop:Generator_RowDeletedName="MSFDRowDeleted" msprop:Generator_UserTableName="MSFD" msprop:Generator_RowChangedName="MSFDRowChanged" msprop:Generator_RowEvArgName="MSFDRowChangeEvent" msprop:Generator_RowClassName="MSFDRow">
+        <xs:element name="MSFD" msprop:Generator_TableClassName="MSFDDataTable" msprop:Generator_TableVarName="tableMSFD" msprop:Generator_RowChangedName="MSFDRowChanged" msprop:Generator_TablePropName="MSFD" msprop:Generator_RowDeletingName="MSFDRowDeleting" msprop:Generator_RowChangingName="MSFDRowChanging" msprop:Generator_RowEvHandlerName="MSFDRowChangeEventHandler" msprop:Generator_RowDeletedName="MSFDRowDeleted" msprop:Generator_RowClassName="MSFDRow" msprop:Generator_UserTableName="MSFD" msprop:Generator_RowEvArgName="MSFDRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -3153,7 +3179,7 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="FluxLog" msprop:Generator_TableClassName="FluxLogDataTable" msprop:Generator_TableVarName="tableFluxLog" msprop:Generator_RowChangedName="FluxLogRowChanged" msprop:Generator_TablePropName="FluxLog" msprop:Generator_RowDeletingName="FluxLogRowDeleting" msprop:Generator_RowChangingName="FluxLogRowChanging" msprop:Generator_RowEvHandlerName="FluxLogRowChangeEventHandler" msprop:Generator_RowDeletedName="FluxLogRowDeleted" msprop:Generator_RowClassName="FluxLogRow" msprop:Generator_UserTableName="FluxLog" msprop:Generator_RowEvArgName="FluxLogRowChangeEvent">
+        <xs:element name="FluxLog" msprop:Generator_TableClassName="FluxLogDataTable" msprop:Generator_TableVarName="tableFluxLog" msprop:Generator_TablePropName="FluxLog" msprop:Generator_RowDeletingName="FluxLogRowDeleting" msprop:Generator_RowChangingName="FluxLogRowChanging" msprop:Generator_RowEvHandlerName="FluxLogRowChangeEventHandler" msprop:Generator_RowDeletedName="FluxLogRowDeleted" msprop:Generator_UserTableName="FluxLog" msprop:Generator_RowChangedName="FluxLogRowChanged" msprop:Generator_RowEvArgName="FluxLogRowChangeEvent" msprop:Generator_RowClassName="FluxLogRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="IdxMacchina" msprop:Generator_ColumnVarNameInTable="columnIdxMacchina" msprop:Generator_ColumnPropNameInRow="IdxMacchina" msprop:Generator_ColumnPropNameInTable="IdxMacchinaColumn" msprop:Generator_UserColumnName="IdxMacchina">
@@ -3302,26 +3328,26 @@ SELECT IdxMacchina, dtEvento, CodFlux, Valore, Cnt FROM FluxLog WHERE (CodFlux =
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_UserParentTable="FamiglieMacchine" msprop:Generator_ParentPropName="FamiglieMacchineRow" />
-      <msdata:Relationship name="FK_Macchine2FamiglieMacchine_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_UserParentTable="Macchine" msprop:Generator_ParentPropName="MacchineRow" />
-      <msdata:Relationship name="FK_TransizioneStati_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="TransizioneStati" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_FamiglieMacchine" msprop:Generator_RelationVarName="relationFK_TransizioneStati_FamiglieMacchine" msprop:Generator_UserParentTable="FamiglieMacchine" msprop:Generator_ParentPropName="FamiglieMacchineRow" />
-      <msdata:Relationship name="FK_StatoMacchine_Macchine" msdata:parent="Macchine" msdata:child="StatoMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_Macchine" msprop:Generator_RelationVarName="relationFK_StatoMacchine_Macchine" msprop:Generator_UserParentTable="Macchine" msprop:Generator_ParentPropName="MacchineRow" />
-      <msdata:Relationship name="FK_TransizioneStati_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="TransizioneStati" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaStati" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" />
-      <msdata:Relationship name="FK_StatoMacchine_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="StatoMacchine" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaStati" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" />
-      <msdata:Relationship name="FK_EventList_Macchine" msdata:parent="Macchine" msdata:child="EventList" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_Macchine" msprop:Generator_RelationVarName="relationFK_EventList_Macchine" msprop:Generator_UserParentTable="Macchine" msprop:Generator_ParentPropName="MacchineRow" />
-      <msdata:Relationship name="FK_TransizioneStati_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneStati" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaEventi" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
-      <msdata:Relationship name="FK_EventList_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="EventList" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_AnagraficaEventi" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
-      <msdata:Relationship name="FK_DiarioDiBordo_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="DiarioDiBordo" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaStati" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" />
-      <msdata:Relationship name="FK_DiarioDiBordo_Macchine" msdata:parent="Macchine" msdata:child="DiarioDiBordo" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_Macchine" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_Macchine" msprop:Generator_UserParentTable="Macchine" msprop:Generator_ParentPropName="MacchineRow" />
-      <msdata:Relationship name="FK_TransizioneEventi_AnagraficaEventi1" msdata:parent="AnagraficaEventi" msdata:child="TransizioneEventi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserChildTable="TransizioneEventi" msprop:Generator_ChildPropName="GetTransizioneEventiRows" msprop:Generator_UserRelationName="FK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_RelationVarName="relationFK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
-      <msdata:Relationship name="FK_Macchine2FamigliaIngressi_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_UserParentTable="Macchine" msprop:Generator_ParentPropName="MacchineRow" />
-      <msdata:Relationship name="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_UserParentTable="FamigliaTipoIngressi" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" />
-      <msdata:Relationship name="FK_TransizioneIngressi_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_UserRelationName="FK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" />
-      <msdata:Relationship name="FK_TransizioneIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_UserRelationName="FK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_UserParentTable="FamigliaTipoIngressi" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" />
-      <msdata:Relationship name="FK_DiarioDiBordo_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="DiarioDiBordo" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" />
-      <msdata:Relationship name="FK_EventList_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="EventList" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_AnagraficaOperatori" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" />
-      <msdata:Relationship name="FK_StatoMacchine_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="StatoMacchine" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaOperatori" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" />
-      <msdata:Relationship name="AnagArticoli_DiarioDiBordo" msdata:parent="AnagArticoli" msdata:child="DiarioDiBordo" msdata:parentkey="CodArticolo" msdata:childkey="CodArticolo" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="AnagArticoli_DiarioDiBordo" msprop:Generator_RelationVarName="relationAnagArticoli_DiarioDiBordo" msprop:Generator_UserParentTable="AnagArticoli" msprop:Generator_ParentPropName="AnagArticoliRow" />
+      <msdata:Relationship name="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_ParentPropName="FamiglieMacchineRow" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_FamiglieMacchine" msprop:Generator_UserParentTable="FamiglieMacchine" />
+      <msdata:Relationship name="FK_Macchine2FamiglieMacchine_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamiglieMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="Macchine2FamiglieMacchine" msprop:Generator_ChildPropName="GetMacchine2FamiglieMacchineRows" msprop:Generator_UserRelationName="FK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_RelationVarName="relationFK_Macchine2FamiglieMacchine_Macchine" msprop:Generator_UserParentTable="Macchine" />
+      <msdata:Relationship name="FK_TransizioneStati_FamiglieMacchine" msdata:parent="FamiglieMacchine" msdata:child="TransizioneStati" msdata:parentkey="IdxFamiglia" msdata:childkey="IdxFamiglia" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_FamiglieMacchine" msprop:Generator_ParentPropName="FamiglieMacchineRow" msprop:Generator_RelationVarName="relationFK_TransizioneStati_FamiglieMacchine" msprop:Generator_UserParentTable="FamiglieMacchine" />
+      <msdata:Relationship name="FK_StatoMacchine_Macchine" msdata:parent="Macchine" msdata:child="StatoMacchine" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_Macchine" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_RelationVarName="relationFK_StatoMacchine_Macchine" msprop:Generator_UserParentTable="Macchine" />
+      <msdata:Relationship name="FK_TransizioneStati_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="TransizioneStati" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" />
+      <msdata:Relationship name="FK_StatoMacchine_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="StatoMacchine" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" />
+      <msdata:Relationship name="FK_EventList_Macchine" msdata:parent="Macchine" msdata:child="EventList" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_Macchine" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_RelationVarName="relationFK_EventList_Macchine" msprop:Generator_UserParentTable="Macchine" />
+      <msdata:Relationship name="FK_TransizioneStati_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneStati" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserChildTable="TransizioneStati" msprop:Generator_ChildPropName="GetTransizioneStatiRows" msprop:Generator_UserRelationName="FK_TransizioneStati_AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_RelationVarName="relationFK_TransizioneStati_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" />
+      <msdata:Relationship name="FK_EventList_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="EventList" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipo" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" />
+      <msdata:Relationship name="FK_DiarioDiBordo_AnagraficaStati" msdata:parent="AnagraficaStati" msdata:child="DiarioDiBordo" msdata:parentkey="IdxStato" msdata:childkey="IdxStato" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaStati" msprop:Generator_ParentPropName="AnagraficaStatiRow" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaStati" msprop:Generator_UserParentTable="AnagraficaStati" />
+      <msdata:Relationship name="FK_DiarioDiBordo_Macchine" msdata:parent="Macchine" msdata:child="DiarioDiBordo" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_Macchine" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_Macchine" msprop:Generator_UserParentTable="Macchine" />
+      <msdata:Relationship name="FK_TransizioneEventi_AnagraficaEventi1" msdata:parent="AnagraficaEventi" msdata:child="TransizioneEventi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserChildTable="TransizioneEventi" msprop:Generator_ChildPropName="GetTransizioneEventiRows" msprop:Generator_UserRelationName="FK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_RelationVarName="relationFK_TransizioneEventi_AnagraficaEventi1" msprop:Generator_UserParentTable="AnagraficaEventi" />
+      <msdata:Relationship name="FK_Macchine2FamigliaIngressi_Macchine" msdata:parent="Macchine" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxMacchina" msdata:childkey="IdxMacchina" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_ParentPropName="MacchineRow" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_Macchine" msprop:Generator_UserParentTable="Macchine" />
+      <msdata:Relationship name="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="Macchine2FamigliaIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserChildTable="Macchine2FamigliaIngressi" msprop:Generator_ChildPropName="GetMacchine2FamigliaIngressiRows" msprop:Generator_UserRelationName="FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" msprop:Generator_RelationVarName="relationFK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" msprop:Generator_UserParentTable="FamigliaTipoIngressi" />
+      <msdata:Relationship name="FK_TransizioneIngressi_AnagraficaEventi" msdata:parent="AnagraficaEventi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxTipo" msdata:childkey="IdxTipoEvento" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_UserRelationName="FK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_ParentPropName="AnagraficaEventiRow" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_AnagraficaEventi" msprop:Generator_UserParentTable="AnagraficaEventi" />
+      <msdata:Relationship name="FK_TransizioneIngressi_FamigliaTipoIngressi" msdata:parent="FamigliaTipoIngressi" msdata:child="TransizioneIngressi" msdata:parentkey="IdxFamigliaIngresso" msdata:childkey="IdxFamigliaIngresso" msprop:Generator_UserChildTable="TransizioneIngressi" msprop:Generator_ChildPropName="GetTransizioneIngressiRows" msprop:Generator_UserRelationName="FK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_ParentPropName="FamigliaTipoIngressiRow" msprop:Generator_RelationVarName="relationFK_TransizioneIngressi_FamigliaTipoIngressi" msprop:Generator_UserParentTable="FamigliaTipoIngressi" />
+      <msdata:Relationship name="FK_DiarioDiBordo_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="DiarioDiBordo" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="FK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" msprop:Generator_RelationVarName="relationFK_DiarioDiBordo_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" />
+      <msdata:Relationship name="FK_EventList_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="EventList" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="EventList" msprop:Generator_ChildPropName="GetEventListRows" msprop:Generator_UserRelationName="FK_EventList_AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" msprop:Generator_RelationVarName="relationFK_EventList_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" />
+      <msdata:Relationship name="FK_StatoMacchine_AnagraficaOperatori" msdata:parent="AnagraficaOperatori" msdata:child="StatoMacchine" msdata:parentkey="MatrOpr" msdata:childkey="MatrOpr" msprop:Generator_UserChildTable="StatoMacchine" msprop:Generator_ChildPropName="GetStatoMacchineRows" msprop:Generator_UserRelationName="FK_StatoMacchine_AnagraficaOperatori" msprop:Generator_ParentPropName="AnagraficaOperatoriRow" msprop:Generator_RelationVarName="relationFK_StatoMacchine_AnagraficaOperatori" msprop:Generator_UserParentTable="AnagraficaOperatori" />
+      <msdata:Relationship name="AnagArticoli_DiarioDiBordo" msdata:parent="AnagArticoli" msdata:child="DiarioDiBordo" msdata:parentkey="CodArticolo" msdata:childkey="CodArticolo" msprop:Generator_UserChildTable="DiarioDiBordo" msprop:Generator_ChildPropName="GetDiarioDiBordoRows" msprop:Generator_UserRelationName="AnagArticoli_DiarioDiBordo" msprop:Generator_ParentPropName="AnagArticoliRow" msprop:Generator_RelationVarName="relationAnagArticoli_DiarioDiBordo" msprop:Generator_UserParentTable="AnagArticoli" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/MapoDb/DS_applicazione.xss b/MapoDb/DS_applicazione.xss
index 8129b39e..1faa93bf 100644
--- a/MapoDb/DS_applicazione.xss
+++ b/MapoDb/DS_applicazione.xss
@@ -4,33 +4,33 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="49" ViewPortY="-28" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="18" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:Macchine2FamiglieMacchine" ZOrder="19" X="553" Y="715" Height="135" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
-    <Shape ID="DesignTable:FamiglieMacchine" ZOrder="21" X="519" Y="1007" Height="135" Width="296" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
-    <Shape ID="DesignTable:Macchine" ZOrder="18" X="619" Y="324" Height="273" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
-    <Shape ID="DesignTable:TransizioneStati" ZOrder="16" X="870" Y="916" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
-    <Shape ID="DesignTable:StatoMacchine" ZOrder="10" X="237" Y="667" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
-    <Shape ID="DesignTable:AnagraficaStati" ZOrder="27" X="245" Y="455" Height="181" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
-    <Shape ID="DesignTable:EventList" ZOrder="1" X="920" Y="145" Height="342" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
+    <Shape ID="DesignTable:Macchine2FamiglieMacchine" ZOrder="21" X="553" Y="715" Height="135" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
+    <Shape ID="DesignTable:FamiglieMacchine" ZOrder="23" X="519" Y="1007" Height="135" Width="296" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
+    <Shape ID="DesignTable:Macchine" ZOrder="20" X="619" Y="324" Height="273" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
+    <Shape ID="DesignTable:TransizioneStati" ZOrder="18" X="870" Y="916" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
+    <Shape ID="DesignTable:StatoMacchine" ZOrder="3" X="4" Y="770" Height="365" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
+    <Shape ID="DesignTable:AnagraficaStati" ZOrder="4" X="303" Y="454" Height="250" Width="277" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
+    <Shape ID="DesignTable:EventList" ZOrder="5" X="920" Y="145" Height="342" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
     <Shape ID="DesignTable:AnagraficaEventi" ZOrder="30" X="1285" Y="228" Height="158" Width="288" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
-    <Shape ID="DesignTable:DiarioDiBordo" ZOrder="11" X="230" Y="-18" Height="434" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="283" />
-    <Shape ID="DesignTable:TransizioneEventi" ZOrder="24" X="1279" Y="409" Height="250" Width="298" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
-    <Shape ID="DesignTable:KeepAlive" ZOrder="6" X="1316" Y="1006" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
-    <Shape ID="DesignTable:Macchine2FamigliaIngressi" ZOrder="8" X="596" Y="1155" Height="135" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
+    <Shape ID="DesignTable:DiarioDiBordo" ZOrder="13" X="230" Y="-18" Height="434" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="283" />
+    <Shape ID="DesignTable:TransizioneEventi" ZOrder="25" X="1279" Y="409" Height="250" Width="298" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
+    <Shape ID="DesignTable:KeepAlive" ZOrder="10" X="1316" Y="1006" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
+    <Shape ID="DesignTable:Macchine2FamigliaIngressi" ZOrder="12" X="596" Y="1155" Height="135" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
     <Shape ID="DesignTable:FamigliaTipoIngressi" ZOrder="35" X="943" Y="1212" Height="135" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
-    <Shape ID="DesignTable:TransizioneIngressi" ZOrder="22" X="192" Y="1255" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
-    <Shape ID="DesignTable:AnagraficaOperatori" ZOrder="23" X="965" Y="641" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
-    <Shape ID="DesignTable:AnagraficaOperatori2ins" ZOrder="5" X="1339" Y="1371" Height="204" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
-    <Shape ID="DesignTable:DatiMacchine" ZOrder="7" X="1299" Y="634" Height="342" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
-    <Shape ID="DesignTable:MicroStatoMacchina" ZOrder="9" X="231" Y="993" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
-    <Shape ID="DesignTable:LinkMenuJQM" ZOrder="3" X="15" Y="266" Height="250" Width="271" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
-    <Shape ID="DesignTable:RemoteRebootLog" ZOrder="17" X="603" Y="1298" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
-    <Shape ID="DesignTable:ParetoDurate" ZOrder="13" X="5" Y="14" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
-    <Shape ID="DesignTable:SignalLog" ZOrder="12" X="18" Y="523" Height="227" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
-    <Shape ID="DesignTable:AnagArticoli" ZOrder="15" X="627" Y="31" Height="204" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
-    <Shape ID="DesignTable:MSFD" ZOrder="4" X="974" Y="1361" Height="411" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
-    <Shape ID="DesignTable:FluxLog" ZOrder="2" X="197" Y="1584" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
+    <Shape ID="DesignTable:TransizioneIngressi" ZOrder="1" X="578" Y="1608" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
+    <Shape ID="DesignTable:AnagraficaOperatori" ZOrder="24" X="965" Y="641" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
+    <Shape ID="DesignTable:AnagraficaOperatori2ins" ZOrder="9" X="1339" Y="1371" Height="204" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
+    <Shape ID="DesignTable:DatiMacchine" ZOrder="11" X="1299" Y="634" Height="342" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
+    <Shape ID="DesignTable:MicroStatoMacchina" ZOrder="2" X="5" Y="1161" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
+    <Shape ID="DesignTable:LinkMenuJQM" ZOrder="7" X="15" Y="266" Height="250" Width="271" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
+    <Shape ID="DesignTable:RemoteRebootLog" ZOrder="19" X="603" Y="1298" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
+    <Shape ID="DesignTable:ParetoDurate" ZOrder="15" X="5" Y="14" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
+    <Shape ID="DesignTable:SignalLog" ZOrder="14" X="18" Y="523" Height="227" Width="237" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="168" />
+    <Shape ID="DesignTable:AnagArticoli" ZOrder="17" X="627" Y="31" Height="204" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
+    <Shape ID="DesignTable:MSFD" ZOrder="8" X="974" Y="1361" Height="411" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
+    <Shape ID="DesignTable:FluxLog" ZOrder="6" X="43" Y="1523" Height="227" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
   </Shapes>
   <Connectors>
     <Connector ID="DesignRelation:FK_Macchine2FamiglieMacchine_FamiglieMacchine" ZOrder="45" LineWidth="11">
@@ -77,22 +77,22 @@
         </Point>
         <Point>
           <X>636</X>
-          <Y>684</Y>
+          <Y>787</Y>
         </Point>
         <Point>
-          <X>537</X>
-          <Y>684</Y>
+          <X>304</X>
+          <Y>787</Y>
         </Point>
       </RoutePoints>
     </Connector>
     <Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaStati" ZOrder="42" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>386</X>
-          <Y>636</Y>
+          <X>444</X>
+          <Y>704</Y>
         </Point>
         <Point>
-          <X>386</X>
+          <X>444</X>
           <Y>933</Y>
         </Point>
         <Point>
@@ -104,12 +104,20 @@
     <Connector ID="DesignRelation:FK_StatoMacchine_AnagraficaStati" ZOrder="41" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>336</X>
-          <Y>636</Y>
+          <X>580</X>
+          <Y>658</Y>
         </Point>
         <Point>
-          <X>336</X>
-          <Y>667</Y>
+          <X>588</X>
+          <Y>658</Y>
+        </Point>
+        <Point>
+          <X>588</X>
+          <Y>795</Y>
+        </Point>
+        <Point>
+          <X>304</X>
+          <Y>795</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -125,7 +133,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaEventi" ZOrder="25" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaEventi" ZOrder="26" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1285</X>
@@ -164,11 +172,11 @@
     <Connector ID="DesignRelation:FK_DiarioDiBordo_AnagraficaStati" ZOrder="38" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>298</X>
-          <Y>455</Y>
+          <X>356</X>
+          <Y>454</Y>
         </Point>
         <Point>
-          <X>298</X>
+          <X>356</X>
           <Y>416</Y>
         </Point>
       </RoutePoints>
@@ -197,7 +205,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_Macchine2FamigliaIngressi_Macchine" ZOrder="20" LineWidth="11">
+    <Connector ID="DesignRelation:FK_Macchine2FamigliaIngressi_Macchine" ZOrder="22" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>716</X>
@@ -221,7 +229,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TransizioneIngressi_AnagraficaEventi" ZOrder="26" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TransizioneIngressi_AnagraficaEventi" ZOrder="27" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1285</X>
@@ -233,23 +241,27 @@
         </Point>
         <Point>
           <X>1238</X>
-          <Y>1271</Y>
+          <Y>1624</Y>
         </Point>
         <Point>
-          <X>492</X>
-          <Y>1271</Y>
+          <X>878</X>
+          <Y>1624</Y>
         </Point>
       </RoutePoints>
     </Connector>
     <Connector ID="DesignRelation:FK_TransizioneIngressi_FamigliaTipoIngressi" ZOrder="28" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>943</X>
-          <Y>1298</Y>
+          <X>960</X>
+          <Y>1347</Y>
         </Point>
         <Point>
-          <X>492</X>
-          <Y>1298</Y>
+          <X>960</X>
+          <Y>1632</Y>
+        </Point>
+        <Point>
+          <X>878</X>
+          <Y>1632</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -289,15 +301,15 @@
         </Point>
         <Point>
           <X>982</X>
-          <Y>899</Y>
+          <Y>1002</Y>
         </Point>
         <Point>
-          <X>537</X>
-          <Y>899</Y>
+          <X>304</X>
+          <Y>1002</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:AnagArticoli_DiarioDiBordo" ZOrder="14" LineWidth="11">
+    <Connector ID="DesignRelation:AnagArticoli_DiarioDiBordo" ZOrder="16" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>627</X>