@@ -110,10 +110,13 @@
DeleteMethod="Delete" InsertMethod="Insert" UpdateMethod="Update">
-
+
+
+ <%--
+ PropertyName="valoreInt" Type="Int32" />--%>
diff --git a/WebSites/WebGIM/WebUserControls/mod_elencoMtzProg.ascx.cs b/WebSites/WebGIM/WebUserControls/mod_elencoMtzProg.ascx.cs
index ce3a4d3..fa40f8c 100644
--- a/WebSites/WebGIM/WebUserControls/mod_elencoMtzProg.ascx.cs
+++ b/WebSites/WebGIM/WebUserControls/mod_elencoMtzProg.ascx.cs
@@ -24,8 +24,8 @@ public partial class mod_elencoMtzProg : ApplicationUserControl
{
base.traduciObj();
btnShowNew.Text = traduci("btnShowNew");
- lblFiltMacchina.Text = traduci("lblFiltMacchina");
- lblFiltTipo.Text = traduci("lblFiltTipo");
+ //lblFiltMacchina.Text = traduci("lblFiltMacchina");
+ //lblFiltTipo.Text = traduci("lblFiltTipo");
}
///
@@ -54,6 +54,7 @@ public partial class mod_elencoMtzProg : ApplicationUserControl
///
public void doUpdate()
{
+ checkFixOds();
grView.DataBind();
}
///
@@ -205,14 +206,14 @@ public partial class mod_elencoMtzProg : ApplicationUserControl
{
base.OnInit(e);
_idxGridView = "idxIntPro";
- if (!Page.IsPostBack)
- {
- mod_filtroImpianto.ods = odsImpianti;
- mod_filtroMacchina.ods = odsMacchine;
- mod_filtroTipo.ods = odsTipo;
- }
- mod_filtroTipo.eh_selValore += new EventHandler(mod_filtroTipo_eh_selValore);
- mod_filtroMacchina.eh_selValore += new EventHandler(mod_filtroMacchina_eh_selValore);
+ //if (!Page.IsPostBack)
+ //{
+ // mod_filtroImpianto.ods = odsImpianti;
+ // mod_filtroMacchina.ods = odsMacchine;
+ // mod_filtroTipo.ods = odsTipo;
+ //}
+ //mod_filtroTipo.eh_selValore += new EventHandler(mod_filtroTipo_eh_selValore);
+ //mod_filtroMacchina.eh_selValore += new EventHandler(mod_filtroMacchina_eh_selValore);
}
void mod_filtroMacchina_eh_selValore(object sender, EventArgs e)
@@ -231,39 +232,14 @@ public partial class mod_elencoMtzProg : ApplicationUserControl
private void checkFixOds()
{
ods.FilterExpression = "( codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR descrizione LIKE '%{0}%' )";
- if (mod_filtroTipo.valoreInt != 0)
+ if (memLayer.ML.isInSessionObject("idxTipo_filt"))
{
ods.FilterExpression += " AND (idxTipo = {1})";
}
- if (mod_filtroMacchina.valoreInt != 0)
+ if (memLayer.ML.isInSessionObject("idxMacchina_filt"))
{
ods.FilterExpression += " AND (idxMacchina = {2})";
}
ods.DataBind();
}
- ///
- /// chiamato post modifica valore check/selezione nel selettore filtro impianto
- ///
- ///
- ///
- public void eh_selectedImpianto(object sender, EventArgs e)
- {
- if (mod_filtroImpianto.valoreInt != 0)
- {
- if (!mod_filtroMacchina.Visible)
- {
- mod_filtroMacchina.Visible = true;
- }
- else
- {
- mod_filtroMacchina.reset();
- }
- mod_filtroMacchina.ods = odsMacchine;
- }
- else
- {
- mod_filtroMacchina.reset();
- mod_filtroMacchina.Visible = false;
- }
- }
}
diff --git a/WebSites/WebGIM/WebUserControls/mod_filtraMtzProg.ascx b/WebSites/WebGIM/WebUserControls/mod_filtraMtzProg.ascx
new file mode 100644
index 0000000..3d7da81
--- /dev/null
+++ b/WebSites/WebGIM/WebUserControls/mod_filtraMtzProg.ascx
@@ -0,0 +1,40 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_filtraMtzProg.ascx.cs" Inherits="WebUserControls_mod_filtraMtzProg" %>
+<%@ Register src="mod_filtro.ascx" tagname="mod_filtro" tagprefix="uc1" %>
+
\ No newline at end of file
diff --git a/WebSites/WebGIM/WebUserControls/mod_filtraMtzProg.ascx.cs b/WebSites/WebGIM/WebUserControls/mod_filtraMtzProg.ascx.cs
new file mode 100644
index 0000000..1a0b3ff
--- /dev/null
+++ b/WebSites/WebGIM/WebUserControls/mod_filtraMtzProg.ascx.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using SteamWare;
+
+public partial class WebUserControls_mod_filtraMtzProg : ApplicationUserControl
+{
+ ///
+ /// evento che segnala la disponibilità di un nuovo stato di filtraggio salvato in sessione...
+ ///
+ public event EventHandler eh_newFiltroSel;
+
+ // variabile per gridview - potrebbe non servire più FARE!!!
+ protected string _idxGridView;
+
+ ///
+ /// inizializzazione valori di default
+ ///
+ ///
+ protected override void OnInit(EventArgs e)
+ {
+ base.OnInit(e);
+ _idxGridView = "idxIntPro";
+ if (!Page.IsPostBack)
+ {
+ mod_filtroImpianto.ods = odsImpianti;
+ mod_filtroMacchina.ods = odsMacchine;
+ mod_filtroTipo.ods = odsTipo;
+ }
+ 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);
+ }
+
+ void mod_filtroImpianto_eh_selValore(object sender, EventArgs e)
+ {
+ // salvo in sessione il valore selezionato...
+ if (mod_filtroImpianto.valoreInt == 0)
+ {
+ memLayer.ML.emptySessionVal("idxMacchina_filt");
+ }
+ // chiamo procedura che innalza l'evento
+ raiseEvent();
+ }
+
+ ///
+ /// chiamato post modifica valore check/selezione nel selettore filtro impianto
+ ///
+ ///
+ ///
+ public void eh_selectedImpianto(object sender, EventArgs e)
+ {
+ if (mod_filtroImpianto.valoreInt != 0)
+ {
+ if (!mod_filtroMacchina.Visible)
+ {
+ mod_filtroMacchina.Visible = true;
+ }
+ else
+ {
+ mod_filtroMacchina.reset();
+ }
+ mod_filtroMacchina.ods = odsMacchine;
+ }
+ else
+ {
+ mod_filtroMacchina.reset();
+ mod_filtroMacchina.Visible = false;
+ }
+ }
+
+ void mod_filtroMacchina_eh_selValore(object sender, EventArgs e)
+ {
+ // salvo in sessione il valore selezionato...
+ if (mod_filtroMacchina.valoreInt != 0)
+ {
+ memLayer.ML.setSessionVal("idxMacchina_filt", mod_filtroMacchina.valoreInt);
+ }
+ else
+ {
+ memLayer.ML.emptySessionVal("idxMacchina_filt");
+ }
+ // chiamo procedura che innalza l'evento
+ raiseEvent();
+ }
+ void mod_filtroTipo_eh_selValore(object sender, EventArgs e)
+ {
+ // salvo in sessione il valore selezionato...
+ if (mod_filtroTipo.valoreInt != 0)
+ {
+ memLayer.ML.setSessionVal("idxTipo_filt", mod_filtroTipo.valoreInt);
+ }
+ else
+ {
+ memLayer.ML.emptySessionVal("idxTipo_filt");
+ }
+ // chiamo procedura che innalza l'evento
+ raiseEvent();
+ }
+
+ private void raiseEvent()
+ {
+ if (eh_newFiltroSel != null)
+ {
+ eh_newFiltroSel(this, new EventArgs());
+ }
+ }
+
+}
diff --git a/WebSites/WebGIM/mtzProg.aspx b/WebSites/WebGIM/mtzProg.aspx
index 922e637..db3f076 100644
--- a/WebSites/WebGIM/mtzProg.aspx
+++ b/WebSites/WebGIM/mtzProg.aspx
@@ -6,7 +6,9 @@
<%@ Register Src="~/WebUserControls/mod_dettMtzProg.ascx" TagName="mod_dettMtzProg" TagPrefix="uc2" %>
<%@ Register Src="~/WebUserControls/mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc3" %>
<%@ Register Src="~/WebUserControls/mod_mtzPrevPending.ascx" tagname="mod_mtzPrevPending" tagprefix="uc4" %>
+<%@ Register src="WebUserControls/mod_filtraMtzProg.ascx" tagname="mod_filtraMtzProg" tagprefix="uc5" %>
+
diff --git a/WebSites/WebGIM/mtzProg.aspx.cs b/WebSites/WebGIM/mtzProg.aspx.cs
index 9f14e5e..fdca706 100644
--- a/WebSites/WebGIM/mtzProg.aspx.cs
+++ b/WebSites/WebGIM/mtzProg.aspx.cs
@@ -11,9 +11,21 @@ public partial class mtzProg : System.Web.UI.Page
{
mod_elencoMtzProg1.eh_newReq += new EventHandler(mod_elencoMtzProg1_eh_newReq);
mod_dettMtzProg1.eh_newInserted += new EventHandler(mod_dettMtzProg1_eh_newInserted);
+ mod_filtraMtzProg1.eh_newFiltroSel += new EventHandler(mod_filtraMtzProg1_eh_newFiltroSel);
traduciObj();
}
+ ///
+ /// è stato chiamato evento "nuovo filtro" e quindi aggiorno
+ ///
+ ///
+ ///
+ void mod_filtraMtzProg1_eh_newFiltroSel(object sender, EventArgs e)
+ {
+ // richiamo update delle varie parti del mio modulo
+ mod_elencoMtzProg1.doUpdate();
+ }
+
private void traduciObj()
{
((AjaxControlToolkit.TabPanel)TabContainer1.FindControl("TabProgrammaMtz")).HeaderText = traduci("TabProgrammaMtz");