diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 82c70dd..b49f029 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/DataUploader/bin/DataUploader.dll.config b/DataUploader/bin/DataUploader.dll.config index dd0f93e..9c93831 100644 --- a/DataUploader/bin/DataUploader.dll.config +++ b/DataUploader/bin/DataUploader.dll.config @@ -2,7 +2,8 @@ - + + diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index 3ba723d..ae3a0f2 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.9.061.181")] -[assembly: AssemblyFileVersion("1.9.061.181")] +[assembly: AssemblyVersion("1.9.062.190")] +[assembly: AssemblyFileVersion("1.9.062.190")] [assembly: AssemblyCopyright("Steamware © 2015-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 425c4b7..be5c5ad 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.9.061.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.9.061.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.9.062.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.9.062.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index c753d73..901232d 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 1aaedd9..2ce6449 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Debug/TempPE/WebSC.cs.dll b/VersGen/obj/Debug/TempPE/WebSC.cs.dll index b166a86..3e1a64e 100644 Binary files a/VersGen/obj/Debug/TempPE/WebSC.cs.dll and b/VersGen/obj/Debug/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll index c753d73..901232d 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll index ba9ed6e..8409ce4 100644 Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 1aaedd9..2ce6449 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR/WebUserControls/mod_AssSquadra.ascx b/WebSCR/WebUserControls/mod_AssSquadra.ascx index df390c5..94f1b41 100644 --- a/WebSCR/WebUserControls/mod_AssSquadra.ascx +++ b/WebSCR/WebUserControls/mod_AssSquadra.ascx @@ -2,6 +2,7 @@ <%@ Register Src="~/WebUserControls/mod_selData.ascx" TagPrefix="uc1" TagName="mod_selData" %> +
@@ -60,7 +61,8 @@ - + <%----%> +
diff --git a/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs b/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs index 4dda6ae..449fc4e 100644 --- a/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs +++ b/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs @@ -20,10 +20,11 @@ namespace WebSCR.WebUserControls mod_selData.eh_update += Mod_selData_eh_update; } /// - /// rilegge (eventualmente90 dati ins essione da cookie se non presenti + /// rilegge (eventualmente) dati ins essione da cookie se non presenti /// - private static void reloadSessionByCookie() + private void reloadSessionByCookie() { +#if false // se valore in session è nullo PROVO a leggerlo da cookie... DateTime adesso = DateTime.Now; if (!memLayer.ML.isInSessionObject("DataRif")) @@ -35,11 +36,18 @@ namespace WebSCR.WebUserControls catch { } memLayer.ML.setSessionVal("DataRif", adesso.ToString("yyyy-MM-dd"), true); - } + } +#endif + lblDataFrom.Text = mod_selData.dataTxt.ToString("yyyy-MM-dd"); } private void Mod_selData_eh_update(object sender, EventArgs e) { reloadSessionByCookie(); + doUpdate(); + } + + public void doUpdate() + { try { grView.DataBind(); @@ -47,6 +55,7 @@ namespace WebSCR.WebUserControls catch { } } + /// /// inserimento associazione user/squadra /// @@ -55,16 +64,17 @@ namespace WebSCR.WebUserControls protected void btnDoInsert_Click(object sender, EventArgs e) { DtProxy.man.taAsSq.insertQuery(ddlSquadre.SelectedValue, mod_selData.dateSel, ddlDip.SelectedValue); - grView.DataBind(); + doUpdate(); } protected void ddlSquadre_SelectedIndexChanged(object sender, EventArgs e) { - grView.DataBind(); + doUpdate(); } protected void ddlDip_SelectedIndexChanged(object sender, EventArgs e) { + doUpdate(); } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_AssSquadra.ascx.designer.cs b/WebSCR/WebUserControls/mod_AssSquadra.ascx.designer.cs index e916202..465f122 100644 --- a/WebSCR/WebUserControls/mod_AssSquadra.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_AssSquadra.ascx.designer.cs @@ -12,6 +12,15 @@ namespace WebSCR.WebUserControls { public partial class mod_AssSquadra { + /// + /// lblDataFrom control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox lblDataFrom; + /// /// ddlSquadre control. /// diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index 9f889f1..eb6c0b2 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -97,8 +97,7 @@ namespace WebSCR.WebUserControls // salvo apgina corrente devicesAuthProxy.pagCorrente = titolo; // devicesAuthProxy.getCurrPage(Request.Url); // update valori - lblVers.Text = string.Format("v.{0}.{1}", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Major, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Minor); - lblVers.ToolTip = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.MinorRevision.ToString(); + lblVers.Text = string.Format("v.{0}.{1}.{2}", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Major, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Minor, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Build); } // SOLO se la pagina NON E' "safe"... if (memLayer.ML.confReadString("PageNoIndex").IndexOf(titolo) < 0) diff --git a/WebSCR/WebUserControls/mod_selData.ascx.cs b/WebSCR/WebUserControls/mod_selData.ascx.cs index 62f5972..595f48d 100644 --- a/WebSCR/WebUserControls/mod_selData.ascx.cs +++ b/WebSCR/WebUserControls/mod_selData.ascx.cs @@ -107,5 +107,20 @@ namespace WebSCR.WebUserControls return answ; } } + public DateTime dataTxt + { + get + { + DateTime answ = dateSel; + try + { + answ = Convert.ToDateTime(txtDataRif.Text); + } + catch + { + } + return answ; + } + } } } \ No newline at end of file diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 1dec315..2a4cbde 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 4842a59..f6c0418 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 2618231..4b2489c 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/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 7ca8e09..fabd5db 100644 Binary files a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 9e11065..3bbc058 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 2618231..4b2489c 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ