diff --git a/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.cs b/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.cs
index 6e8726ec..a2acebc1 100644
--- a/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.cs
@@ -17,6 +17,10 @@ public partial class mod_periodoAnalisi : System.Web.UI.UserControl
protected intervalloDate _intervallo;
+ ///
+ /// avvio componente
+ ///
+ ///
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
@@ -130,7 +134,9 @@ public partial class mod_periodoAnalisi : System.Web.UI.UserControl
ddlOraFine.Visible = false;
}
}
-
+ ///
+ /// imposta intervallo da sessione o di default
+ ///
private void setIntervallo()
{
intervalloDate _intervallo;
@@ -141,7 +147,7 @@ public partial class mod_periodoAnalisi : System.Web.UI.UserControl
catch
{
_intervallo = new intervalloDate();
- _intervallo.inizio = DateTime.Now.AddDays(-7);
+ _intervallo.inizio = DateTime.Now.AddDays(memLayer.ML.confReadInt("defDayFrom"));
_intervallo.fine = DateTime.Now.AddDays(1);
Session["_intervallo"] = _intervallo;
Session["_inizio"] = _intervallo.inizio;
@@ -149,6 +155,9 @@ public partial class mod_periodoAnalisi : System.Web.UI.UserControl
}
scriviDate();
}
+ ///
+ /// imposta durata minima
+ ///
private void setDurataMin()
{
int _durataMin;
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 83a30965..08427605 100644
Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ
diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll
index 83a30965..08427605 100644
Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ
diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config
index 95f256be..7d266a8b 100644
--- a/GMW/GMW_Term/Web.config
+++ b/GMW/GMW_Term/Web.config
@@ -121,9 +121,9 @@
-
-
-
+
+
+
@@ -141,15 +141,6 @@
-
-
-
-
-
-
-
diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj
index 2ea1f280..2e4fc6ed 100644
--- a/GMW/GMW_installer/GMW_installer.vdproj
+++ b/GMW/GMW_installer/GMW_installer.vdproj
@@ -307,7 +307,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
"ProductCode" = "8:{FC1F8B43-87CB-46E0-A0F8-E8340418AE0F}"
- "PackageCode" = "8:{23E05040-E8BA-47DF-A8D4-0567E2009850}"
+ "PackageCode" = "8:{7DFC91CF-4749-4F29-8960-90CA489F56BF}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi
index 1aeea4a2..90e02397 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ
diff --git a/GMW/GMW_test_installer/GMW_test_installer.vdproj b/GMW/GMW_test_installer/GMW_test_installer.vdproj
index 0ff84d18..fbbb84e4 100644
--- a/GMW/GMW_test_installer/GMW_test_installer.vdproj
+++ b/GMW/GMW_test_installer/GMW_test_installer.vdproj
@@ -302,7 +302,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_test"
"ProductCode" = "8:{493EFCC3-43AF-413F-B141-F0A333EE6AD0}"
- "PackageCode" = "8:{FF6D51E2-917D-467C-87D6-B9805CEF7840}"
+ "PackageCode" = "8:{F6BF5B16-FD3F-498A-A5AD-A3100A3F03E7}"
"UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
diff --git a/GMW/GMW_test_installer/Release/GMW_test_installer.msi b/GMW/GMW_test_installer/Release/GMW_test_installer.msi
index d21943ce..fc15d62d 100644
Binary files a/GMW/GMW_test_installer/Release/GMW_test_installer.msi and b/GMW/GMW_test_installer/Release/GMW_test_installer.msi differ