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

correzione grafica selettore DDT e fix select...

Browse Source
This commit is contained in:
Samuele Locatelli
2017-02-14 17:01:40 +01:00
parent 6d56607ddb
commit 2e282a2d8e
7 changed files with 616 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XPS/Content/Style.css
+24
View File
@@ -24,6 +24,30 @@
.clearDiv {
clear: both;
}
.iconBlackRed {
padding: 0 0.2em;
text-align: center;
color: black;
}
.iconBlackRed :hover {
color: red;
}
.iconOrangeRed {
padding: 0 0.2em;
text-align: center;
color: orange;
}
.iconOrangeRed :hover {
color: red;
}
.iconBluRed {
padding: 0.2em;
text-align: center;
color: darkblue;
}
.iconBluRed :hover {
color: red;
}
.warnRed {
color: red;
}
XPS/Content/Style.less
+502 -539
View File
File diff suppressed because it is too large Load Diff
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
+74 -29
View File
@@ -9,7 +9,7 @@
<div class="filtro_1">
<div class="row">
<div class="col-xs-3">
<uc1:mod_periodoAnalisi runat="server" id="mod_periodoAnalisi" />
<uc1:mod_periodoAnalisi runat="server" ID="mod_periodoAnalisi" />
</div>
<div class="col-xs-7">
<span style="float: left;">
@@ -30,7 +30,9 @@
<span style="float: right;">
<asp:LinkButton ID="btnShowNew" runat="server" OnClick="btnShowNew_Click" CssClass="styleBtnComposito" CausesValidation="false">
<asp:Label ID="lblReset" runat="server" Text="..." />
</asp:LinkButton></span></div><div class="col-xs-12">
</asp:LinkButton></span>
</div>
<div class="col-xs-12">
<asp:Panel ID="pnlNew" runat="server" Visible="false" BackColor="#CCCCFF">
<table>
<tr>
@@ -67,7 +69,9 @@
</td>
<td>
<asp:TextBox ID="txtDataDDT" runat="server"></asp:TextBox><asp:RequiredFieldValidator ID="rfvDataDDT" runat="server" ErrorMessage="!!!" ControlToValidate="txtDataDDT" />
<asp:CalendarExtender ID="CalendarExtender1" runat="server" FirstDayOfWeek="Monday" TargetControlID="txtDataDDT" Format="dd/MM/yyyy"></asp:CalendarExtender></td><td colspan="2">
<asp:CalendarExtender ID="CalendarExtender1" runat="server" FirstDayOfWeek="Monday" TargetControlID="txtDataDDT" Format="dd/MM/yyyy"></asp:CalendarExtender>
</td>
<td colspan="2">
<asp:Label ID="lblEmailNotifica" runat="server" />
<asp:CheckBox runat="server" ID="chkReqEmail" Checked="false" />
</td>
@@ -89,11 +93,21 @@
<asp:Label runat="server" ID="lblDataPrev" Text="..." /><br />
<asp:TextBox ID="txtDueDate" runat="server" Text="..." Width="6em" Font-Size="18pt" />
<asp:RequiredFieldValidator ID="rfvDueDate" runat="server" ErrorMessage="!!!" ControlToValidate="txtDueDate" />
<asp:CalendarExtender ID="ce_DueDate" runat="server" FirstDayOfWeek="Monday" TargetControlID="txtDueDate" Format="dd/MM/yyyy"></asp:CalendarExtender><asp:DropDownList runat="server" ID="ddlOra">
<asp:ListItem Value="9">09:00</asp:ListItem><asp:ListItem Value="14">14:00</asp:ListItem></asp:DropDownList></div><div style="text-align: center;">
<asp:CalendarExtender ID="ce_DueDate" runat="server" FirstDayOfWeek="Monday" TargetControlID="txtDueDate" Format="dd/MM/yyyy"></asp:CalendarExtender>
<asp:DropDownList runat="server" ID="ddlOra">
<asp:ListItem Value="9">09:00</asp:ListItem>
<asp:ListItem Value="14">14:00</asp:ListItem>
</asp:DropDownList>
</div>
<div style="text-align: center;">
<asp:Button ID="btnOk" runat="server" Width="100px" OnClick="btnOk_Click" />
&nbsp;&nbsp; <asp:Button ID="btnCancel" runat="server" Width="100px" OnClick="btnCancel_Click" />
<asp:ConfirmButtonExtender ID="cbeOkDueDate" runat="server" ConfirmText="..." TargetControlID="btnOk"></asp:ConfirmButtonExtender></div></div></asp:Panel><asp:Panel ID="pnlCambiaStato" Visible="false" runat="server">
&nbsp;&nbsp;
<asp:Button ID="btnCancel" runat="server" Width="100px" OnClick="btnCancel_Click" />
<asp:ConfirmButtonExtender ID="cbeOkDueDate" runat="server" ConfirmText="..." TargetControlID="btnOk"></asp:ConfirmButtonExtender>
</div>
</div>
</asp:Panel>
<asp:Panel ID="pnlCambiaStato" Visible="false" runat="server">
<div class="notaMargine">
<div style="text-align: center;">
<asp:Label runat="server" ID="lblImpostaStato" Text="..." /><br />
@@ -108,8 +122,13 @@
</div>
<div style="text-align: center;">
<asp:Button ID="btnOkStati" runat="server" Width="100px" OnClick="btnOkStati_Click" />
&nbsp;&nbsp; <asp:Button ID="btnCancelStati" runat="server" Width="100px" OnClick="btnCancelStati_Click" />
<asp:ConfirmButtonExtender ID="cbeOkStati" runat="server" ConfirmText="..." TargetControlID="btnOkStati"></asp:ConfirmButtonExtender></div></div></asp:Panel><asp:Panel ID="pnlLogStati" Visible="false" runat="server">
&nbsp;&nbsp;
<asp:Button ID="btnCancelStati" runat="server" Width="100px" OnClick="btnCancelStati_Click" />
<asp:ConfirmButtonExtender ID="cbeOkStati" runat="server" ConfirmText="..." TargetControlID="btnOkStati"></asp:ConfirmButtonExtender>
</div>
</div>
</asp:Panel>
<asp:Panel ID="pnlLogStati" Visible="false" runat="server">
<uc2:mod_logStati ID="mod_logStati1" runat="server" />
</asp:Panel>
</div>
@@ -128,23 +147,36 @@
<asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
</EmptyDataTemplate>
<Columns>
<asp:TemplateField ShowHeader="False">
<asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
<HeaderTemplate>
<asp:LinkButton ID="btnReset" runat="server" OnClick="btnReset_Click" CssClass="styleBtnComposito" Visible="false">
<img src="images/refresh_16.png" style="border-style: none; margin-right: 0.2em;" width="13px" height="13px" />
<asp:Label ID="lblReset" runat="server" Text='<%# traduci("Reset") %>' />
</asp:LinkButton></HeaderTemplate><ItemTemplate>
</asp:LinkButton>
</HeaderTemplate>
<ItemTemplate>
<div style="white-space: nowrap;">
<%--<div style="white-space: nowrap;">--%>
<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select" ToolTip='<%# traduci("Select") %>' ImageUrl="~/images/view_l.png" />
&nbsp; <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")) %>' />
<asp:ImageButton ID="imgEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip='<%# traduci("Edit")%>' ImageUrl="~/images/edit_l.png" Visible='<%# isEditVisible(Eval("CodStato")) %>' />
<%--</div>
<div>--%>
<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><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")) %>' />
<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><%--</div>--%></div></ItemTemplate><EditItemTemplate>
<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: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">
<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">
<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">
<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">
<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>
</ItemTemplate>
<EditItemTemplate>
<asp:ImageButton ID="imgUpdate1" runat="server" CausesValidation="False" CommandName="Update" ToolTip='<%# traduci("Update")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma , SteamWare.dimImg.medium) %>' />
<asp:ImageButton ID="imgCancel1" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip='<%# traduci("Cancel") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.annulla , SteamWare.dimImg.medium) %>' />
</EditItemTemplate>
@@ -165,13 +197,20 @@
<asp:Label ID="lblDataDDT" runat="server" Text='<%# Eval("DataDDT", "{0:dd/MM/yy}") %>' />
</ItemTemplate>
<EditItemTemplate>
num: <asp:TextBox ID="txtNumDDT" runat="server" Text='<%# Bind("DDT") %>' Width="5em" />
num:
<asp:TextBox ID="txtNumDDT" runat="server" Text='<%# Bind("DDT") %>' Width="5em" />
<br />
del: <asp:TextBox ID="txtDataDDT" runat="server" Text='<%# Bind("DataDDT", "{0:dd/MM/yy}") %>' Width="6em" />
del:
<asp:TextBox ID="txtDataDDT" runat="server" Text='<%# Bind("DataDDT", "{0:dd/MM/yy}") %>' Width="6em" />
<asp:RequiredFieldValidator ID="rfvDataDDT" runat="server" ErrorMessage="!!!" ControlToValidate="txtDataDDT" />
<asp:CalendarExtender ID="CalendarExtender1" runat="server" FirstDayOfWeek="Monday" TargetControlID="txtDataDDT" Format="dd/MM/yyyy"></asp:CalendarExtender></EditItemTemplate></asp:TemplateField><asp:TemplateField ShowHeader="False">
<asp:CalendarExtender ID="CalendarExtender1" runat="server" FirstDayOfWeek="Monday" TargetControlID="txtDataDDT" Format="dd/MM/yyyy"></asp:CalendarExtender>
</EditItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:ImageButton runat="server" ID="btnPrintScheda" ImageUrl='<%# imgPath(SteamWare.tipoImg.barcode , SteamWare.dimImg.medium) %>' CommandArgument='<%# Eval("Cod")%>' ToolTip='<%# traduci("stampaBarcode") %>' OnClick="btnPrintScheda_Click" />
<span class="btn btn-xs btn-default iconBlackRed">
<asp:LinkButton runat="server" ID="lbPrintScheda" CausesValidation="False" CommandArgument='<%# Eval("Cod")%>' ToolTip='<%# traduci("stampaBarcode") %>' OnClick="lbPrintScheda_Click"><i class="fa fa-barcode fa-2x" aria-hidden="true"></i></asp:LinkButton>
</span>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Ciclo" SortExpression="Ciclo">
@@ -186,7 +225,11 @@
<ItemTemplate>
<div class="clearDiv" style="white-space: nowrap; margin: 0 0.2em; min-width: 8em;">
<div class="divSx">
<asp:LinkButton runat="server" ID="lbMostrLogStati" CausesValidation="False" CommandName="Select" OnClick="lbMostraLogStati_Click" ToolTip='<%# traduci("MostraLogStati")%>'><i class="fa fa-history fa-2x" aria-hidden="true"></i></asp:LinkButton></div><div class="divDx">
<span class="btn btn-xs btn-default iconBluRed">
<asp:LinkButton runat="server" ID="lbMostrLogStati" CausesValidation="False" CommandName="Select" OnClick="lbMostraLogStati_Click" ToolTip='<%# traduci("MostraLogStati")%>'><i class="fa fa-history fa-2x" aria-hidden="true"></i></asp:LinkButton>
</span>
</div>
<div class="divDx">
<asp:Image runat="server" ID="imgSemaforo" Visible='<%# isSemaforoVisibile(Eval("minCodStato"),Eval("maxCodStato")) %>' ImageUrl='<%# immagineDaStato(Eval("minCodStato"),Eval("maxCodStato")) %>' ToolTip='<%# toolTipDaStato(Eval("minCodStato"),Eval("maxCodStato")) %>' />
</div>
<div style="padding: 0 0.1em;">
@@ -218,7 +261,9 @@
</HeaderTemplate>
<ItemTemplate>
<asp:ImageButton ID="imgDelete" runat="server" CausesValidation="False" CommandName="Delete" ToolTip='<%# traduci("Delete") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.elimina , SteamWare.dimImg.medium) %>' Visible='<%# userCanDel(Eval("CodStato")) %>' />
<asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete"></asp:ConfirmButtonExtender></ItemTemplate><EditItemTemplate>
<asp:ConfirmButtonExtender ID="ConfirmButtonExtender1" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="imgDelete"></asp:ConfirmButtonExtender>
</ItemTemplate>
<EditItemTemplate>
<asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update" ToolTip='<%# traduci("Update")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma , SteamWare.dimImg.medium) %>' />
<asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip='<%# traduci("Cancel") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.annulla , SteamWare.dimImg.medium) %>' />
</EditItemTemplate>
@@ -236,8 +281,8 @@
</FilterParameters>
<SelectParameters>
<asp:ControlParameter ControlID="mf_tipoFiltro" DefaultValue="*" Name="CodFiltro" PropertyName="Valore" Type="String" />
<asp:SessionParameter SessionField="_inizio" DefaultValue="" Name="DataFiltro" Type="DateTime" />
<asp:SessionParameter SessionField="_fine" DefaultValue="" Name="DataFiltroTo" Type="DateTime" />
<asp:SessionParameter SessionField="_inizio" DefaultValue="" Name="DataFiltro" Type="DateTime" />
<asp:SessionParameter SessionField="_fine" DefaultValue="" Name="DataFiltroTo" Type="DateTime" />
</SelectParameters>
<UpdateParameters>
<asp:Parameter Name="Original_Cod" Type="String" />
XPS/WebUserControls/mod_elencoComm.ascx.cs
+15
View File
@@ -216,6 +216,9 @@ namespace XPS.WebUserControls
{
pnlLogStati.Visible = false;
showDetailPnl(false);
// resetto grView
grView.SelectedIndex = -1;
grView.DataBind();
}
/// <summary>
/// Imposta classi css x mostrare o meno panel dettaglio
@@ -758,6 +761,18 @@ namespace XPS.WebUserControls
// stampo!
reportPrinter.obj.printReport(reportRichiesto.Barcode, memLayer.ML.confReadString("printerBarcode"), imgBtn.CommandArgument);
}
/// <summary>
/// salvo next cmd --> mostrare log stato!
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbPrintScheda_Click(object sender, EventArgs e)
{
LinkButton lnkBtn = (LinkButton)sender;
// stampo!
reportPrinter.obj.printReport(reportRichiesto.Barcode, memLayer.ML.confReadString("printerBarcode"), lnkBtn.CommandArgument);
}
/// <summary>
/// fix ricerche in cambio pagina
/// </summary>
XPS/elencoComm.aspx
-2
View File
@@ -1,7 +1,6 @@
<%@ Page Language="C#" MasterPageFile="~/Bootstrap.master" AutoEventWireup="true" Inherits="elencoComm" Title="Untitled Page" CodeBehind="elencoComm.aspx.cs" %>
<%@ Register Src="WebUserControls/mod_elencoComm.ascx" TagName="mod_elencoComm" TagPrefix="uc1" %>
<%@ Register Src="WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc2" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Main" runat="Server">
<div class="container-flow">
<div class="row panel panel-default" style="margin: 4px 8px;">
@@ -12,7 +11,6 @@
</div>
<div class="col-xs-12">
<uc1:mod_elencoComm ID="Mod_elencoComm1" runat="server" />
<uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
</div>
</div>
</div>
XPS/elencoComm.aspx.designer.cs
Generated
-9
View File
@@ -19,13 +19,4 @@ public partial class elencoComm {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::XPS.WebUserControls.mod_elencoComm Mod_elencoComm1;
/// <summary>
/// mod_fixCal1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::XPS.WebUserControls.mod_fixCal mod_fixCal1;
}