+
diff --git a/WebSCR/Squadra.aspx.designer.cs b/WebSCR/Squadra.aspx.designer.cs
index e384932..f14b4f3 100644
--- a/WebSCR/Squadra.aspx.designer.cs
+++ b/WebSCR/Squadra.aspx.designer.cs
@@ -12,6 +12,15 @@ namespace WebSCR {
public partial class Squadra {
+ ///
+ /// mod_selData control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebSCR.WebUserControls.mod_selData mod_selData;
+
///
/// mod_consegne control.
///
diff --git a/WebSCR/Web.config b/WebSCR/Web.config
index 4bf1164..3ee99d0 100644
--- a/WebSCR/Web.config
+++ b/WebSCR/Web.config
@@ -38,6 +38,8 @@
+
+
diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj
index 963372a..2905d27 100644
--- a/WebSCR/WebSCR.csproj
+++ b/WebSCR/WebSCR.csproj
@@ -396,6 +396,7 @@
+
@@ -716,6 +717,13 @@
mod_pianificazione.ascx
+
+ mod_selData.ascx
+ ASPXCodeBehind
+
+
+ mod_selData.ascx
+
mod_selSquadre.ascx
ASPXCodeBehind
diff --git a/WebSCR/WebUserControls/mod_Interventi.ascx.cs b/WebSCR/WebUserControls/mod_Interventi.ascx.cs
index ca98698..da73042 100644
--- a/WebSCR/WebUserControls/mod_Interventi.ascx.cs
+++ b/WebSCR/WebUserControls/mod_Interventi.ascx.cs
@@ -104,11 +104,13 @@ 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_selData.ascx b/WebSCR/WebUserControls/mod_selData.ascx
new file mode 100644
index 0000000..161b229
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_selData.ascx
@@ -0,0 +1,6 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selData.ascx.cs" Inherits="WebSCR.WebUserControls.mod_selData" %>
+
+
+
diff --git a/WebSCR/WebUserControls/mod_selData.ascx.cs b/WebSCR/WebUserControls/mod_selData.ascx.cs
new file mode 100644
index 0000000..05d6f19
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_selData.ascx.cs
@@ -0,0 +1,43 @@
+using SteamWare;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebSCR.WebUserControls
+{
+ public partial class mod_selData : System.Web.UI.UserControl
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!Page.IsPostBack)
+ {
+ DateTime adesso = DateTime.Now;
+ try
+ {
+ adesso = Convert.ToDateTime(memLayer.ML.getCookieVal("DataRif"));
+ }
+ catch
+ { }
+ // metto data odierna...
+ txtDataRif.Text = adesso.ToString("yyyy-MM-dd");
+ }
+ }
+
+ protected void txtDataRif_TextChanged(object sender, EventArgs e)
+ {
+ DateTime adesso = DateTime.Now;
+ try
+ {
+ adesso = Convert.ToDateTime(txtDataRif.Text);
+ }
+ catch
+ { }
+ memLayer.ML.setCookieVal("DataRif", adesso.ToString("yyyy-MM-dd"), DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra")));
+ // ricarico!
+ Response.Redirect(devicesAuthProxy.pagCorrente);
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_selData.ascx.designer.cs b/WebSCR/WebUserControls/mod_selData.ascx.designer.cs
new file mode 100644
index 0000000..12746bf
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_selData.ascx.designer.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace WebSCR.WebUserControls {
+
+
+ public partial class mod_selData {
+
+ ///
+ /// txtDataRif control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtDataRif;
+ }
+}
diff --git a/WebSCR/WebUserControls/mod_squadre.ascx.cs b/WebSCR/WebUserControls/mod_squadre.ascx.cs
index 41305ed..7922cd2 100644
--- a/WebSCR/WebUserControls/mod_squadre.ascx.cs
+++ b/WebSCR/WebUserControls/mod_squadre.ascx.cs
@@ -47,11 +47,12 @@ namespace WebSCR.WebUserControls
memLayer.ML.setCookieVal("CodSquadra", riga.CodSquadra, DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra")));
memLayer.ML.setCookieVal("SquadraCurr", riga.DescrSquadra, DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra")));
memLayer.ML.setCookieVal("DataRif", DateTime.Now.ToString("yyyy-MM-dd"), DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra")));
- memLayer.ML.setCookieVal("NumGg", "2", DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra")));
+ memLayer.ML.setCookieVal("NumGg", memLayer.ML.CRI("NumGg"), DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra")));
memLayer.ML.setCookieVal("RecAgeDd", "1000", DateTime.Now.AddMinutes(memLayer.ML.confReadInt("minCookieSquadra")));
// ricarico!
Response.Redirect(devicesAuthProxy.pagCorrente);
}
}
+
}
}
\ No newline at end of file
diff --git a/WebSCR/bin/NLog.dll b/WebSCR/bin/NLog.dll
index 064bc61..6730265 100644
Binary files a/WebSCR/bin/NLog.dll and b/WebSCR/bin/NLog.dll differ
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index 7cff1f2..31e929c 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 185d470..5492602 100644
Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ
diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll
index 93c886b..671aea2 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 cae3206..31e929c 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 b279548..671aea2 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 d3b9fb4..c29c457 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 b279548..671aea2 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ