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

fix grafici minori

Browse Source
This commit is contained in:
Samuele Locatelli
2014-03-06 12:35:46 +01:00
parent 5ceeec7c83
commit ffa9868c43
13 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW.csproj
+2 -2
View File
@@ -1849,9 +1849,9 @@
<Content Include="Reports\CartellinoFiniti.rdlc" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Reports\CartellinoAL.rdlc">
<Content Include="Reports\CartellinoAL.rdlc">
<SubType>Designer</SubType>
</EmbeddedResource>
</Content>
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
GMW/PostRX.aspx
+6 -6
View File
@@ -11,15 +11,15 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid stileAttesa">
<div class="row" style="height: 40px; padding: 2px; background: #dedede;">
<div class="row" style="height: 48px; padding: 1px; background: #dedede;">
<div class="col-sm-4">
<asp:Button runat="server" ID="btnRefresh" Visible="false"></asp:Button>
<div class="btn-group" style="width: 100%;">
<asp:LinkButton runat="server" ID="lbtRefresh" Text="" Width="0px" />
<asp:LinkButton runat="server" ID="lbtShowHideStorico" class="btn btn-inverse " OnClick="btnShowHideStorico_Click" Width="200px"><i class="glyphicon glyphicon-book"></i> <%: traduci("btnShowStorico") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtShowHideStorico" class="btn btn-inverse btn-lg" OnClick="btnShowHideStorico_Click" Width="200px"><i class="glyphicon glyphicon-book"></i> <%: traduci("btnShowStorico") %></asp:LinkButton>
</div>
</div>
<div class="col-sm-4">
<asp:DropDownList ID="ddlLinea" runat="server" AutoPostBack="True" DataSourceID="odsLinea" DataTextField="label" DataValueField="value" OnSelectedIndexChanged="ddlLinea_SelectedIndexChanged" CssClass="btn btn-primary dropdown-toggle"></asp:DropDownList>
<asp:DropDownList ID="ddlLinea" runat="server" AutoPostBack="True" DataSourceID="odsLinea" DataTextField="label" DataValueField="value" OnSelectedIndexChanged="ddlLinea_SelectedIndexChanged" CssClass="btn btn-primary btn-lg dropdown-toggle"></asp:DropDownList>
<asp:ObjectDataSource ID="odsLinea" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selLineeTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="W50" Name="conditio" Type="String" />
@@ -28,8 +28,8 @@
</div>
<div class="col-sm-4">
<div class="btn-group" style="width: 100%;">
<asp:LinkButton runat="server" ID="lbtNT" OnClick="lbtNT_Click" CssClass="btn btn-inverse active" Width="50%"><i class="glyphicon glyphicon-barcode"></i> <%: traduci("modoNT") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtDT" OnClick="lbtDT_Click" CssClass="btn btn-inverse" Width="50%"><i class="glyphicon glyphicon-qrcode"></i> <%: traduci("modoDT") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtNT" OnClick="lbtNT_Click" CssClass="btn btn-inverse btn-lg active" Width="50%"><i class="glyphicon glyphicon-barcode"></i> <%: traduci("modoNT") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtDT" OnClick="lbtDT_Click" CssClass="btn btn-inverse btn-lg" Width="50%"><i class="glyphicon glyphicon-qrcode"></i> <%: traduci("modoDT") %></asp:LinkButton>
</div>
</div>
</div>
GMW/PostRX.aspx.cs
+2 -2
View File
@@ -113,8 +113,8 @@ namespace GMW
if (Postazione.currCodCella != "")
{
// SOLO se ho una linea procedo...
string cssBtn = "btn btn-inverse";
string cssBtnActive = "btn btn-inverse active";
string cssBtn = "btn btn-inverse btn-lg";
string cssBtnActive = "btn btn-inverse btn-lg active";
switch (modoPagina)
{
case "NT":
GMW/PostRX.aspx.designer.cs
Generated
+2 -2
View File
@@ -13,13 +13,13 @@ namespace GMW {
public partial class PostRX {
/// <summary>
/// lbtRefresh control.
/// btnRefresh 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 lbtRefresh;
protected global::System.Web.UI.WebControls.Button btnRefresh;
/// <summary>
/// lbtShowHideStorico control.
GMW/WebUserControls/mod_PostRX_NT.ascx
+5 -9
View File
@@ -75,7 +75,7 @@
</asp:TemplateField>
<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" OnClientClick="return confirm('Confermi eliminazione?')" CssClass="text-danger"><i class="glyphicon glyphicon-off btn-lg"></i></asp:LinkButton>
<asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" OnClientClick="return confirm('Confermi eliminazione?')" CssClass="text-danger"><i class="glyphicon glyphicon-trash btn-lg"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
</Columns>
@@ -130,8 +130,8 @@
<div>
<div id="divModoInput" runat="server" style="width: 320px; margin: auto; text-align: center;">
<asp:RadioButtonList ID="rblInputMode" runat="server" AutoPostBack="true" OnSelectedIndexChanged="rblInputMode_SelectedIndexChanged" class="btn-group" RepeatDirection="Horizontal" RepeatLayout="Flow">
<asp:ListItem Value="barcode" Selected="True" class="btn btn-default"></asp:ListItem>
<asp:ListItem Value="elenco" class="btn btn-default"></asp:ListItem>
<asp:ListItem Value="BARCODE" Selected="True" class="btn btn-default btn-lg"></asp:ListItem>
<asp:ListItem Value="ELENCO" class="btn btn-default btn-lg"></asp:ListItem>
</asp:RadioButtonList>
</div>
<div id="divElenco" runat="server">
@@ -164,12 +164,8 @@
<asp:TextBox runat="server" ID="txtNote" Height="120px" Width="400px" Font-Size="24pt" TextMode="MultiLine" />
</div>
<div style="width: 400px; margin: auto;">
<div style="float: left;">
<asp:LinkButton runat="server" ID="lbtGeneraAl" Width="180px" CssClass="btn btn-warning btn-lg" OnClick="lbtGeneraAl_Click"><i aria-hidden='true' class='fa fa-print'></i> <%: traduci("lbtGeneraAl") %></asp:LinkButton>
</div>
<div style="float: right;">
<asp:LinkButton runat="server" ID="lbtGeneraUDC" Width="180px" CssClass="btn btn-warning btn-lg" Visible="false"><i aria-hidden='true' class='fa fa-print'></i> <%: traduci("lbtGeneraUDC") %></asp:LinkButton>
</div>
<asp:LinkButton runat="server" ID="lbtGeneraAl" Width="400px" CssClass="btn btn-warning btn-lg" OnClick="lbtGeneraAl_Click"><i aria-hidden='true' class='fa fa-print fa-2x'></i> <%: traduci("lbtGeneraAl") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtGeneraUDC" Width="400px" CssClass="btn btn-warning btn-lg" Visible="false"><i aria-hidden='true' class='fa fa-print fa-2x'></i> <%: traduci("lbtGeneraUDC") %></asp:LinkButton>
</div>
</div>
</div>
GMW/WebUserControls/mod_PostRX_NT.ascx.cs
+3 -3
View File
@@ -46,7 +46,7 @@ namespace GMW.WebUserControls
}
doChecks();
}
/// <summary>
/// qta pezzi x UDC
/// </summary>
@@ -103,7 +103,7 @@ namespace GMW.WebUserControls
private void fixTipoInput()
{
bool barcodeEnabled = false;
if (rblInputMode.SelectedValue == "barcode")
if (rblInputMode.SelectedValue.ToUpper() == "BARCODE")
{
barcodeEnabled = true;
Postazione.messaggiText = traduci("attesaBCode");
@@ -606,7 +606,7 @@ namespace GMW.WebUserControls
/// <param name="e"></param>
protected void txtCesta_TextChanged(object sender, EventArgs e)
{
txtCesta.Text = txtCesta.Text.ToUpper();
txtCesta.Text = txtCesta.Text.ToUpper().Trim().PadLeft(4, '0').Substring(0, 4);
doUpdate();
}
/// <summary>
GMW/WebUserControls/mod_storicoAzioniOperatore.ascx
+1 -1
View File
@@ -2,7 +2,7 @@
Inherits="GMW.WebUserControls.mod_storicoAzioniOperatore" %>
<div style="text-align: center; margin: auto; padding: 2px;">
<%--<asp:Button runat="server" ID="btnShowHideStorico" class="btn btn-inverse" OnClick="btnShowHideStorico_Click" Width="200px" />--%>
<asp:LinkButton runat="server" ID="lbtShowHideStorico" class="btn btn-inverse " OnClick="btnShowHideStorico_Click" Width="200px"><i class="glyphicon glyphicon-book"></i> <%: traduci("btnHideStorico") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtShowHideStorico" class="btn btn-inverse btn-lg" OnClick="btnShowHideStorico_Click" Width="200px"><i class="glyphicon glyphicon-book"></i> <%: traduci("btnHideStorico") %></asp:LinkButton>
</div>
<div style="text-align: center; margin: auto;">
<asp:Button runat="server" ID="btnStampa" Width="120px" Text="(ri)stampa"
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/bin/VersGen.dll
BIN
View File
Binary file not shown.
ReleaseClienti/SP_test/GMW.zip
BIN
View File
Binary file not shown.
VersGen/GMW.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.5.608.1523")]
[assembly: AssemblyFileVersion("2.5.608.1523")]
[assembly: AssemblyVersion("2.5.610.1525")]
[assembly: AssemblyFileVersion("2.5.610.1525")]
//[assembly: AssemblyCopyright("© Steamware 2007-2014")]
//[assembly: AssemblyCompany("Steamware")]
VersGen/GMW.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("2.5.608.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.608.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.5.610.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.610.<#= this.RevisionNumber #>")]
//[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")]
//[assembly: AssemblyCompany("Steamware")]
<#+