Egalware/WebSCR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ultimi punti x date...

Browse Source
This commit is contained in:
unknown
2015-09-03 09:35:47 +02:00
parent 20d7acfece
commit f5cbfa792a
19 changed files with 92 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/WebSCR/v14/.suo
BIN
View File
Binary file not shown.
WebSCR/Menu.aspx
+1
View File
@@ -14,6 +14,7 @@
<asp:LinkButton ID="lbSetSquadra" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-edit ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Scegli Squadra" Width="75%" OnClick="lbSetSquadra_Click" />
<asp:LinkButton ID="lbResetSquadra" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-recycle ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Reset Squadra" Width="75%" OnClick="lbResetSquadra_Click" />
<asp:LinkButton ID="lbComponiSquadra" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-edit ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Componi Squadra" Width="75%" OnClick="lbComponiSquadra_Click" Visible="false" />
<asp:LinkButton ID="lbInterventiSq" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-recycle ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Interventi Squadra" Width="75%" OnClick="lbInterventiSq_Click" />
</div>
</div>
</asp:Content>
WebSCR/Menu.aspx.cs
+4
View File
@@ -45,5 +45,9 @@ namespace WebSCR
{
mod_AssSquadra.Visible = true;
}
protected void lbInterventiSq_Click(object sender, EventArgs e)
{
Response.Redirect("Squadra");
}
}
}
WebSCR/Menu.aspx.designer.cs
Generated
+9
View File
@@ -56,5 +56,14 @@ namespace WebSCR {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbComponiSquadra;
/// <summary>
/// lbInterventiSq 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.LinkButton lbInterventiSq;
}
}
WebSCR/Web.config
+5 -4
View File
@@ -81,11 +81,12 @@
it enables developers to configure html error pages
to be displayed in place of a error stack trace.
<customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
<error statusCode="403" redirect="NoAccess.htm" />
<error statusCode="404" redirect="FileNotFound.htm" />
</customErrors>
-->
<customErrors mode="RemoteOnly" defaultRedirect="Default.aspx">
<!--<error statusCode="403" redirect="NoAccess.htm" />
<error statusCode="404" redirect="FileNotFound.htm" />-->
</customErrors>
<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
<namespaces>
<add namespace="System.Web.Optimization" />
WebSCR/WebUserControls/mod_AssSquadra.ascx
-1
View File
@@ -60,7 +60,6 @@
</DeleteParameters>
<SelectParameters>
<asp:ControlParameter ControlID="ddlSquadre" DefaultValue="" Name="CodSquadra" PropertyName="SelectedValue" Type="String" />
<%--<asp:CookieParameter CookieName="DataRif" Name="Data" Type="DateTime" />--%>
<asp:SessionParameter SessionField="DataRif" Name="Data" Type="DateTime" />
</SelectParameters>
</asp:ObjectDataSource>
WebSCR/WebUserControls/mod_AssSquadra.ascx.cs
+6 -1
View File
@@ -40,7 +40,12 @@ namespace WebSCR.WebUserControls
private void Mod_selData_eh_update(object sender, EventArgs e)
{
reloadSessionByCookie();
grView.DataBind();
try
{
grView.DataBind();
}
catch
{ }
}
/// <summary>
/// inserimento associazione user/squadra
WebSCR/WebUserControls/mod_Interventi.ascx
-1
View File
@@ -196,7 +196,6 @@
<asp:ControlParameter ControlID="ddlStato" Name="Stato" PropertyName="SelectedValue" Type="String" />
<asp:ControlParameter ControlID="txtDataFrom" Name="DataRif" PropertyName="Text" Type="String" />
<asp:ControlParameter ControlID="txtNumGg" Name="NumGg" PropertyName="Text" Type="String" />
<%--<asp:ControlParameter ControlID="rblSquadre" Name="CodSquadra" PropertyName="SelectedValue" Type="String" />--%>
<asp:SessionParameter Name="CodSquadra" Type="String" SessionField="elencoSquadre" DefaultValue="*" />
<asp:ControlParameter ControlID="ddlRecAgeDd" Name="RecAgeDd" PropertyName="SelectedValue" Type="Int32" />
</SelectParameters>
WebSCR/WebUserControls/mod_Interventi.ascx.cs
+13 -10
View File
@@ -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
/// </summary>
public string lastCmd { get; set; }
#if false
protected void btnAllSquadre_Click(object sender, EventArgs e)
{
// resetto sel rbl
rblSquadre.SelectedIndex = -1;
}
#endif
/// <summary>
/// aggiungo/tolgo all'intervallo selezione
/// </summary>
WebSCR/WebUserControls/mod_footer.ascx
+1 -1
View File
@@ -8,7 +8,7 @@
<li><a href="Setup" data-icon="gear" class='<%: liClass("Setup") %>'>Setup</a></li>
</ul>
<ul runat="server" id="ulSquadra" visible="false">
<li><a href="Menu" data-icon="home" class='<%: liClass("Menu") %>'>Menu</a></li>
<li><a href="Menu" data-icon="home" class='<%: liClass("Menu") %>'>Menu Squadre</a></li>
<li><a href="Squadra" data-icon="navigation" class='<%: liClass("Squadre") %>'>Squadre/Consegne</a></li>
</ul>
</div>
WebSCR/WebUserControls/mod_selData.ascx.cs
+48 -4
View File
@@ -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");
}
}
/// <summary>
/// data selezionata (da query string o inizializzata...
/// </summary>
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;
}
}
}
WebSCR/bin/SteamWare.dll
BIN
View File
Binary file not shown.
WebSCR/bin/WebSCR.dll
BIN
View File
Binary file not shown.
WebSCR/bin/WebSCR.dll.config
+5 -4
View File
@@ -81,11 +81,12 @@
it enables developers to configure html error pages
to be displayed in place of a error stack trace.
<customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
<error statusCode="403" redirect="NoAccess.htm" />
<error statusCode="404" redirect="FileNotFound.htm" />
</customErrors>
-->
<customErrors mode="RemoteOnly" defaultRedirect="Default.aspx">
<!--<error statusCode="403" redirect="NoAccess.htm" />
<error statusCode="404" redirect="FileNotFound.htm" />-->
</customErrors>
<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
<namespaces>
<add namespace="System.Web.Optimization" />
WebSCR/bin/WebSCR_data.dll
BIN
View File
Binary file not shown.
WebSCR_data/bin/Debug/SteamWare.dll
BIN
View File
Binary file not shown.
WebSCR_data/bin/Debug/WebSCR_data.dll
BIN
View File
Binary file not shown.
WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
WebSCR_data/obj/Debug/WebSCR_data.dll
BIN
View File
Binary file not shown.