diff --git a/.vs/MP-MON/v14/.suo b/.vs/MP-MON/v14/.suo
index 43d8df7c..45113121 100644
Binary files a/.vs/MP-MON/v14/.suo and b/.vs/MP-MON/v14/.suo differ
diff --git a/.vs/MP-Site/v14/.suo b/.vs/MP-Site/v14/.suo
index 989444a1..a5e130d3 100644
Binary files a/.vs/MP-Site/v14/.suo and b/.vs/MP-Site/v14/.suo differ
diff --git a/.vs/MP-Tablet/v14/.suo b/.vs/MP-Tablet/v14/.suo
index abadcc0a..5e52074b 100644
Binary files a/.vs/MP-Tablet/v14/.suo and b/.vs/MP-Tablet/v14/.suo differ
diff --git a/MP-MON/Controllers/HomeController.cs b/MP-MON/Controllers/HomeController.cs
index 3cbd29a2..8eca2d39 100644
--- a/MP-MON/Controllers/HomeController.cs
+++ b/MP-MON/Controllers/HomeController.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Web;
+using System.Web.Configuration;
using System.Web.Mvc;
namespace MP_MON.Controllers
@@ -17,7 +18,7 @@ namespace MP_MON.Controllers
ViewBag.cssSemBase = "sem";
try
{
- pageRefreshSec = System.Web.Configuration.WebConfigurationManager.AppSettings["pageRefreshSec"];
+ pageRefreshSec = WebConfigurationManager.AppSettings["pageRefreshSec"];
}
catch
{ }
@@ -36,7 +37,7 @@ namespace MP_MON.Controllers
ViewBag.cssSemBase = "semBlink";
try
{
- pageRefreshSec = System.Web.Configuration.WebConfigurationManager.AppSettings["pageRefreshSec"];
+ pageRefreshSec = WebConfigurationManager.AppSettings["pageRefreshSec"];
}
catch
{ }
@@ -51,9 +52,22 @@ namespace MP_MON.Controllers
return PartialView("_mmClock");
}
- //public ActionResult Chat()
- //{
- // return View();
- //}
+ public ActionResult checkIOB()
+ {
+ string esito = "ND";
+ // verifico TUTTE le macchine x il keepAlive e se almeno 1 è offline da oltre "keepAliveMin" minuti --> invio email!!!
+ int keepAliveMin = 1;
+ try
+ {
+ keepAliveMin = Convert.ToInt32(WebConfigurationManager.AppSettings["pageRefreshSec"]);
+ }
+ catch
+ { }
+
+ esito = "OK";
+ ViewBag.EsitoVerifica = esito;
+ return PartialView("_checkIOB");
+ //return View();
+ }
}
}
\ No newline at end of file
diff --git a/MP-MON/MP-MON.csproj b/MP-MON/MP-MON.csproj
index ae4436cd..0ae210ce 100644
--- a/MP-MON/MP-MON.csproj
+++ b/MP-MON/MP-MON.csproj
@@ -173,6 +173,9 @@
MapoModel.tt
+
+ MapoModel.tt
+
@@ -329,6 +332,8 @@
+
+
Web.config
Designer
diff --git a/MP-MON/Models/MapoModel.Context.cs b/MP-MON/Models/MapoModel.Context.cs
index 56c4468e..5de3805d 100644
--- a/MP-MON/Models/MapoModel.Context.cs
+++ b/MP-MON/Models/MapoModel.Context.cs
@@ -55,5 +55,23 @@ namespace MP_MON.Models
return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_MSE_getData", mergeOption, maxAgeSecParameter);
}
+
+ public virtual ObjectResult stp_MSE_getOffline(Nullable keepAliveMin)
+ {
+ var keepAliveMinParameter = keepAliveMin.HasValue ?
+ new ObjectParameter("keepAliveMin", keepAliveMin) :
+ new ObjectParameter("keepAliveMin", typeof(int));
+
+ return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_MSE_getOffline", keepAliveMinParameter);
+ }
+
+ public virtual ObjectResult stp_MSE_getOffline(Nullable keepAliveMin, MergeOption mergeOption)
+ {
+ var keepAliveMinParameter = keepAliveMin.HasValue ?
+ new ObjectParameter("keepAliveMin", keepAliveMin) :
+ new ObjectParameter("keepAliveMin", typeof(int));
+
+ return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("stp_MSE_getOffline", mergeOption, keepAliveMinParameter);
+ }
}
}
diff --git a/MP-MON/Models/MapoModel.Designer.cs b/MP-MON/Models/MapoModel.Designer.cs
index 183808d6..6fe68f3a 100644
--- a/MP-MON/Models/MapoModel.Designer.cs
+++ b/MP-MON/Models/MapoModel.Designer.cs
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2015\Projects\MoonPro\MoonPro\MP-MON\Models\MapoModel.edmx'.
+// T4 code generation is enabled for model 'C:\Users\samuele.STEAMWAREWIN\Documents\VisualStudioProjects\MAPO\MoonPro_dotnet\MP-MON\Models\MapoModel.edmx'.
// To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
// property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
// is open in the designer.
diff --git a/MP-MON/Models/MapoModel.edmx b/MP-MON/Models/MapoModel.edmx
index 61367bb4..e3de5a1e 100644
--- a/MP-MON/Models/MapoModel.edmx
+++ b/MP-MON/Models/MapoModel.edmx
@@ -39,6 +39,9 @@
+
+
+
@@ -86,7 +89,10 @@
-
+
+
+
+
@@ -117,6 +123,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -158,6 +196,8 @@
+
+
diff --git a/MP-MON/Web.config b/MP-MON/Web.config
index 7c09e3da..d4e0d299 100644
--- a/MP-MON/Web.config
+++ b/MP-MON/Web.config
@@ -16,8 +16,13 @@
-
+
+
+
+
+
+