|
-
- <%--
+
00
01
@@ -31,13 +31,11 @@
21
22
23
- --%>
- <%--
- --%>
+
+
→
-
- <%--
+
00
01
@@ -63,11 +61,9 @@
21
22
23
- --%>
- <%--
- --%>
- <%--
+
+
selezione
oggi
@@ -79,9 +75,9 @@
ultimi 30gg
questo anno
1 anno
- --%>
+
- <%----%>
+
|
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx.cs
index f5b7b12..94ce9a8 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx.cs
@@ -4,12 +4,13 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using ETS_Data;
namespace PROJ_ETS.WebUserControls
{
public partial class mod_periodoAnalisi : System.Web.UI.UserControl
{
-#if false
+
#region area protected
protected intervalloDate _intervallo;
@@ -32,20 +33,20 @@ namespace PROJ_ETS.WebUserControls
get
{
bool answ = false;
- if (memLayer.ML.isInSessionObject("mostraSelOra"))
+ if (utils.obj.isInSessionObject("mostraSelOra"))
{
- answ = memLayer.ML.BoolSessionObj("mostraSelOra");
+ answ = utils.obj.BoolSessionObj("mostraSelOra");
}
else
{
// leggo da sessione e salvo...
try
{
- answ = memLayer.ML.confReadBool("mostraSelOra");
+ answ = utils.obj.confReadBool("mostraSelOra");
}
catch
{ }
- memLayer.ML.setSessionVal("mostraSelOra", answ);
+ utils.obj.setSessionVal("mostraSelOra", answ);
}
return answ;
}
@@ -56,11 +57,11 @@ namespace PROJ_ETS.WebUserControls
///
///
///
- protected void DropDownList1_SelectedIndexChanged(object sender, EventArgs e)
+ protected void ddlPeriodo_SelectedIndexChanged(object sender, EventArgs e)
{
// verifico cosa sia cambiato ed imposto date...
datario _datario = new datario();
- switch (DropDownList1.SelectedValue)
+ switch (ddlPeriodo.SelectedValue)
{
case "oggi":
_intervallo = _datario.giornata(DateTime.Now);
@@ -150,7 +151,7 @@ namespace PROJ_ETS.WebUserControls
catch
{
_intervallo = new intervalloDate();
- _intervallo.inizio = DateTime.Now.AddDays(memLayer.ML.confReadInt("defDayFrom"));
+ _intervallo.inizio = DateTime.Now.AddDays(utils.obj.confReadInt("defDayFrom"));
_intervallo.fine = DateTime.Now.AddDays(1);
Session["_intervallo"] = _intervallo;
Session["_inizio"] = _intervallo.inizio;
@@ -223,6 +224,30 @@ namespace PROJ_ETS.WebUserControls
aggiornaDateMostrate(false);
}
///
+ /// evento cambio testo data inizio
+ ///
+ ///
+ ///
+ protected void txtInizio_TextChanged(object sender, EventArgs e)
+ {
+ // imposto il selettore a discesa...
+ setPeriodoFree();
+ // mostro btn update
+ btnUpdate.Visible = true;
+ }
+ ///
+ /// evento cambio testo data fine
+ ///
+ ///
+ ///
+ protected void txtFine_TextChanged(object sender, EventArgs e)
+ {
+ // imposto il selettore a discesa...
+ setPeriodoFree();
+ // mostro btn update
+ btnUpdate.Visible = true;
+ }
+ ///
/// in questo caso faccio udpate periodo mostrato
///
///
@@ -278,7 +303,7 @@ namespace PROJ_ETS.WebUserControls
///
public void setPeriodoFree()
{
- DropDownList1.SelectedIndex = 0;
+ ddlPeriodo.SelectedIndex = 0;
}
///
/// imposta realtime update (non mostra button am fa subito update)
@@ -287,11 +312,11 @@ namespace PROJ_ETS.WebUserControls
{
get
{
- return memLayer.ML.BoolSessionObj("rltUpdatePeriodo");
+ return utils.obj.BoolSessionObj("rltUpdatePeriodo");
}
set
{
- memLayer.ML.setSessionVal("rltUpdatePeriodo", value);
+ utils.obj.setSessionVal("rltUpdatePeriodo", value);
}
}
@@ -302,35 +327,6 @@ namespace PROJ_ETS.WebUserControls
#endregion
- #endregion
-#endif
- ///
- /// evento cambio testo data inizio
- ///
- ///
- ///
- protected void txtInizio_TextChanged(object sender, EventArgs e)
- {
-#if false
- // imposto il selettore a discesa...
- setPeriodoFree();
- // mostro btn update
- btnUpdate.Visible = true;
-#endif
- }
- ///
- /// evento cambio testo data fine
- ///
- ///
- ///
- protected void txtFine_TextChanged(object sender, EventArgs e)
- {
-#if false
- // imposto il selettore a discesa...
- setPeriodoFree();
- // mostro btn update
- btnUpdate.Visible = true;
-#endif
- }
+ #endregion
}
}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx.designer.cs
index f255e45..5b7604b 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx.designer.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_periodoAnalisi.ascx.designer.cs
@@ -30,6 +30,15 @@ namespace PROJ_ETS.WebUserControls {
///
protected global::System.Web.UI.WebControls.TextBox txtInizio;
+ ///
+ /// ddlOraInizio control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.DropDownList ddlOraInizio;
+
///
/// txtFine control.
///
@@ -39,6 +48,33 @@ namespace PROJ_ETS.WebUserControls {
///
protected global::System.Web.UI.WebControls.TextBox txtFine;
+ ///
+ /// ddlOraFine control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.DropDownList ddlOraFine;
+
+ ///
+ /// 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.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnUpdate;
+
///
/// lblDurataMin control.
///
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx
index 44942f3..c8e6e56 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx
@@ -1,20 +1,21 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_progetti.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_progetti" %>
+<%@ Register src="mod_periodoAnalisi.ascx" tagname="mod_periodoAnalisi" tagprefix="uc1" %>
-
+
-
+ <%----%>
<%--
--%>
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs
index a9264de..73c38ef 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs
@@ -13,21 +13,12 @@ namespace PROJ_ETS.WebUserControls {
public partial class mod_progetti {
///
- /// chkShowChiusi control.
+ /// mod_periodoAnalisi1 control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.CheckBox chkShowChiusi;
-
- ///
- /// chkShowVuoti control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.CheckBox chkShowVuoti;
+ protected global::PROJ_ETS.WebUserControls.mod_periodoAnalisi mod_periodoAnalisi1;
}
}
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
index 86f50df..39f210c 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
index 303019f..33ac9f5 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache
index dd2a5cb..d5dfe3d 100644
Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache differ
diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll
index 303019f..33ac9f5 100644
Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll differ
|