From cec00407089807256f3aeb154fb2c35c18f6e9db Mon Sep 17 00:00:00 2001
From: samuele <samuele@3e04ef4b-3b25-4b6c-be27-bb5389ca777b>
Date: Thu, 29 Jan 2009 08:28:35 +0000
Subject: [PATCH] Update grafico x filtraggio

git-svn-id: https://keyhammer.ath.cx/svn/WebGIM/trunk@49 3e04ef4b-3b25-4b6c-be27-bb5389ca777b
---
 WebSites/WebGIM/mod_elencoMtzProg.ascx    | 58 ++++++++++++-----------
 WebSites/WebGIM/mod_elencoMtzProg.ascx.cs |  4 +-
 WebSites/WebGIM/mod_filtro.ascx           |  6 +--
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/WebSites/WebGIM/mod_elencoMtzProg.ascx b/WebSites/WebGIM/mod_elencoMtzProg.ascx
index efc9297..710a246 100644
--- a/WebSites/WebGIM/mod_elencoMtzProg.ascx
+++ b/WebSites/WebGIM/mod_elencoMtzProg.ascx
@@ -4,36 +4,38 @@
 <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
 <div style="width: 100%; background: #cdcdcd;" class="txtMini">
     <table cellpadding="5px">
-        <tr>
-            <td>
-                <asp:Label runat="server" ID="lblFiltTipo" />
-            </td>
-            <td colspan="2">
-                <asp:Label runat="server" ID="lblFiltMacchina" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <uc1:mod_filtro ID="mod_filtroTipo" runat="server" css="txtMini" />
-                <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="Original_{0}"
-                    SelectMethod="GetData" TypeName="DS_utilityTableAdapters.v_selTipoGuastoTableAdapter">
-                </asp:ObjectDataSource>
+        <tr valign="top">
+            <td style="width: 250px;">
+                <div>
+                    <asp:Label runat="server" ID="lblFiltTipo" />
+                </div>
+                <div>
+                    <uc1:mod_filtro ID="mod_filtroTipo" runat="server" css="txtMini" />
+                    <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="Original_{0}"
+                        SelectMethod="GetData" TypeName="DS_utilityTableAdapters.v_selTipoGuastoTableAdapter">
+                    </asp:ObjectDataSource>
+                </div>
             </td>
             <td>
-                <uc1:mod_filtro ID="mod_filtroImpianto" runat="server" css="txtMini" Oneh_selValore="eh_selectedImpianto" />
-                <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}"
-                    SelectMethod="GetData" TypeName="DS_utilityTableAdapters.v_selImpiantiTableAdapter">
-                </asp:ObjectDataSource>
-            </td>
-            <td>
-                <uc1:mod_filtro ID="mod_filtroMacchina" runat="server" css="txtMini" Visible="false" />
-                <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}"
-                    SelectMethod="getByConditio" TypeName="DS_utilityTableAdapters.v_selMacchineTableAdapter">
-                    <SelectParameters>
-                        <asp:ControlParameter ControlID="mod_filtroImpianto" DefaultValue="0" Name="conditio"
-                            PropertyName="valoreInt" Type="Int32" />
-                    </SelectParameters>
-                </asp:ObjectDataSource>
+                <div>
+                    <asp:Label runat="server" ID="lblFiltMacchina" />
+                </div>
+                <div>
+                    <uc1:mod_filtro ID="mod_filtroImpianto" runat="server" css="txtMini" Oneh_selValore="eh_selectedImpianto" />
+                    <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}"
+                        SelectMethod="GetData" TypeName="DS_utilityTableAdapters.v_selImpiantiTableAdapter">
+                    </asp:ObjectDataSource>
+                </div>
+                <div>
+                    <uc1:mod_filtro ID="mod_filtroMacchina" runat="server" css="txtMini" Visible="false" />
+                    <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}"
+                        SelectMethod="getByConditio" TypeName="DS_utilityTableAdapters.v_selMacchineTableAdapter">
+                        <SelectParameters>
+                            <asp:ControlParameter ControlID="mod_filtroImpianto" DefaultValue="0" Name="conditio"
+                                PropertyName="valoreInt" Type="Int32" />
+                        </SelectParameters>
+                    </asp:ObjectDataSource>
+                </div>
             </td>
         </tr>
     </table>
diff --git a/WebSites/WebGIM/mod_elencoMtzProg.ascx.cs b/WebSites/WebGIM/mod_elencoMtzProg.ascx.cs
index ce7fc88..318a645 100644
--- a/WebSites/WebGIM/mod_elencoMtzProg.ascx.cs
+++ b/WebSites/WebGIM/mod_elencoMtzProg.ascx.cs
@@ -256,8 +256,7 @@ public partial class mod_elencoMtzProg : ApplicationUserControl
         {
             if (!mod_filtroMacchina.Visible)
             {
-                lblFiltMacchina.Visible = true;
-                mod_filtroMacchina.Visible = true;
+               mod_filtroMacchina.Visible = true;
             }
             else
             {
@@ -268,7 +267,6 @@ public partial class mod_elencoMtzProg : ApplicationUserControl
         else
         {
             mod_filtroMacchina.reset();
-            lblFiltMacchina.Visible = false;
             mod_filtroMacchina.Visible = false;
         }
     }
diff --git a/WebSites/WebGIM/mod_filtro.ascx b/WebSites/WebGIM/mod_filtro.ascx
index 56942b1..7bb4e08 100644
--- a/WebSites/WebGIM/mod_filtro.ascx
+++ b/WebSites/WebGIM/mod_filtro.ascx
@@ -1,7 +1,7 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_filtro.ascx.cs" Inherits="mod_filtro" %>
-<asp:CheckBox ID="chkFilt" runat="server" Text="---" Checked="false" AutoPostBack="True" CssClass='<%# css %>'
+<asp:CheckBox ID="chkFilt" runat="server" Checked="false" AutoPostBack="True" CssClass='<%# css %>'
     OnCheckedChanged="chkFilt_CheckedChanged" />
-<asp:DropDownList ID="dlFilt" runat="server" Visible="False" DataTextField="label" CssClass='<%# css %>'
-    DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="dlFilt_SelectedIndexChanged">
+<asp:DropDownList ID="dlFilt" runat="server" Visible="False" DataTextField="label"
+    CssClass='<%# css %>' DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="dlFilt_SelectedIndexChanged">
 </asp:DropDownList>
 <asp:Label ID="where" runat="server" Visible="false" Text="" />
\ No newline at end of file