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

completata review selettori

Browse Source
This commit is contained in:
Samuele Locatelli
2017-02-14 17:30:46 +01:00
parent 2e282a2d8e
commit ed1026a9bb
8 changed files with 105 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XPS/Content/Style.css
+16
View File
@@ -46,8 +46,24 @@
color: darkblue;
}
.iconBluRed :hover {
color: orangered;
}
.iconBluGreen {
padding: 0.2em;
text-align: center;
color: darkblue;
}
.iconBluGreen :hover {
color: green;
}
.iconRedBlu {
padding: 0.2em;
text-align: center;
color: red;
}
.iconRedBlu :hover {
color: dodgerblue;
}
.warnRed {
color: red;
}
XPS/Content/Style.less
+21 -1
View File
@@ -56,7 +56,27 @@
color: darkblue;
:hover {
color: red;
color: orangered;
}
}
.iconBluGreen {
padding: 0.2em;
text-align: center;
color: darkblue;
:hover {
color: green;
}
}
.iconRedBlu {
padding: 0.2em;
text-align: center;
color: red;
:hover {
color: dodgerblue;
}
}
XPS/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
XPS/WebUserControls/mod_elencoComm.ascx
+18 -11
View File
@@ -156,24 +156,31 @@
</HeaderTemplate>
<ItemTemplate>
<div style="white-space: nowrap;">
<asp:LinkButton runat="server" CssClass="btn btn-xs btn-default iconBluRed" ID="lbSelect" CausesValidation="False" CommandName="Select" ToolTip='<%# traduci("Select") %>'><i class="fa fa-search fa-2x" aria-hidden="true"></i></asp:LinkButton>
<span class="btn btn-xs btn-default iconBluRed">
<asp:LinkButton runat="server" ID="lbSelect" CssClass="btn btn-xs btn-default iconBluGreen" CausesValidation="False" CommandName="Select" ToolTip='<%# traduci("Select") %>'><i class="fa fa-search fa-2x" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbSetStato" CssClass="btn btn-xs btn-default iconBluRed" CausesValidation="False" CommandName="Select" OnClick="lbSetStato_Click" ToolTip='<%# traduci("setStatoObjXps")%>' Visible='<%# isSetStatoVisible(Eval("CodStato")) %>'><i class="fa fa-magic fa-2x" aria-hidden="true"></i></asp:LinkButton>
<%--<span class="btn btn-xs btn-default iconBluRed">
<asp:ImageButton ID="imgSetStato" runat="server" CausesValidation="False" CommandName="Select" OnClick="imgSetStato_Click" ToolTip='<%# traduci("setStatoObjXps")%>' ImageUrl="~/images/clonaObj_l.png" Visible='<%# isSetStatoVisible(Eval("CodStato")) %>' />
</span>
<span class="btn btn-xs btn-default iconBluRed">
</span>--%>
<asp:LinkButton runat="server" ID="lbEdit" CssClass="btn btn-xs btn-default iconBluRed" CausesValidation="False" CommandName="Edit" ToolTip='<%# traduci("Edit") %>' Visible='<%# isEditVisible(Eval("CodStato")) %>'><i class="fa fa-pencil fa-2x" aria-hidden="true"></i></asp:LinkButton>
<%--<span class="btn btn-xs btn-default iconBluRed">
<asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip='<%# traduci("Edit")%>' ImageUrl="~/images/edit_l.png" Visible='<%# isEditVisible(Eval("CodStato")) %>' />
</span>
<span class="btn btn-xs btn-default iconBluRed">
</span>--%>
<asp:LinkButton runat="server" ID="lbAccetta" CssClass="btn btn-xs btn-default iconBluRed" CausesValidation="False" CommandName="Update" OnClick="lbAccetta_Click" ToolTip='<%# traduci("AccettaObjXps")%>' Visible='<%# isAccettVisible(Eval("CodStato")) %>'><i class="fa fa-check fa-2x" aria-hidden="true"></i></asp:LinkButton>
<asp:ConfirmButtonExtender ID="cbeAccetta" runat="server" ConfirmText='<%# traduci("confermaAccettaObjXps")%>' TargetControlID="lbAccetta"></asp:ConfirmButtonExtender>
<%--<span class="btn btn-xs btn-default iconBluRed">
<asp:ImageButton ID="imgAccetta" runat="server" CausesValidation="False" CommandName="Update" OnClick="imgAccetta_Click" ToolTip='<%# traduci("AccettaObjXps")%>' ImageUrl="~/images/apply_l.png" Visible='<%# isAccettVisible(Eval("CodStato")) %>' />
<asp:ConfirmButtonExtender ID="cbeAccetta" runat="server" ConfirmText='<%# traduci("confermaAccettaObjXps")%>' TargetControlID="imgAccetta"></asp:ConfirmButtonExtender>
</span>
<span class="btn btn-xs btn-default iconBluRed">
</span>--%>
<asp:LinkButton runat="server" ID="lbSchedulaTutto" CssClass="btn btn-xs btn-default iconBluRed" CausesValidation="False" CommandName="Select" OnClick="lbSchedulaTutto_Click" ToolTip='<%# traduci("SchedulaObjXps")%>' Visible='<%# isSchedulaVisible(Eval("CodStato")) %>'><i class="fa fa-pencil-square fa-2x" aria-hidden="true"></i></asp:LinkButton>
<%--<span class="btn btn-xs btn-default iconBluRed">
<asp:ImageButton ID="imgSchedulaTutto" runat="server" CausesValidation="False" CommandName="Select" OnClick="imgSchedulaTutto_Click" ToolTip='<%# traduci("SchedulaObjXps")%>' ImageUrl="~/images/edit_l.png" Visible='<%# isSchedulaVisible(Eval("CodStato")) %>' />
</span>
<span class="btn btn-xs btn-default iconBluRed">
</span>--%>
<asp:LinkButton runat="server" ID="lbFattura" CssClass="btn btn-xs btn-default iconRedBlu" CausesValidation="False" CommandName="Update" OnClick="lbFattura_Click" ToolTip='<%# traduci("FatturaObjXps")%>' Visible='<%# isFatturaVisible(Eval("CodStato")) %>'><i class="fa fa-file-text-o fa-2x" aria-hidden="true"></i></asp:LinkButton>
<asp:ConfirmButtonExtender ID="cbeSchedula" runat="server" ConfirmText='<%# traduci("confermaFatturaObjXps")%>' TargetControlID="lbFattura"></asp:ConfirmButtonExtender>
<%--<span class="btn btn-xs btn-default iconBluRed">
<asp:ImageButton ID="imgFattura" runat="server" CausesValidation="False" CommandName="Update" OnClick="imgFattura_Click" ToolTip='<%# traduci("FatturaObjXps")%>' ImageUrl="~/images/apply_l.png" Visible='<%# isFatturaVisible(Eval("CodStato")) %>' />
<asp:ConfirmButtonExtender ID="ConfirmButtonExtender2" runat="server" ConfirmText='<%# traduci("confermaFatturaObjXps")%>' TargetControlID="imgFattura"></asp:ConfirmButtonExtender>
</span>
</span>--%>
</span>
</ItemTemplate>
<EditItemTemplate>
XPS/WebUserControls/mod_elencoComm.ascx.cs
+30 -30
View File
@@ -380,34 +380,6 @@ namespace XPS.WebUserControls
grView.DataBind();
}
/// <summary>
/// inserisce nuovo valore da footer
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lblIns_click(object sender, EventArgs e)
{
// click su inserimento, chiamo il metodo insert dell'ObjectDataSource
ods.Insert();
}
/// <summary>
/// salvo in session che il prox comando è clonare...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void imgAccetta_Click(object sender, ImageClickEventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "accettaObj");
}
/// <summary>
/// salvo in session che il prox comando è registrare come fatturato...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void imgFattura_Click(object sender, ImageClickEventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "fatturaObj");
}
/// <summary>
/// in caso di aggiornamento verifico se sia salvato un comando accetta...
/// </summary>
@@ -643,7 +615,7 @@ namespace XPS.WebUserControls
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void imgSchedulaTutto_Click(object sender, ImageClickEventArgs e)
protected void lbSchedulaTutto_Click(object sender, EventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "schedulaTutto");
}
@@ -652,11 +624,39 @@ namespace XPS.WebUserControls
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void imgSetStato_Click(object sender, ImageClickEventArgs e)
protected void lbSetStato_Click(object sender, EventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "cambiaStato");
}
/// <summary>
/// inserisce nuovo valore da footer
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lblIns_click(object sender, EventArgs e)
{
// click su inserimento, chiamo il metodo insert dell'ObjectDataSource
ods.Insert();
}
/// <summary>
/// salvo in session che il prox comando è clonare...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbAccetta_Click(object sender, EventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "accettaObj");
}
/// <summary>
/// salvo in session che il prox comando è registrare come fatturato...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbFattura_Click(object sender, EventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "fatturaObj");
}
/// <summary>
/// gestione cambio selezione valore
/// </summary>
XPS/detComm.aspx
+16 -5
View File
@@ -1,10 +1,21 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" Inherits="detComm" Codebehind="detComm.aspx.cs" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true" Inherits="detComm" CodeBehind="detComm.aspx.cs" %>
<%@ Register Src="WebUserControls/mod_dettComm.ascx" TagName="mod_dettComm" TagPrefix="uc1" %>
<%@ Register Src="WebUserControls/mod_ULP.ascx" TagName="mod_ULP" TagPrefix="uc2" %>
<%@ Register Src="WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc2" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<uc1:mod_dettComm ID="mod_dettComm1" runat="server" />
<uc2:mod_ULP ID="mod_ULP1" runat="server" Visible="false" />
<uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
<asp:Content ID="Content1" ContentPlaceHolderID="Main" runat="Server">
<div class="container-flow">
<div class="row panel panel-default" style="margin: 4px 8px;">
<div class="panel-heading">
<div class="row" style="margin: 2px 4px;">
<h3 class="panel-title"><%: traduci("dettComm") %></h3>
</div>
</div>
<div class="col-xs-12">
<uc1:mod_dettComm ID="mod_dettComm1" runat="server" />
<uc2:mod_ULP ID="mod_ULP1" runat="server" Visible="false" />
<uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
</div>
</div>
</div>
</asp:Content>
XPS/detComm.aspx.cs
+2 -2
View File
@@ -2,9 +2,9 @@
using System.Collections.Generic;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using SteamWare;
public partial class detComm : Flesk.Accelerator.Page //System.Web.UI.Page
public partial class detComm : UserPage //System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
XPS/detComm.aspx.designer.cs
Generated
+1 -2
View File
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------