completato filtraggio int mtz prev con export excel

GIM_site/ExcelExportMtzPrevPending.aspx

@@ -28,7 +28,7 @@
                 <asp:BoundField DataField="descrTipo" HeaderText="descrTipo" SortExpression="descrTipo" />
             </Columns>
         </asp:GridView>
-        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_mtzProgPendingExpTableAdapter"
+        <%--<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_mtzProgPendingExpTableAdapter"
             OldValuesParameterFormatString="original_{0}" FilterExpression=" (codImpianto LIKE '%{0}%') OR (nomeImpianto LIKE '%{0}%') OR (codMacchina LIKE '%{0}%') OR (nomeMacchina LIKE '%{0}%') OR (descrizione LIKE '%{0}%') OR (descrPriorita LIKE '%{0}%') OR (descrTipo LIKE '%{0}%') ">
             <FilterParameters>
                 <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
@@ -37,7 +37,17 @@
                 <asp:SessionParameter DefaultValue="0" Name="idxMacchina" SessionField="idxMacchina_filt"
                     Type="Int32" />
             </FilterParameters>
-        </asp:ObjectDataSource>
+        </asp:ObjectDataSource>--%>
+        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getBySearch" TypeName="GIM_data.DS_utilityTableAdapters.v_mtzProgPendingExpTableAdapter" OldValuesParameterFormatString="original_{0}">
+        <SelectParameters>
+            <asp:SessionParameter DefaultValue="%" Name="ricerca" SessionField="valoreCercato" Type="String" />
+            <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" />
+            <asp:SessionParameter DefaultValue="" Name="inizio" SessionField="_inizio" Type="DateTime" />
+            <asp:SessionParameter DefaultValue="" Name="fine" SessionField="_fine" Type="DateTime" />
+        </SelectParameters>
+    </asp:ObjectDataSource>
     </div>
     </form>
 </body>

GIM_site/ExcelExportMtzPrevPending.aspx.cs

@@ -94,14 +94,14 @@ public partial class ExcelExportMtzPrevPending : System.Web.UI.Page
     /// </summary>
     private void checkFixOds()
     {
-        ods.FilterExpression = "( (codImpianto LIKE '%{0}%') OR (nomeImpianto LIKE '%{0}%') OR (codMacchina LIKE '%{0}%') OR (nomeMacchina LIKE '%{0}%') OR (descrizione LIKE '%{0}%') OR (descrPriorita LIKE '%{0}%') OR (descrTipo LIKE '%{0}%') )";
-        if (memLayer.ML.isInSessionObject("idxTipo_filt"))
-        {
-            ods.FilterExpression += " AND (idxTipo = {1})";
-        }
-        if (memLayer.ML.isInSessionObject("idxMacchina_filt"))
-        {
-            ods.FilterExpression += " AND (idxMacchina = {2})";
-        }
+        //ods.FilterExpression = "( (codImpianto LIKE '%{0}%') OR (nomeImpianto LIKE '%{0}%') OR (codMacchina LIKE '%{0}%') OR (nomeMacchina LIKE '%{0}%') OR (descrizione LIKE '%{0}%') OR (descrPriorita LIKE '%{0}%') OR (descrTipo LIKE '%{0}%') )";
+        //if (memLayer.ML.isInSessionObject("idxTipo_filt"))
+        //{
+        //    ods.FilterExpression += " AND (idxTipo = {1})";
+        //}
+        //if (memLayer.ML.isInSessionObject("idxMacchina_filt"))
+        //{
+        //    ods.FilterExpression += " AND (idxMacchina = {2})";
+        //}
     }
 }

GIM_site/WebUserControls/mod_mtzPrevPending.ascx

@@ -14,7 +14,7 @@
         <Columns>
             <asp:BoundField DataField="data" HeaderText="data" SortExpression="data" DataFormatString="{0:dd/MM/yyyy}"
                 HtmlEncode="false" />
-            <asp:TemplateField HeaderText="nomeImpianto" SortExpression="nomeImpianto">
+            <asp:TemplateField HeaderText="nomeImpianto" SortExpression="nomeImpianto" ItemStyle-Width="10em">
                 <ItemTemplate>
                     <asp:Label ID="Label1" runat="server" Text='<%# Eval("codImpianto") %>' />
                     <br />
@@ -22,7 +22,7 @@
                         <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" ItemStyle-Width="15em">
                 <ItemTemplate>
                     <asp:Label ID="Label3" runat="server" Text='<%# Eval("codMacchina") %>' />
                     <br />
@@ -37,8 +37,7 @@
         </Columns>
     </asp:GridView>
     <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
-    <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getBySearch" TypeName="GIM_data.DS_utilityTableAdapters.v_mtzProgPendingExpTableAdapter"
-        OldValuesParameterFormatString="original_{0}">
+    <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getBySearch" TypeName="GIM_data.DS_utilityTableAdapters.v_mtzProgPendingExpTableAdapter" OldValuesParameterFormatString="original_{0}">
         <SelectParameters>
             <asp:SessionParameter DefaultValue="%" Name="ricerca" SessionField="valoreCercato" Type="String" />
             <asp:SessionParameter DefaultValue="0" Name="idxTipo" SessionField="idxTipo_filt" Type="Int32" />

GIM_site/mtzProg.aspx

@@ -14,7 +14,7 @@
 <asp:Content runat="server" ID="FeaturedContent" ContentPlaceHolderID="FeaturedContent">
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
-    <div class="container">
+    <div class="container-fluid">
         <div class="row panel panel-default" style="margin: 4px 8px;">
             <div class="panel-heading">
                 <div class="row" style="margin: 2px 4px;">