+
-
-
\ No newline at end of file
+
diff --git a/MP-Site/WebUserControls/mod_periodoAnalisi.ascx b/MP-Site/WebUserControls/mod_periodoAnalisi.ascx
index 38b2587c..9df0e25a 100644
--- a/MP-Site/WebUserControls/mod_periodoAnalisi.ascx
+++ b/MP-Site/WebUserControls/mod_periodoAnalisi.ascx
@@ -2,88 +2,77 @@
CodeBehind="mod_periodoAnalisi.ascx.cs" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
-
-
-
-
- 00
- 01
- 02
- 03
- 04
- 05
- 06
- 07
- 08
- 09
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 18
- 19
- 20
- 21
- 22
- 23
-
-
-
-
-
-
- 00
- 01
- 02
- 03
- 04
- 05
- 06
- 07
- 08
- 09
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 18
- 19
- 20
- 21
- 22
- 23
-
-
-
-
-
- selezione
- oggi
- ieri
- questa settimana
- ultimi 7gg
- questo mese
- ultimi 30gg
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
--%>
+
+
+ 00
+ 01
+ 02
+ 03
+ 04
+ 05
+ 06
+ 07
+ 08
+ 09
+ 10
+ 11
+ 12
+ 13
+ 14
+ 15
+ 16
+ 17
+ 18
+ 19
+ 20
+ 21
+ 22
+ 23
+
+
+
+
+
diff --git a/MP-Site/WebUserControls/mod_periodoAnalisi.ascx.cs b/MP-Site/WebUserControls/mod_periodoAnalisi.ascx.cs
index 7572bd58..5e1adda5 100644
--- a/MP-Site/WebUserControls/mod_periodoAnalisi.ascx.cs
+++ b/MP-Site/WebUserControls/mod_periodoAnalisi.ascx.cs
@@ -298,10 +298,18 @@ namespace MP_SITE.WebUserControls
{
_intervallo = intervalloAnalisi;
}
- txtInizio.Text = _intervallo.inizio.ToShortDateString();
- ddlOraInizio.SelectedValue = _intervallo.inizio.Hour.ToString("00");
- txtFine.Text = _intervallo.fine.ToShortDateString();
- ddlOraFine.SelectedValue = _intervallo.fine.Hour.ToString("00");
+ if (false)
+ {
+ txtInizio.Text = _intervallo.inizio.ToShortDateString();
+ ddlOraInizio.SelectedValue = _intervallo.inizio.Hour.ToString("00");
+ txtFine.Text = _intervallo.fine.ToShortDateString();
+ ddlOraFine.SelectedValue = _intervallo.fine.Hour.ToString("00");
+ }
+ else
+ {
+ txtInizio.Text = _intervallo.inizio.ToString("yyyy-MM-dd HH:mm");
+ txtFine.Text = _intervallo.fine.ToString("yyyy-MM-dd HH:mm");
+ }
// se è 1 sett seleziono quello, altrimenti primo...
if (_intervallo.fine.Subtract(_intervallo.inizio).Days == 7)
{
diff --git a/MP-Site/WebUserControls/mod_periodoAnalisi.ascx.designer.cs b/MP-Site/WebUserControls/mod_periodoAnalisi.ascx.designer.cs
index 2b2b3d90..69d71744 100644
--- a/MP-Site/WebUserControls/mod_periodoAnalisi.ascx.designer.cs
+++ b/MP-Site/WebUserControls/mod_periodoAnalisi.ascx.designer.cs
@@ -14,6 +14,15 @@ namespace MP_SITE.WebUserControls
public partial class mod_periodoAnalisi
{
+ ///
+ /// ddlPeriodo control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.DropDownList ddlPeriodo;
+
///
/// txtInizio control.
///
@@ -32,15 +41,6 @@ namespace MP_SITE.WebUserControls
///
protected global::System.Web.UI.WebControls.DropDownList ddlOraInizio;
- ///
- /// CalendarExtender1 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::AjaxControlToolkit.CalendarExtender CalendarExtender1;
-
///
/// txtFine control.
///
@@ -59,24 +59,6 @@ namespace MP_SITE.WebUserControls
///
protected global::System.Web.UI.WebControls.DropDownList ddlOraFine;
- ///
- /// CalendarExtender2 control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::AjaxControlToolkit.CalendarExtender CalendarExtender2;
-
- ///
- /// ddlPeriodo control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.DropDownList ddlPeriodo;
-
///
/// btnUpdate control.
///