From c5ae78e8488c0fba365f00c5ceffd36c0d693986 Mon Sep 17 00:00:00 2001 From: ermanno Date: Fri, 27 Nov 2009 17:10:10 +0000 Subject: [PATCH] aggiunta modifica per export dati excel con funzionamento filtro git-svn-id: https://keyhammer.ath.cx/svn/WebGIM/trunk@153 3e04ef4b-3b25-4b6c-be27-bb5389ca777b --- WebSites/WebGIM/App_Code/DS_utility.xsd | 660 ++++++++++-------- WebSites/WebGIM/App_Code/DS_utility.xss | 35 +- .../WebUserControls/mod_mtzPrevPending.ascx | 6 +- .../mod_mtzPrevPending.ascx.cs | 28 +- WebSites/WebGIM/mtzProg.aspx.cs | 5 + 5 files changed, 433 insertions(+), 301 deletions(-) diff --git a/WebSites/WebGIM/App_Code/DS_utility.xsd b/WebSites/WebGIM/App_Code/DS_utility.xsd index 818ce3a..6a18184 100644 --- a/WebSites/WebGIM/App_Code/DS_utility.xsd +++ b/WebSites/WebGIM/App_Code/DS_utility.xsd @@ -382,7 +382,7 @@ WHERE (conditio = @conditio) - + @@ -420,6 +420,43 @@ ORDER BY data + + + + + + SELECT idxPending, codImpianto, nomeImpianto, codMacchina, nomeMacchina, data, descrizione, descrPriorita, isFermo, descrTipo, idxTipo FROM dbo.v_mtzProgPendingExp + + + + + + + + + + + + + + + + + + + + + + + SELECT codImpianto, codMacchina, data, descrPriorita, descrTipo, descrizione, idxPending, isFermo, nomeImpianto, nomeMacchina FROM v_mtzProgPendingExp WHERE (data <= @dataMax) ORDER BY data + + + + + + + + @@ -431,8 +468,8 @@ ORDER BY data - - + + @@ -445,23 +482,23 @@ ORDER BY data - - + + - + - - + + @@ -474,8 +511,8 @@ ORDER BY data - - + + @@ -486,75 +523,6 @@ ORDER BY data - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -565,198 +533,11 @@ ORDER BY data + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -770,29 +551,150 @@ ORDER BY data - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -817,34 +719,228 @@ ORDER BY data - + - - + - + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -899,8 +995,8 @@ ORDER BY data - - + + diff --git a/WebSites/WebGIM/App_Code/DS_utility.xss b/WebSites/WebGIM/App_Code/DS_utility.xss index 8891e4a..335f6e7 100644 --- a/WebSites/WebGIM/App_Code/DS_utility.xss +++ b/WebSites/WebGIM/App_Code/DS_utility.xss @@ -4,24 +4,25 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebSites/WebGIM/WebUserControls/mod_mtzPrevPending.ascx b/WebSites/WebGIM/WebUserControls/mod_mtzPrevPending.ascx index 53ef13c..d2f3081 100644 --- a/WebSites/WebGIM/WebUserControls/mod_mtzPrevPending.ascx +++ b/WebSites/WebGIM/WebUserControls/mod_mtzPrevPending.ascx @@ -4,7 +4,7 @@
-
+
@@ -36,6 +36,10 @@ 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}%') "> + +
diff --git a/WebSites/WebGIM/WebUserControls/mod_mtzPrevPending.ascx.cs b/WebSites/WebGIM/WebUserControls/mod_mtzPrevPending.ascx.cs index c484223..5c3648f 100644 --- a/WebSites/WebGIM/WebUserControls/mod_mtzPrevPending.ascx.cs +++ b/WebSites/WebGIM/WebUserControls/mod_mtzPrevPending.ascx.cs @@ -43,7 +43,7 @@ public partial class mod_mtzPrevPending : ApplicationUserControl if (!Page.IsPostBack) { hlExportExcel.Text = traduci("hlExportExcel"); - hlExportExcel.NavigateUrl = "./ExcelExportMtzPrevPending.aspx"; + hlExportExcel.NavigateUrl = "~/ExcelExportMtzPrevPending.aspx"; // vedo di rigenerare la coda... // verifico se devo generare degli interventi di MTZ programmata.. try @@ -56,4 +56,30 @@ public partial class mod_mtzPrevPending : ApplicationUserControl } } } + + /// + /// aggiorno il controllo + /// + public void doUpdate() + { + checkFixOds(); + //grView.DataBind(); + } + + /// + /// sistemo filtraggio con valori selezionati + /// + private void checkFixOds() + { + ods.FilterExpression = "( codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR descrizione 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.DataBind(); + } } \ No newline at end of file diff --git a/WebSites/WebGIM/mtzProg.aspx.cs b/WebSites/WebGIM/mtzProg.aspx.cs index fdca706..7cdde8e 100644 --- a/WebSites/WebGIM/mtzProg.aspx.cs +++ b/WebSites/WebGIM/mtzProg.aspx.cs @@ -23,7 +23,12 @@ public partial class mtzProg : System.Web.UI.Page void mod_filtraMtzProg1_eh_newFiltroSel(object sender, EventArgs e) { // richiamo update delle varie parti del mio modulo + + // update della visualizzazione normale mod_elencoMtzProg1.doUpdate(); + + // update della visualizzazione pre-export in excel + mod_mtzPrevPending1.doUpdate(); } private void traduciObj()