diff --git a/MP-TAB/DettaglioMacchina.aspx.cs b/MP-TAB/DettaglioMacchina.aspx.cs
index 42c9d4e0..6014ea2b 100644
--- a/MP-TAB/DettaglioMacchina.aspx.cs
+++ b/MP-TAB/DettaglioMacchina.aspx.cs
@@ -12,6 +12,7 @@ namespace MoonProTablet
{
mod_confProd1.eh_newVal -= mod_confProd1_eh_newVal;
mod_confProd1.eh_reset -= mod_confProd1_eh_reset;
+ mod_confProd1.eh_doUpdate -= Mod_confProd1_eh_doUpdate; ;
base.Dispose();
}
diff --git a/MP-TAB/ODL.aspx b/MP-TAB/ODL.aspx
index bbbd76e7..aee21183 100644
--- a/MP-TAB/ODL.aspx
+++ b/MP-TAB/ODL.aspx
@@ -30,7 +30,7 @@
Fix ODL
-
+
@@ -38,4 +38,6 @@
-
\ No newline at end of file
+
+
+
diff --git a/MP-TAB/ODL.aspx.cs b/MP-TAB/ODL.aspx.cs
index e56b9b85..f7e86095 100644
--- a/MP-TAB/ODL.aspx.cs
+++ b/MP-TAB/ODL.aspx.cs
@@ -220,16 +220,32 @@ namespace MoonProTablet
{
if (!Page.IsPostBack)
{
+ dtTimerOdlInt.Interval = memLayer.ML.CRI("dtTimerOdlInt");
checkAll();
- if (isMulti)
- {
- mod_dettMacchina1.doUpdate();
- }
+ mod_dettMacchina1.doUpdate();
}
fixDisplaySlave();
mod_ODL1.eh_reqUpdate += Mod_ODL1_eh_reqUpdate;
}
+ public override void Dispose()
+ {
+ mod_ODL1.eh_reqUpdate -= Mod_ODL1_eh_reqUpdate;
+ base.Dispose();
+ }
+
+ ///
+ /// timeout scaduto
+ ///
+ ///
+ ///
+ protected void Timer1_Tick(object sender, EventArgs e)
+ {
+ // effettuo verifica attrezzabilità ODL
+ checkAll();
+ mod_dettMacchina1.doUpdate();
+ }
+
#endregion Protected Methods
}
}
\ No newline at end of file
diff --git a/MP-TAB/ODL.aspx.designer.cs b/MP-TAB/ODL.aspx.designer.cs
index 55c96416..be37d3e1 100644
--- a/MP-TAB/ODL.aspx.designer.cs
+++ b/MP-TAB/ODL.aspx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-//
-// Codice generato da uno strumento.
+//
+// This code was generated by a tool.
//
-// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
-// il codice viene rigenerato.
-//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
//------------------------------------------------------------------------------
namespace MoonProTablet
@@ -15,120 +15,129 @@ namespace MoonProTablet
{
///
- /// Controllo mod_dettMacchina1.
+ /// mod_dettMacchina1 control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::MoonProTablet.WebUserControls.mod_dettMacchina mod_dettMacchina1;
///
- /// Controllo divSelMacc.
+ /// divSelMacc control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSelMacc;
///
- /// Controllo ddlSubMacc.
+ /// ddlSubMacc control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.DropDownList ddlSubMacc;
///
- /// Controllo ods.
+ /// ods control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
///
- /// Controllo divWarn.
+ /// divWarn control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divWarn;
///
- /// Controllo lblWarningHead.
+ /// lblWarningHead control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Label lblWarningHead;
///
- /// Controllo lblWarningBody.
+ /// lblWarningBody control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Label lblWarningBody;
///
- /// Controllo lblNumPz2Conf.
+ /// lblNumPz2Conf control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Label lblNumPz2Conf;
///
- /// Controllo divPz2Conf.
+ /// divPz2Conf control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divPz2Conf;
///
- /// Controllo lbtFixOdl.
+ /// lbtFixOdl control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.LinkButton lbtFixOdl;
///
- /// Controllo cmp_SlaveMachine.
+ /// cmp_SlaveMachine control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::MoonProTablet.WebUserControls.cmp_SlaveMachine cmp_SlaveMachine;
///
- /// Controllo mod_ODL1.
+ /// mod_ODL1 control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::MoonProTablet.WebUserControls.mod_ODL mod_ODL1;
///
- /// Controllo mod_directLinks.
+ /// mod_directLinks control.
///
///
- /// Campo generato automaticamente.
- /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks;
+
+ ///
+ /// dtTimerOdlInt control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.Timer dtTimerOdlInt;
}
}