diff --git a/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs b/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs
index 9fde4c9..118bb82 100644
--- a/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs
+++ b/GIM_site/WebUserControls/mod_filtraMtzProg.ascx.cs
@@ -31,13 +31,20 @@ public partial class WebUserControls_mod_filtraMtzProg : SteamWare.UserControl
mod_filtroTipo.eh_selValore += new EventHandler(mod_filtroTipo_eh_selValore);
mod_filtroMacchina.eh_selValore += new EventHandler(mod_filtroMacchina_eh_selValore);
mod_filtroImpianto.eh_selValore += new EventHandler(mod_filtroImpianto_eh_selValore);
+ mod_periodoAnalisi.eh_doUpdate += new EventHandler(Mod_periodoAnalisi_eh_doUpdate);
}
+
+ private void Mod_periodoAnalisi_eh_doUpdate(object sender, EventArgs e)
+ {
+ raiseEvent();
+ }
+
///
/// verifica se sia possibile preimpostare i valori filtrati...
///
private void checkSelVal()
{
- if(memLayer.ML.isInSessionObject("idxMacchina_filt"))
+ if (memLayer.ML.isInSessionObject("idxMacchina_filt"))
{
mod_filtroMacchina.Visible = true;
}
@@ -155,4 +162,18 @@ public partial class WebUserControls_mod_filtraMtzProg : SteamWare.UserControl
mod_periodoAnalisi.Visible = value;
}
}
+ ///
+ /// Imposta periodo del selettore
+ ///
+ public datario.periodo periodo
+ {
+ get
+ {
+ return mod_periodoAnalisi.periodo;
+ }
+ set
+ {
+ mod_periodoAnalisi.periodo = value;
+ }
+ }
}
diff --git a/GIM_site/WebUserControls/mod_mtzPrevPending.ascx b/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
index 237f9f9..9c8cd29 100644
--- a/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
+++ b/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
@@ -4,7 +4,7 @@
-
+
@@ -37,15 +37,16 @@
-
-
-
+
+
+
-
-
-
+
+
+
+
diff --git a/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs b/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
index 125313c..023a054 100644
--- a/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
+++ b/GIM_site/WebUserControls/mod_mtzPrevPending.ascx.cs
@@ -71,27 +71,6 @@ public partial class mod_mtzPrevPending : ApplicationUserControl
///
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("idxImpianto_filt"))
- {
- ods.FilterExpression += " AND (idxImpianto = {2})";
- }
- if (memLayer.ML.isInSessionObject("idxMacchina_filt"))
- {
- ods.FilterExpression += " AND (idxMacchina = {3})";
- }
- if (memLayer.ML.isInSessionObject("_inizio"))
- {
- ods.FilterExpression += " AND (data >= {4})";
- }
- if (memLayer.ML.isInSessionObject("_fine"))
- {
- ods.FilterExpression += " AND (data <= {5})";
- }
ods.DataBind();
}
///
diff --git a/GIM_site/WebUserControls/mod_periodoAnalisi.ascx b/GIM_site/WebUserControls/mod_periodoAnalisi.ascx
index 9096f87..77b9395 100644
--- a/GIM_site/WebUserControls/mod_periodoAnalisi.ascx
+++ b/GIM_site/WebUserControls/mod_periodoAnalisi.ascx
@@ -22,14 +22,16 @@