diff --git a/MP-IO/MP-IO.csproj b/MP-IO/MP-IO.csproj index 53408553..18ceef63 100644 --- a/MP-IO/MP-IO.csproj +++ b/MP-IO/MP-IO.csproj @@ -122,7 +122,6 @@ - Designer @@ -186,13 +185,6 @@ sigLogEnabled.aspx - - Site.Mobile.Master - ASPXCodeBehind - - - Site.Mobile.Master - status.aspx ASPXCodeBehind @@ -200,13 +192,6 @@ status.aspx - - ViewSwitcher.ascx - ASPXCodeBehind - - - ViewSwitcher.ascx - @@ -215,13 +200,18 @@ - Always Always + + Designer + + + Designer + Web.config diff --git a/MP-IO/Web-Sql2012.config b/MP-IO/Web-Sql2012.config new file mode 100644 index 00000000..c5413a8a --- /dev/null +++ b/MP-IO/Web-Sql2012.config @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MP-IO/Web-Sql2016.config b/MP-IO/Web-Sql2016.config new file mode 100644 index 00000000..873b25d7 --- /dev/null +++ b/MP-IO/Web-Sql2016.config @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MP-IO/Web.Donati.config b/MP-IO/Web.Donati.config index 7b0e9438..bc9e585d 100644 --- a/MP-IO/Web.Donati.config +++ b/MP-IO/Web.Donati.config @@ -3,7 +3,7 @@ - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/MP-IO/Web.config b/MP-IO/Web.config index 14f1398b..873b25d7 100644 --- a/MP-IO/Web.config +++ b/MP-IO/Web.config @@ -10,7 +10,8 @@ - + + @@ -18,17 +19,17 @@ - - - - - + + + + + - - + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MP-Tablet/Web-SQL2016.config b/MP-Tablet/Web-SQL2016.config new file mode 100644 index 00000000..4c357dd7 --- /dev/null +++ b/MP-Tablet/Web-SQL2016.config @@ -0,0 +1,197 @@ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config index 69b6178d..ce0638f7 100644 --- a/MP-Tablet/Web.config +++ b/MP-Tablet/Web.config @@ -45,25 +45,25 @@ + + --> @@ -120,12 +120,6 @@ - - @@ -135,10 +129,6 @@ - - - diff --git a/MapoDb/MapoDb.cs b/MapoDb/MapoDb.cs index 04323414..cd9c076a 100644 --- a/MapoDb/MapoDb.cs +++ b/MapoDb/MapoDb.cs @@ -1147,7 +1147,7 @@ namespace MapoDb } catch { } - if (adesso.AddSeconds(-memLayer.ML.CRI("kaMinUpdSec")) > lastKA) + if (adesso > lastKA.AddSeconds(memLayer.ML.CRI("kaMinUpdSec"))) { doWrite = true; } @@ -1178,6 +1178,10 @@ namespace MapoDb } } } + if (memLayer.ML.CRI("_logLevel") > 6) + { + logger.lg.scriviLog(string.Format("Scrittura keep alive! IdxMacchina:{0} | oraMacchina:{1}", IdxMacchina, oraMacchina)); + } taKeepAlive.UpdateQueryNoStartTime(DateTime.Now, oraMacchina, IdxMacchina); } catch (Exception exc)