diff --git a/Projects/WebGIM/GIM_data/bin/GIM_data.dll b/Projects/WebGIM/GIM_data/bin/GIM_data.dll
index ddc58ae..6836bd2 100644
Binary files a/Projects/WebGIM/GIM_data/bin/GIM_data.dll and b/Projects/WebGIM/GIM_data/bin/GIM_data.dll differ
diff --git a/Projects/WebGIM/GIM_data/bin/SteamWare.dll b/Projects/WebGIM/GIM_data/bin/SteamWare.dll
index ce51953..e1e6f17 100644
Binary files a/Projects/WebGIM/GIM_data/bin/SteamWare.dll and b/Projects/WebGIM/GIM_data/bin/SteamWare.dll differ
diff --git a/Projects/WebGIM/GIM_site/Web.config b/Projects/WebGIM/GIM_site/Web.config
index f64770a..535335e 100644
--- a/Projects/WebGIM/GIM_site/Web.config
+++ b/Projects/WebGIM/GIM_site/Web.config
@@ -104,7 +104,7 @@
-
+
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx
index 0d40099..d1ff035 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx
@@ -97,21 +97,28 @@
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx.cs
index 1a85aab..d585405 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx.cs
@@ -17,6 +17,11 @@ public partial class mod_calChiusura : ApplicationUserControl
grView.PageSize = _righeDataGridMed;
btnShowInsPeriodo.Text = traduci("btnShowInsPeriodo");
btnInsPeriodo.Text = traduci("btnInsPeriodo");
+ lblDataFrom.Text = traduci("lblDataFrom");
+ lblDataTo.Text = traduci("lblDataTo");
+ lblDescrizione.Text = traduci("lblDescrizione");
+ CalendarExtender2.Format = memLayer.ML.CRS("ddMMyyyy");
+ CalendarExtender3.Format = memLayer.ML.CRS("ddMMyyyy");
}
}
@@ -89,8 +94,8 @@ public partial class mod_calChiusura : ApplicationUserControl
protected void btnInsPeriodo_Click(object sender, EventArgs e)
{
// verifico date congrue...
- DateTime inizio = Convert.ToDateTime(txtDataFrom.Text);
- DateTime fine = Convert.ToDateTime(txtDataTo.Text);
+ DateTime inizio = WebGimUtils.convDate(txtDataFrom.Text, memLayer.ML.CRS("ddMMyyyy"), memLayer.ML.CRS("culture")); //Convert.ToDateTime(txtDataFrom.Text);
+ DateTime fine = WebGimUtils.convDate(txtDataTo.Text, memLayer.ML.CRS("ddMMyyyy"), memLayer.ML.CRS("culture")); //Convert.ToDateTime(txtDataTo.Text);
if (fine.CompareTo(inizio) >= 0)
{
// inserisco le voci x tutte le date nell'intervallo...
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx.designer.cs
index dc1ea89..d9535cd 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx.designer.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_calChiusura.ascx.designer.cs
@@ -56,6 +56,15 @@ public partial class mod_calChiusura {
///
protected global::System.Web.UI.WebControls.Panel pnlInsPeriodo;
+ ///
+ /// lblDataFrom control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblDataFrom;
+
///
/// txtDataFrom control.
///
@@ -74,6 +83,15 @@ public partial class mod_calChiusura {
///
protected global::AjaxControlToolkit.CalendarExtender CalendarExtender2;
+ ///
+ /// lblDataTo control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblDataTo;
+
///
/// txtDataTo control.
///
@@ -92,6 +110,15 @@ public partial class mod_calChiusura {
///
protected global::AjaxControlToolkit.CalendarExtender CalendarExtender3;
+ ///
+ /// lblDescrizione control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblDescrizione;
+
///
/// txtDescrizione control.
///
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll
index ddc58ae..6836bd2 100644
Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll
index efe92d6..bbb5f7e 100644
Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ
diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll
index ce51953..e1e6f17 100644
Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ