inizio fix gestione date assegnazione squadre

This commit is contained in:
Samuele E. Locatelli
2015-10-08 15:08:40 +02:00
parent 30bbfdf324
commit 9b35b6b05a
21 changed files with 49 additions and 13 deletions
Binary file not shown.
+2 -1
View File
@@ -2,7 +2,8 @@
<configuration>
<appSettings>
<!--parametri base-->
<add key="maxDocsToUpload" value="50" />
<!--<add key="maxDocsToUpload" value="50" />-->
<add key="maxDocsToUpload" value="5" />
<add key="remoteDocUrl" value="http://webscr.steamware.net/Rigamonti/Upload/Document" />
<add key="remoteCliUrl" value="http://webscr.steamware.net/Rigamonti/Upload/Client" />
<add key="debugMode" value="false" />
+2 -2
View File
@@ -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")]
+2 -2
View File
@@ -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")]
<#+
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+3 -1
View File
@@ -2,6 +2,7 @@
<%@ Register Src="~/WebUserControls/mod_selData.ascx" TagPrefix="uc1" TagName="mod_selData" %>
<asp:TextBox runat="server" ID="lblDataFrom" type="date" Visible="false" />
<div class="ui-grid-b" style="padding: 2px;">
<div class="ui-block-a ui-shadow ui-corner-all">
<asp:DropDownList ID="ddlSquadre" runat="server" DataSourceID="odsSquadre" DataTextField="DescrSquadra" DataValueField="CodSquadra" AutoPostBack="True" OnSelectedIndexChanged="ddlSquadre_SelectedIndexChanged"></asp:DropDownList>
@@ -60,7 +61,8 @@
</DeleteParameters>
<SelectParameters>
<asp:ControlParameter ControlID="ddlSquadre" DefaultValue="" Name="CodSquadra" PropertyName="SelectedValue" Type="String" />
<asp:SessionParameter SessionField="DataRif" Name="Data" Type="DateTime" />
<%--<asp:SessionParameter SessionField="DataRif" Name="Data" Type="DateTime" />--%>
<asp:ControlParameter ControlID="lblDataFrom" Name="Data" PropertyName="Text" Type="DateTime" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
+15 -5
View File
@@ -20,10 +20,11 @@ namespace WebSCR.WebUserControls
mod_selData.eh_update += Mod_selData_eh_update;
}
/// <summary>
/// rilegge (eventualmente90 dati ins essione da cookie se non presenti
/// rilegge (eventualmente) dati ins essione da cookie se non presenti
/// </summary>
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
{ }
}
/// <summary>
/// inserimento associazione user/squadra
/// </summary>
@@ -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();
}
}
}
+9
View File
@@ -12,6 +12,15 @@ namespace WebSCR.WebUserControls {
public partial class mod_AssSquadra {
/// <summary>
/// lblDataFrom control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox lblDataFrom;
/// <summary>
/// ddlSquadre control.
/// </summary>
+1 -2
View File
@@ -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)
@@ -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;
}
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.