Fix refresh date periodi passati

This commit is contained in:
Samuele Locatelli
2021-03-25 19:55:14 +01:00
parent d6c625edce
commit 0a63e5957f
6 changed files with 148 additions and 149 deletions
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace GPW_Commesse.WebUserControls
@@ -15,92 +15,92 @@ namespace GPW_Commesse.WebUserControls
{
/// <summary>
/// Controllo pnlHeader.
/// pnlHeader control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnlHeader;
/// <summary>
/// Controllo ddlGruppo.
/// ddlGruppo control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlGruppo;
/// <summary>
/// Controllo odsGruppi.
/// odsGruppi control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsGruppi;
/// <summary>
/// Controllo lblSubtitle.
/// lblSubtitle control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblSubtitle;
/// <summary>
/// Controllo lblTitle.
/// lblTitle control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblTitle;
/// <summary>
/// Controllo lnkNew.
/// lnkNew control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lnkNew;
/// <summary>
/// Controllo grView.
/// grView control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// Controllo odsRA.
/// odsRA control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsRA;
/// <summary>
/// Controllo odsProgetto.
/// odsProgetto control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsProgetto;
/// <summary>
/// Controllo odsFase.
/// odsFase control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsFase;
}
@@ -9,9 +9,6 @@
<%@ Register Src="~/WebUserControls/cmp_rilTemp.ascx" TagPrefix="uc2" TagName="cmp_rilTemp" %>
<%@ Register Src="~/WebUserControls/cmp_chart.ascx" TagPrefix="uc2" TagName="cmp_chart" %>
<asp:HiddenField runat="server" ID="hfDataFrom" />
<asp:HiddenField runat="server" ID="hfDataTo" />
<script>
</script>
@@ -81,6 +78,8 @@
</asp:UpdatePanel>
<asp:UpdatePanel ID="upMain" runat="server" UpdateMode="Conditional" RenderMode="Block">
<ContentTemplate>
<asp:HiddenField runat="server" ID="hfDataFrom" />
<asp:HiddenField runat="server" ID="hfDataTo" />
<div class="row">
<div runat="server" id="divSx" visible="false">
<asp:Panel ID="pnlEditOre" runat="server" Height="100%" Visible="false" CssClass="table-secondary">
@@ -119,7 +118,7 @@
<asp:Label ID="lblIsOk" runat="server" Text="*" CssClass="font-weight-bold" ForeColor="Red" Visible='<%# invBool(Eval("okTimbr")) %>' />
<asp:Label ID="lblh_lav" runat="server" Text='<%# formatDurata(Eval("h_lav")) %>' CssClass='<%# "font-weight-bold " + classByPerm(Eval("minPerm")) %>'
Font-Size="1.2em" ToolTip='<%# tooltipPermStra(Eval("minStra"),Eval("minPerm")) %>' />
<asp:LinkButton runat="server" ID="lnkEditTimbr" CausesValidation="False" CommandName="Select" ToolTip="Edit Timbrature" CommandArgument='<%# Eval("Data") %>' Visible='<%# regAttEnabled %>' CssClass="btn btn-sm btn-outline-danger py-1" OnClick="lnkEditTimbr_Click"><i class="fa fa-pencil" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lnkEditTimbr" CausesValidation="False" CommandName="Select" ToolTip='<%# "Edit Timbrature " + Eval("Data","{0:yyyy-MM-dd}") %>' CommandArgument='<%# Eval("Data") %>' Visible='<%# regAttEnabled %>' CssClass="btn btn-sm btn-outline-danger py-1" OnClick="lnkEditTimbr_Click"><i class="fa fa-pencil" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ItemStyle-CssClass="text-nowrap text-center">
@@ -151,7 +150,7 @@
<ItemTemplate>
<b>
<asp:Label ID="lblh_com" runat="server" Text='<%# formatDurata(Eval("h_com")) %>' Font-Size="1.2em" /></b>
<asp:LinkButton runat="server" ID="lnkEditComm" CausesValidation="False" CommandName="Select" ToolTip="Edit Ore commesse" CommandArgument='<%# Eval("Data") %>' Visible='<%# regAttEnabled %>' CssClass="btn btn-sm btn-outline-success py-1" OnClick="lnkEditComm_Click"><i class="fa fa-pencil" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lnkEditComm" CausesValidation="False" CommandName="Select" ToolTip='<%# "Edit Ore commesse " + Eval("Data","{0:yyyy-MM-dd}") %>' CommandArgument='<%# Eval("Data") %>' Visible='<%# regAttEnabled %>' CssClass="btn btn-sm btn-outline-success py-1" OnClick="lnkEditComm_Click"><i class="fa fa-pencil" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField SortExpression="progetti">
@@ -213,11 +213,12 @@ namespace GPW_Commesse.WebUserControls
// 2016.04.07: salvo intervallo nei 2 hidden field
hfDataFrom.Value = mod_periodoAnalisi1.intervalloAnalisi.inizio.ToString();
hfDataTo.Value = mod_periodoAnalisi1.intervalloAnalisi.fine.ToString();
// update
mod_commAttivitaDesk1.doUpdate();
grView.DataBind();
upMain.Update();
showPanels();
}
private void mod_TagCloudProgetti1_eh_newVal(object sender, EventArgs e)
+18 -18
View File
@@ -14,24 +14,6 @@ namespace GPW_Commesse.WebUserControls
public partial class mod_commUtLog
{
/// <summary>
/// hfDataFrom 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.HiddenField hfDataFrom;
/// <summary>
/// hfDataTo 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.HiddenField hfDataTo;
/// <summary>
/// upFilt control.
/// </summary>
@@ -122,6 +104,24 @@ namespace GPW_Commesse.WebUserControls
/// </remarks>
protected global::System.Web.UI.UpdatePanel upMain;
/// <summary>
/// hfDataFrom 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.HiddenField hfDataFrom;
/// <summary>
/// hfDataTo 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.HiddenField hfDataTo;
/// <summary>
/// divSx control.
/// </summary>
@@ -1,44 +1,43 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_menuTopFull.ascx.cs" Inherits="GPW_Commesse.WebUserControls.mod_menuTopFull" %>
<%@ Register Src="mod_reportUtenteAD.ascx" TagName="mod_reportUtenteAD" TagPrefix="uc1" %>
<nav class="navbar navbar-expand-sm fixed-top bg-dark">
<%--<div class="fullPageHeader" style="padding: 2px 4px 2px; background-color: #333; text-align: center; margin: auto; min-height: 32px;">--%>
<div class="row text-light" style="width:100%;">
<div class="col-3 text-left">
<div class="d-flex flex-row">
<div class="px-2">
<img src="images/LogoHighResWhite.png" class="img-fluid" width="96" />
</div>
<div class="px-2">
<asp:UpdateProgress ID="updtTop" runat="server" DisplayAfter="10" DynamicLayout="false">
<ProgressTemplate>
<div id="progress_back">
<%--<div class="fullPageHeader" style="padding: 2px 4px 2px; background-color: #333; text-align: center; margin: auto; min-height: 32px;">--%>
<div class="row text-light" style="width: 100%;">
<div class="col-3 text-left">
<div class="d-flex flex-row">
<div class="px-2">
<img src="images/LogoHighResWhite.png" class="img-fluid" width="96" alt="logo" />
</div>
<div id="progress_top">
<div class="spinner-border text-warning"></div>
<div class="px-2">
<asp:UpdateProgress ID="updtTop" runat="server" DisplayAfter="10" DynamicLayout="false">
<ProgressTemplate>
<div id="progress_back">
</div>
<div id="progress_top">
<div class="spinner-border text-warning"></div>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
</div>
</div>
</div>
<div class="col-6 text-center">
<div class="row">
<div class="col-9 text-right">
<asp:LinkButton runat="server" ID="lbHome" OnClick="lbHome_Click" Visible="false" CssClass="text-light"><i style="font-size: 2em;" class="fa fa-home"></i></asp:LinkButton>
<asp:Label runat="server" ID="lblCurrentPage" Text="..." Font-Size="20pt" />
</div>
<div class="col-3">
<uc1:mod_reportUtenteAD ID="mod_reportUtenteAD1" runat="server" />
</div>
<div class="col-6 text-center">
<div class="row">
<div class="col-9 text-right">
<asp:LinkButton runat="server" ID="lbHome" OnClick="lbHome_Click" Visible="false" CssClass="text-light"><i style="font-size: 2em;" class="fa fa-home"></i></asp:LinkButton>
<asp:Label runat="server" ID="lblCurrentPage" Text="..." Font-Size="20pt" />
</div>
<div class="col-3">
<uc1:mod_reportUtenteAD ID="mod_reportUtenteAD1" runat="server" />
</div>
</div>
</div>
</div>
<div class="col-3 text-light text-right">
<asp:Label runat="server" ID="lblPostazione" ForeColor="#CDCDCD" />
|
<div class="col-3 text-light text-right">
<asp:Label runat="server" ID="lblPostazione" ForeColor="#CDCDCD" />
|
<asp:Label runat="server" ID="lblUtente" ForeColor="#CDCDCD" />
</div>
</div>
</div>
<%-- </div>--%>
</nav>
<%-- </div>--%>
</nav>
+56 -56
View File
@@ -1,71 +1,71 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace GPW_Commesse.WebUserControls
{
public partial class mod_menuTopFull
{
public partial class mod_menuTopFull
{
/// <summary>
/// Controllo updtTop.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdateProgress updtTop;
/// <summary>
/// updtTop control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdateProgress updtTop;
/// <summary>
/// Controllo lbHome.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbHome;
/// <summary>
/// lbHome 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 lbHome;
/// <summary>
/// Controllo lblCurrentPage.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCurrentPage;
/// <summary>
/// lblCurrentPage 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.Label lblCurrentPage;
/// <summary>
/// Controllo mod_reportUtenteAD1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::GPW_Commesse.WebUserControls.mod_reportUtenteAD mod_reportUtenteAD1;
/// <summary>
/// mod_reportUtenteAD1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::GPW_Commesse.WebUserControls.mod_reportUtenteAD mod_reportUtenteAD1;
/// <summary>
/// Controllo lblPostazione.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPostazione;
/// <summary>
/// lblPostazione 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.Label lblPostazione;
/// <summary>
/// Controllo lblUtente.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblUtente;
}
/// <summary>
/// lblUtente 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.Label lblUtente;
}
}