diff --git a/.vs/MP-Site/v14/.suo b/.vs/MP-Site/v14/.suo index 19e77c2d..77a4c637 100644 Binary files a/.vs/MP-Site/v14/.suo and b/.vs/MP-Site/v14/.suo differ diff --git a/.vs/MP/v14/.suo b/.vs/MP/v14/.suo index 47632d15..32c3e602 100644 Binary files a/.vs/MP/v14/.suo and b/.vs/MP/v14/.suo differ diff --git a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs index bf18c282..60c8d475 100644 --- a/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs +++ b/MP-Site/WebUserControls/mod_statoMacchina.ascx.cs @@ -213,7 +213,7 @@ namespace MoonPro.WebUserControls { int minuti = SteamWare.memLayer.ML.confReadInt("keepAliveMin"); // controllo se il keep alive è oltre il termine... - DateTime lastKA = DateTime.Now.AddMinutes(- minuti); + DateTime lastKA = DateTime.Now.AddMinutes(-minuti); try { lastKA = tabKeepAlive.FindByIdxMacchina(IdxMacchina).DataOraServer; @@ -257,12 +257,17 @@ namespace MoonPro.WebUserControls /// private void retrieveData() { - // popolazione tabelle - tabMacchine = MapoDb.DataLayer.obj.taMacchine.GetData(); - tabStatoMacchine = MapoDb.DataLayer.obj.taStatoMacchine.GetData(); - tabAnagStati = MapoDb.DataLayer.obj.taAnagStati.GetData(); - //tabKanban = taKanban.GetData(); - tabKeepAlive = MapoDb.DataLayer.obj.taKeepAlive.GetData(); + try + { + // popolazione tabelle + tabMacchine = MapoDb.DataLayer.obj.taMacchine.GetData(); + tabStatoMacchine = MapoDb.DataLayer.obj.taStatoMacchine.GetData(); + tabAnagStati = MapoDb.DataLayer.obj.taAnagStati.GetData(); + //tabKanban = taKanban.GetData(); + tabKeepAlive = MapoDb.DataLayer.obj.taKeepAlive.GetData(); + } + catch + { } } #endregion