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

versione 1.4.249 completata x filtraggi su mtz preventiva

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-10-15 16:23:09 +02:00
parent 8091719c8f
commit b3a9fa9951
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Projects/WebGIM/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.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.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
+8 -4
View File
@@ -5,7 +5,7 @@
</div>
<div style="font-size: 8pt;">
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
DataKeyNames="idxPending" DataSourceID="ods" OnDataBound="grView_DataBound" EnableModelValidation="True" onpageindexchanged="grView_PageIndexChanged">
DataKeyNames="idxPending" DataSourceID="ods" OnDataBound="grView_DataBound" EnableModelValidation="True" OnPageIndexChanged="grView_PageIndexChanged">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
@@ -24,14 +24,16 @@
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("codImpianto") %>' />
<br />
<b><asp:Label ID="Label2" runat="server" Text='<%# Eval("nomeImpianto") %>' /></b>
<b>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("nomeImpianto") %>' /></b>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="nomeMacchina" SortExpression="nomeMacchina">
<asp:TemplateField HeaderText="nomeMacchina" SortExpression="nomeMacchina">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# Eval("codMacchina") %>' />
<br />
<b><asp:Label ID="Label4" runat="server" Text='<%# Eval("nomeMacchina") %>' /></b>
<b>
<asp:Label ID="Label4" runat="server" Text='<%# Eval("nomeMacchina") %>' /></b>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="descrizione" HeaderText="descrizione" SortExpression="descrizione" />
@@ -47,6 +49,8 @@
<asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
<asp:SessionParameter DefaultValue="0" Name="idxTipo" SessionField="idxTipo_filt"
Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxImpianto" SessionField="idxImpianto_filt"
Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxMacchina" SessionField="idxMacchina_filt"
Type="Int32" />
</FilterParameters>
Projects/WebGIM/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
+5 -1
View File
@@ -76,9 +76,13 @@ public partial class mod_mtzPrevPending : ApplicationUserControl
{
ods.FilterExpression += " AND (idxTipo = {1})";
}
if (memLayer.ML.isInSessionObject("idxImpianto_filt"))
{
ods.FilterExpression += " AND (idxImpianto = {2})";
}
if (memLayer.ML.isInSessionObject("idxMacchina_filt"))
{
ods.FilterExpression += " AND (idxMacchina = {2})";
ods.FilterExpression += " AND (idxMacchina = {3})";
}
ods.DataBind();
}
Projects/WebGIM/GIM_site/bin/GIM_site.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/VersGen/WebGIM.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.4.247.484")]
[assembly: AssemblyFileVersion("1.4.247.484")]
[assembly: AssemblyVersion("1.4.249.510")]
[assembly: AssemblyFileVersion("1.4.249.510")]
[assembly: AssemblyCopyright("Steamware © 2006-2015")]
[assembly: AssemblyCompany("Steamware")]
Projects/WebGIM/VersGen/WebGIM.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.4.247.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.4.247.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.4.249.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.4.249.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+