diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo
index b0743d3..731eba4 100644
Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ
diff --git a/WebSCR/Menu.aspx b/WebSCR/Menu.aspx
index 870e6e3..919225e 100644
--- a/WebSCR/Menu.aspx
+++ b/WebSCR/Menu.aspx
@@ -14,6 +14,7 @@
+
diff --git a/WebSCR/Menu.aspx.cs b/WebSCR/Menu.aspx.cs
index 5c13bc3..7339e97 100644
--- a/WebSCR/Menu.aspx.cs
+++ b/WebSCR/Menu.aspx.cs
@@ -45,5 +45,9 @@ namespace WebSCR
{
mod_AssSquadra.Visible = true;
}
+ protected void lbInterventiSq_Click(object sender, EventArgs e)
+ {
+ Response.Redirect("Squadra");
+ }
}
}
\ No newline at end of file
diff --git a/WebSCR/Menu.aspx.designer.cs b/WebSCR/Menu.aspx.designer.cs
index cb82243..6a77bd8 100644
--- a/WebSCR/Menu.aspx.designer.cs
+++ b/WebSCR/Menu.aspx.designer.cs
@@ -56,5 +56,14 @@ namespace WebSCR {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.LinkButton lbComponiSquadra;
+
+ ///
+ /// lbInterventiSq control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbInterventiSq;
}
}
diff --git a/WebSCR/Web.config b/WebSCR/Web.config
index 5610bf2..b23b0a9 100644
--- a/WebSCR/Web.config
+++ b/WebSCR/Web.config
@@ -81,11 +81,12 @@
it enables developers to configure html error pages
to be displayed in place of a error stack trace.
-
-
-
-
+
-->
+
+
+
diff --git a/WebSCR/WebUserControls/mod_AssSquadra.ascx b/WebSCR/WebUserControls/mod_AssSquadra.ascx
index fb14587..df390c5 100644
--- a/WebSCR/WebUserControls/mod_AssSquadra.ascx
+++ b/WebSCR/WebUserControls/mod_AssSquadra.ascx
@@ -60,7 +60,6 @@
- <%----%>
diff --git a/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs b/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs
index 8bc7fc4..4dda6ae 100644
--- a/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs
+++ b/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs
@@ -40,7 +40,12 @@ namespace WebSCR.WebUserControls
private void Mod_selData_eh_update(object sender, EventArgs e)
{
reloadSessionByCookie();
- grView.DataBind();
+ try
+ {
+ grView.DataBind();
+ }
+ catch
+ { }
}
///
/// inserimento associazione user/squadra
diff --git a/WebSCR/WebUserControls/mod_Interventi.ascx b/WebSCR/WebUserControls/mod_Interventi.ascx
index 49374ba..f942bb6 100644
--- a/WebSCR/WebUserControls/mod_Interventi.ascx
+++ b/WebSCR/WebUserControls/mod_Interventi.ascx
@@ -196,7 +196,6 @@
- <%----%>
diff --git a/WebSCR/WebUserControls/mod_Interventi.ascx.cs b/WebSCR/WebUserControls/mod_Interventi.ascx.cs
index da73042..ce16b6c 100644
--- a/WebSCR/WebUserControls/mod_Interventi.ascx.cs
+++ b/WebSCR/WebUserControls/mod_Interventi.ascx.cs
@@ -76,11 +76,20 @@ namespace WebSCR.WebUserControls
get
{
DateTime answ = DateTime.Now;
- if (memLayer.ML.isInSessionObject("DataStart"))
+ if (memLayer.ML.isInSessionObject("DataRif"))
{
try
{
- answ = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataStart"));
+ answ = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataRif"));
+ }
+ catch
+ { }
+ }
+ else if (memLayer.ML.getCookieVal("DataRif") != "")
+ {
+ try
+ {
+ answ = Convert.ToDateTime(memLayer.ML.getCookieVal("DataRif"));
}
catch
{ }
@@ -89,7 +98,7 @@ namespace WebSCR.WebUserControls
}
set
{
- memLayer.ML.setSessionVal("DataStart", value);
+ memLayer.ML.setSessionVal("DataRif", value);
}
}
protected void Page_Load(object sender, EventArgs e)
@@ -104,13 +113,7 @@ namespace WebSCR.WebUserControls
///
public string lastCmd { get; set; }
-#if false
- protected void btnAllSquadre_Click(object sender, EventArgs e)
- {
- // resetto sel rbl
- rblSquadre.SelectedIndex = -1;
- }
-#endif
+
///
/// aggiungo/tolgo all'intervallo selezione
///
diff --git a/WebSCR/WebUserControls/mod_footer.ascx b/WebSCR/WebUserControls/mod_footer.ascx
index 2834127..889df35 100644
--- a/WebSCR/WebUserControls/mod_footer.ascx
+++ b/WebSCR/WebUserControls/mod_footer.ascx
@@ -8,7 +8,7 @@
Setup
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_selData.ascx.cs b/WebSCR/WebUserControls/mod_selData.ascx.cs
index a15bf18..62f5972 100644
--- a/WebSCR/WebUserControls/mod_selData.ascx.cs
+++ b/WebSCR/WebUserControls/mod_selData.ascx.cs
@@ -29,6 +29,7 @@ namespace WebSCR.WebUserControls
{
if (!Page.IsPostBack)
{
+#if false
DateTime adesso = DateTime.Now;
try
{
@@ -37,10 +38,44 @@ namespace WebSCR.WebUserControls
catch
{ }
// metto data odierna...
- txtDataRif.Text = adesso.ToString("yyyy-MM-dd");
+ txtDataRif.Text = adesso.ToString("yyyy-MM-dd");
+#endif
+ txtDataRif.Text = dataSel.ToString("yyyy-MM-dd");
+ }
+ }
+ ///
+ /// data selezionata (da query string o inizializzata...
+ ///
+ protected DateTime dataSel
+ {
+ get
+ {
+ DateTime answ = DateTime.Now;
+ if (memLayer.ML.isInSessionObject("DataRif"))
+ {
+ try
+ {
+ answ = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataRif"));
+ }
+ catch
+ { }
+ }
+ else if (memLayer.ML.getCookieVal("DataRif") != "")
+ {
+ try
+ {
+ answ = Convert.ToDateTime(memLayer.ML.getCookieVal("DataRif"));
+ }
+ catch
+ { }
+ }
+ return answ;
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("DataRif", value);
}
}
-
protected void txtDataRif_TextChanged(object sender, EventArgs e)
{
DateTime adesso = DateTime.Now;
@@ -52,7 +87,7 @@ namespace WebSCR.WebUserControls
{ }
// salvo in cookie e in sessione
memLayer.ML.setCookieVal("DataRif", adesso.ToString("yyyy-MM-dd"), DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra")));
- memLayer.ML.setSessionVal("DataRif", adesso.ToString("yyyy-MM-dd"),true);
+ memLayer.ML.setSessionVal("DataRif", adesso.ToString("yyyy-MM-dd"), true);
reportEvent();
}
@@ -60,7 +95,16 @@ namespace WebSCR.WebUserControls
{
get
{
- return Convert.ToDateTime(memLayer.ML.getCookieVal("DataRif"));
+ DateTime answ = DateTime.Now;
+ try
+ {
+ answ = Convert.ToDateTime(memLayer.ML.getCookieVal("DataRif"));
+ }
+ catch
+ {
+ answ = Convert.ToDateTime(txtDataRif.Text);
+ }
+ return answ;
}
}
}
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index 691d10b..5c7dbcb 100644
Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ
diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll
index f3bc3a0..0f2b37a 100644
Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ
diff --git a/WebSCR/bin/WebSCR.dll.config b/WebSCR/bin/WebSCR.dll.config
index 5610bf2..b23b0a9 100644
--- a/WebSCR/bin/WebSCR.dll.config
+++ b/WebSCR/bin/WebSCR.dll.config
@@ -81,11 +81,12 @@
it enables developers to configure html error pages
to be displayed in place of a error stack trace.
-
-
-
-
+
-->
+
+
+
diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll
index 000ed82..6aea557 100644
Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ
diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll
index 691d10b..5c7dbcb 100644
Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ
diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll
index 000ed82..6aea557 100644
Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ
diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache
index 808c97b..e8ead56 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ
diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll
index 000ed82..6aea557 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ