diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config
index 5b76d67..7ab296e 100644
--- a/PROJ-ETS/PROJ-ETS/Web.config
+++ b/PROJ-ETS/PROJ-ETS/Web.config
@@ -26,7 +26,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx
index 015a5d0..57ff45f 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx
@@ -13,21 +13,18 @@
+
+
+
-
- W-1
-
-
- W
-
-
- W+1
-
-
- W+2
-
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
index 6fee0d4..7f80e33 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.cs
@@ -68,9 +68,20 @@ namespace PROJ_ETS.WebUserControls
///
protected DateTime adesso
{
+ set
+ {
+ utils.obj.setSessionVal("timeBazaar", value);
+ }
get
{
- return DateTime.Now;
+ DateTime answ = DateTime.Now;
+ try
+ {
+ answ = (DateTime)utils.obj.objSessionObj("timeBazaar");
+ }
+ catch
+ { }
+ return answ;
}
}
///
@@ -82,10 +93,11 @@ namespace PROJ_ETS.WebUserControls
{
if (!Page.IsPostBack)
{
- ddlAnno.SelectedValue = adesso.Year.ToString();
- ddlWeek.SelectedValue = (datario.WeekOfYearISO8601(adesso) + 1).ToString();
+ setDdlPeriodo();
showPnlAddNewComm(false);
lblOut.Text = "";
+ //importo sett corrente
+ lnkW.Text = string.Format("W{0:0#}", datario.WeekOfYearISO8601(DateTime.Now));
}
// carico tabelle: elenco dipendenti (raggruppato x tipo) ed elenco dip in bazaar...
tabDip = DataProxy_ProjEts.DP.taDip.GetData();
@@ -94,6 +106,14 @@ namespace PROJ_ETS.WebUserControls
doUpdate();
}
///
+ /// imposta DDL del periodo
+ ///
+ private void setDdlPeriodo()
+ {
+ ddlAnno.SelectedValue = adesso.Year.ToString();
+ ddlWeek.SelectedValue = (datario.WeekOfYearISO8601(adesso)).ToString();
+ }
+ ///
/// esegue update controllo
///
public void doUpdate()
@@ -132,7 +152,7 @@ namespace PROJ_ETS.WebUserControls
{
get
{
- int answ = datario.WeekOfYearISO8601(adesso) + 1;
+ int answ = datario.WeekOfYearISO8601(adesso);
try
{
answ = Convert.ToInt32(ddlWeek.SelectedValue);
@@ -154,7 +174,8 @@ namespace PROJ_ETS.WebUserControls
// se non globalmente permesso controllo se sia anno/sett successiva a quelal corrente
if (!answ)
{
- if ((anno > adesso.Year) || ((anno == adesso.Year) && (settimana > datario.WeekOfYearISO8601(adesso))))
+ DateTime ora = DateTime.Now;
+ if ((anno > ora.Year) || ((anno == ora.Year) && (settimana > datario.WeekOfYearISO8601(ora))))
{
answ = true;
}
@@ -189,7 +210,10 @@ namespace PROJ_ETS.WebUserControls
numDip = totCelle / numComm;
}
catch
- { }
+ {
+ numDip = 0;
+ numComm = 0;
+ }
if (numDip > 0 && numComm > 0)
{
// inizializzo i miei array...
@@ -537,7 +561,7 @@ namespace PROJ_ETS.WebUserControls
doUpdate();
}
}
-
+
protected void btnSalva_Click(object sender, EventArgs e)
{
// procedo SOLO se cud enabled
@@ -585,5 +609,34 @@ namespace PROJ_ETS.WebUserControls
{
doUpdate();
}
+ ///
+ /// effettua selezione periodo rapida: 0 = corrente (ovvero la PROSSIMA), +1 = successiva (a seleizonata), -1 = precedente (a selezionata)
+ ///
+ ///
+ ///
+ protected void lnkW_Click(object sender, EventArgs e)
+ {
+ // sposto!
+ LinkButton lnk = (LinkButton)sender;
+ if (lnk.CommandArgument == "Curr")
+ {
+ adesso = DateTime.Now;
+ }
+ else if (lnk.CommandArgument == "Prev")
+ {
+ adesso = adesso.AddDays(-7);
+ }
+ else if (lnk.CommandArgument == "Next")
+ {
+ adesso = adesso.AddDays(7);
+ }
+ setDdlPeriodo();
+ // rendo invisibile (se c'era) pannello add commesse (se non permesso edit)
+ if (!cudEnabled)
+ {
+ pnlAddNew.Visible = cudEnabled;
+ }
+ doUpdate();
+ }
}
}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.designer.cs
index 20bdf12..8be85e3 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.designer.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_weekPlan.ascx.designer.cs
@@ -48,6 +48,33 @@ namespace PROJ_ETS.WebUserControls {
///
protected global::System.Web.UI.WebControls.ObjectDataSource odsWeek;
+ ///
+ /// lnkWPrev control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lnkWPrev;
+
+ ///
+ /// lnkW control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lnkW;
+
+ ///
+ /// lnkWNext control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lnkWNext;
+
///
/// btnAddNew control.
///
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
index 28fcb25..bef0210 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 cf3c2bb..57b6789 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ