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

vers 690

Browse Source 
fix reset ricerca lav e sterratura IN/OUT x particolare
This commit is contained in:
Samuele Locatelli
2014-05-19 14:38:38 +02:00
parent f6d8b0bb7e
commit 296c151fca
14 changed files with 152 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW-RT/bin/GMW-RT.dll
BIN
View File
Binary file not shown.
GMW/WebUserControls/mod_SterrTagIN.ascx
+8 -5
View File
@@ -33,11 +33,14 @@
<div class="panel-body">
<div class="row boxRicerca">
<div class="col-xs-12">
<div style="float: left;">
<asp:TextBox ID="txtCerca" runat="server" OnTextChanged="txtCerca_TextChanged" Width="160px" AutoPostBack="True" />
</div>
<div style="float: right;">
<asp:Button ID="btnCerca" runat="server" OnClick="btnCerca_Click" Text='<%# traduci("lblCerca") %>' />
<div class="input-group input-group-sm">
<span class="input-group-btn text-left" style="text-align: left;">
<asp:Button ID="btnCerca" runat="server" CssClass="btn btn-default" type="button" OnClick="btnCerca_Click" Text='<%# traduci("lblCerca") %>' />
</span>
<asp:TextBox ID="txtCerca" runat="server" CssClass="form-control" OnTextChanged="txtCerca_TextChanged" AutoPostBack="True" />
<span class="input-group-addon">
<asp:LinkButton runat="server" ID="lnkReset" Text="X" type="button" OnClick="lnkReset_Click" Font-Size="0.8em" />
</span>
</div>
</div>
</div>
GMW/WebUserControls/mod_SterrTagIN.ascx.cs
+10
View File
@@ -368,6 +368,16 @@ namespace GMW.WebUserControls
salvaCerca();
}
/// <summary>
/// effettuato reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lnkReset_Click(object sender, EventArgs e)
{
testoRicerca = "";
salvaCerca();
}
/// <summary>
/// pressione del button di ricerca
/// </summary>
/// <param name="sender"></param>
GMW/WebUserControls/mod_SterrTagIN.ascx.designer.cs
Generated
+11 -2
View File
@@ -75,6 +75,15 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtBarcode;
/// <summary>
/// btnCerca 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.Button btnCerca;
/// <summary>
/// txtCerca control.
/// </summary>
@@ -85,13 +94,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.TextBox txtCerca;
/// <summary>
/// btnCerca control.
/// lnkReset 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.Button btnCerca;
protected global::System.Web.UI.WebControls.LinkButton lnkReset;
/// <summary>
/// grView control.
GMW/WebUserControls/mod_SterrTagOUT.ascx
+8 -5
View File
@@ -17,11 +17,14 @@
<div class="panel-body">
<div class="row boxRicerca">
<div class="col-xs-12">
<div style="float: left;">
<asp:TextBox ID="txtCerca" runat="server" OnTextChanged="txtCerca_TextChanged" Width="160px" AutoPostBack="True" />
</div>
<div style="float: right;">
<asp:Button ID="btnCerca" runat="server" OnClick="btnCerca_Click" Text='<%# traduci("lblCerca") %>' />
<div class="input-group input-group-sm">
<span class="input-group-btn text-left" style="text-align: left;">
<asp:Button ID="btnCerca" runat="server" CssClass="btn btn-default" type="button" OnClick="btnCerca_Click" Text='<%# traduci("lblCerca") %>' />
</span>
<asp:TextBox ID="txtCerca" runat="server" CssClass="form-control" OnTextChanged="txtCerca_TextChanged" AutoPostBack="True" />
<span class="input-group-addon">
<asp:LinkButton runat="server" ID="lnkReset" Text="X" type="button" OnClick="lnkReset_Click" Font-Size="0.8em" />
</span>
</div>
</div>
</div>
GMW/WebUserControls/mod_SterrTagOUT.ascx.cs
+10
View File
@@ -773,6 +773,16 @@ namespace GMW.WebUserControls
salvaCerca();
}
/// <summary>
/// effettuato reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lnkReset_Click(object sender, EventArgs e)
{
testoRicerca = "";
salvaCerca();
}
/// <summary>
/// pressione del button di ricerca
/// </summary>
/// <param name="sender"></param>
GMW/WebUserControls/mod_SterrTagOUT.ascx.designer.cs
Generated
+11 -2
View File
@@ -30,6 +30,15 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// btnCerca 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.Button btnCerca;
/// <summary>
/// txtCerca control.
/// </summary>
@@ -40,13 +49,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.TextBox txtCerca;
/// <summary>
/// btnCerca control.
/// lnkReset 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.Button btnCerca;
protected global::System.Web.UI.WebControls.LinkButton lnkReset;
/// <summary>
/// grView control.
GMW/WebUserControls/mod_lavMeccIN.ascx
+59 -50
View File
@@ -35,65 +35,74 @@
<div class="panel-body">
<div class="row boxRicerca">
<div class="col-xs-12">
<div style="float: left;">
<div class="input-group input-group-sm">
<span class="input-group-btn text-left" style="text-align: left;">
<asp:Button ID="btnCerca" runat="server" CssClass="btn btn-default" type="button" OnClick="btnCerca_Click" Text='<%# traduci("lblCerca") %>' />
</span>
<asp:TextBox ID="txtCerca" runat="server" CssClass="form-control" OnTextChanged="txtCerca_TextChanged" AutoPostBack="True" />
<span class="input-group-addon">
<asp:LinkButton runat="server" ID="lnkReset" Text="X" type="button" OnClick="lnkReset_Click" Font-Size="0.8em" />
</span>
</div>
<%--<div style="float: left;">
<asp:TextBox ID="txtCerca" runat="server" OnTextChanged="txtCerca_TextChanged" Width="160px" AutoPostBack="True" />
</div>
<div style="float: right;">
<asp:Button ID="btnCerca" runat="server" OnClick="btnCerca_Click" Text='<%# traduci("lblCerca") %>' />
</div>
</div>--%>
</div>
</div>
<div class="row">
<div class="col-xs-12" style="font-size: 0.8em;">
<asp:GridView ID="grView" runat="server" AllowPaging="false" AllowSorting="True" AutoGenerateColumns="False"
OnDataBound="grView_DataBound"
DataKeyNames="UDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged"
OnSorted="grView_Sorted" Width="100%">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
<SelectedRowStyle CssClass="ctrSelRowStyle" />
<FooterStyle CssClass="ctrFooter" />
<PagerStyle CssClass="ctrHeaderPager" ForeColor="White" HorizontalAlign="Center" />
<HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
<EmptyDataRowStyle CssClass="ctrRowStyle" />
<EmptyDataTemplate>
<asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="lastMov" SortExpression="lastMov" ItemStyle-Wrap="false">
<ItemTemplate>
<asp:Label ID="lbllastMov" runat="server" Text='<%# Eval("lastMov", "{0:dd/MM HH:mm}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="UDC" SortExpression="UDC">
<ItemTemplate>
<asp:Label ID="lblUDC" runat="server" Text='<%# Eval("UDC") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Particolare" SortExpression="Particolare">
<ItemTemplate>
<asp:Label ID="lblParticolare" runat="server" Text='<%# Eval("Particolare") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Qta" SortExpression="Qta" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Label ID="lblQta" runat="server" Text='<%# Eval("Qta","{0:#}") %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getUdcDetailByIdxCella" TypeName="GMW_data.DS_magazzinoTableAdapters.v_UdcDetailTableAdapter"
OnDataBinding="ods_DataBinding" FilterExpression="UDC LIKE '%{0}%' OR PARTICOLARE LIKE '%{0}%'">
<SelectParameters>
<asp:SessionParameter Name="IdxCella" Type="Int32" SessionField="IdxCellaLineaLM_IN" DefaultValue="0" />
</SelectParameters>
<FilterParameters>
<asp:SessionParameter Name="search" Type="String" SessionField="valoreCercatoLMI"
DefaultValue="0" />
</FilterParameters>
</asp:ObjectDataSource>
OnDataBound="grView_DataBound"
DataKeyNames="UDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged"
OnSorted="grView_Sorted" Width="100%">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
<SelectedRowStyle CssClass="ctrSelRowStyle" />
<FooterStyle CssClass="ctrFooter" />
<PagerStyle CssClass="ctrHeaderPager" ForeColor="White" HorizontalAlign="Center" />
<HeaderStyle CssClass="ctrHeaderPager" ForeColor="White" Font-Bold="True" />
<EmptyDataRowStyle CssClass="ctrRowStyle" />
<EmptyDataTemplate>
<asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="lastMov" SortExpression="lastMov" ItemStyle-Wrap="false">
<ItemTemplate>
<asp:Label ID="lbllastMov" runat="server" Text='<%# Eval("lastMov", "{0:dd/MM HH:mm}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="UDC" SortExpression="UDC">
<ItemTemplate>
<asp:Label ID="lblUDC" runat="server" Text='<%# Eval("UDC") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Particolare" SortExpression="Particolare">
<ItemTemplate>
<asp:Label ID="lblParticolare" runat="server" Text='<%# Eval("Particolare") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Qta" SortExpression="Qta" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Label ID="lblQta" runat="server" Text='<%# Eval("Qta","{0:#}") %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getUdcDetailByIdxCella" TypeName="GMW_data.DS_magazzinoTableAdapters.v_UdcDetailTableAdapter"
OnDataBinding="ods_DataBinding" FilterExpression="UDC LIKE '%{0}%' OR PARTICOLARE LIKE '%{0}%'">
<SelectParameters>
<asp:SessionParameter Name="IdxCella" Type="Int32" SessionField="IdxCellaLineaLM_IN" DefaultValue="0" />
</SelectParameters>
<FilterParameters>
<asp:SessionParameter Name="search" Type="String" SessionField="valoreCercatoLMI"
DefaultValue="0" />
</FilterParameters>
</asp:ObjectDataSource>
<asp:Label ID="lblNumRec" runat="server" CssClass="didascalia" />
</div>
</div>
GMW/WebUserControls/mod_lavMeccIN.ascx.cs
+10
View File
@@ -368,6 +368,16 @@ namespace GMW.WebUserControls
salvaCerca();
}
/// <summary>
/// effettuato reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lnkReset_Click(object sender, EventArgs e)
{
testoRicerca = "";
salvaCerca();
}
/// <summary>
/// pressione del button di ricerca
/// </summary>
/// <param name="sender"></param>
GMW/WebUserControls/mod_lavMeccIN.ascx.designer.cs
Generated
+11 -2
View File
@@ -75,6 +75,15 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtBarcode;
/// <summary>
/// btnCerca 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.Button btnCerca;
/// <summary>
/// txtCerca control.
/// </summary>
@@ -85,13 +94,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.TextBox txtCerca;
/// <summary>
/// btnCerca control.
/// lnkReset 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.Button btnCerca;
protected global::System.Web.UI.WebControls.LinkButton lnkReset;
/// <summary>
/// grView control.
GMW/WebUserControls/mod_lavMeccOUT.ascx.cs
+10
View File
@@ -808,6 +808,16 @@ namespace GMW.WebUserControls
salvaCerca();
}
/// <summary>
/// effettuato reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lnkReset_Click(object sender, EventArgs e)
{
testoRicerca = "";
salvaCerca();
}
/// <summary>
/// pressione del button di ricerca
/// </summary>
/// <param name="sender"></param>
GMW/bin/GMW.dll
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.689.1589")]
[assembly: AssemblyFileVersion("2.5.689.1589")]
[assembly: AssemblyVersion("2.5.690.1599")]
[assembly: AssemblyFileVersion("2.5.690.1599")]
[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.689.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.689.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.5.690.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.690.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+