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

Aggiunta chiave "showRepTimb" x mostrare rep timbrature o meno

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-04-12 11:01:18 +02:00
parent 0d073fcd1b
commit 5ac7ea6523
7 changed files with 29 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Commesse/Content/BtnReport.css
+1 -1
View File
@@ -101,7 +101,7 @@
background-repeat: no-repeat;
background-position: left top;
background-size: 60px 60px;
min-height: 36px;
min-height: 2em;
height: 100%;
width: 100%;
max-width: 100%;
GPW_Commesse/Web.config
+2
View File
@@ -67,6 +67,8 @@
<add key="intUpdatePagina_ms" value="120000" />
<add key="intUpdateFooter_ms" value="1000" />
<add key="maxRefreshToReload" value="30" />
<!--Abilitazione link timbrature-->
<add key="showRepTimb" value="true" />
<!--Gestione Barcode-->
<add key="secTimeoutBCode" value="8" />
<add key="prefComandi" value="CMD" />
GPW_Commesse/WebUserControls/mod_menuTopFull.ascx
+1 -2
View File
@@ -15,8 +15,7 @@
<table>
<tr>
<td>
<asp:LinkButton runat="server" ID="lbHome" OnClick="lbHome_Click"><i style="font-size: 2em;" class="glyphicon glyphicon-home"></i></asp:LinkButton>
<asp:ImageButton ID="imgReturn" runat="server" ImageUrl="~/images/back_l.png" Visible="false" OnClick="imgReturn_Click" />
<asp:LinkButton runat="server" ID="lbHome" OnClick="lbHome_Click" Visible="false"><i style="font-size: 2em;" class="glyphicon glyphicon-home"></i></asp:LinkButton>
<asp:Label runat="server" ID="lblCurrentPage" Text="..." Font-Size="20pt" ForeColor="White" />
</td>
<td>
GPW_Commesse/WebUserControls/mod_menuTopFull.ascx.cs
+13 -17
View File
@@ -1,11 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using GPW_data;
using SteamWare;
using GPW_data;
using System;
namespace GPW_Commesse.WebUserControls
{
@@ -18,6 +13,10 @@ namespace GPW_Commesse.WebUserControls
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
mod_reportUtenteAD1.Visible = memLayer.ML.CRB("showRepTimb");
}
checkUser();
setMenuData();
}
@@ -45,7 +44,7 @@ namespace GPW_Commesse.WebUserControls
if (value != "")
{
memLayer.ML.setSessionVal("returnUrl", value);
imgReturn.Visible = true;
lbHome.Visible = true;
}
}
}
@@ -99,20 +98,17 @@ namespace GPW_Commesse.WebUserControls
{ }
}
/// <summary>
/// rimanda a pagina precedente
/// redirect
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void imgReturn_Click(object sender, ImageClickEventArgs e)
{
returnHome();
}
private void returnHome()
{
Response.Redirect(memLayer.ML.StringSessionObj("returnUrl"));
}
/// <summary>
/// rimanda a pagina precedente
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbHome_Click(object sender, EventArgs e)
{
returnHome();
GPW_Commesse/WebUserControls/mod_menuTopFull.ascx.designer.cs
Generated
-9
View File
@@ -39,15 +39,6 @@ namespace GPW_Commesse.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbHome;
/// <summary>
/// Controllo imgReturn.
/// </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.ImageButton imgReturn;
/// <summary>
/// Controllo lblCurrentPage.
/// </summary>
GPW_Commesse/WebUserControls/mod_reportUtenteAD.ascx
+1 -1
View File
@@ -12,7 +12,7 @@
<ItemTemplate>
<asp:HyperLink ID="HyperLink1" runat="server" Target="_blank" NavigateUrl='<%# fullUrl(Eval("ReportUrl"))%>'>
<div class="divSx" style="padding: 1px; width: 100%; min-width: 120px;">
<div class='<%# fullCss(Eval("cssClass")) %>' style="margin: 3px;">
<div class='<%# fullCss(Eval("cssClass")) %>' style="margin: 0;">
<div class="areaTestoSmall">
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("nome") %>' ToolTip='<%# Eval("descrizione") %>' />
</div>
GPW_Commesse/WebUserControls/mod_reportUtenteAD.ascx.designer.cs
Generated
+11 -11
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace GPW_Commesse.WebUserControls {
@@ -13,20 +13,20 @@ namespace GPW_Commesse.WebUserControls {
public partial class mod_reportUtenteAD {
/// <summary>
/// repReports control.
/// Controllo repReports.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.Repeater repReports;
/// <summary>
/// odsReports control.
/// Controllo odsReports.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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.ObjectDataSource odsReports;
}