diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo index d90ce9b..d5d460f 100644 Binary files a/ETS-WS/ETS-WS.suo and b/ETS-WS/ETS-WS.suo differ diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index a3c1211..08994c8 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -27,8 +27,8 @@ - - + + diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx index d061593..304cf70 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx @@ -51,15 +51,15 @@ textEmWidht="15" Visible="false" />
-
- +
+ - + +  / 
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs index 9ae260c..0869891 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs @@ -25,10 +25,7 @@ namespace ETS_WS.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { - if (!Page.IsPostBack) - { - updateVisual(); - } + updateVisual(); tacCommesse.eh_valSelezionato += new EventHandler(tacCommesse_eh_valSelezionato); tacFasi.eh_valSelezionato += new EventHandler(tacFasi_eh_valSelezionato); tacFonti.eh_valSelezionato += new EventHandler(tacFonti_eh_valSelezionato); @@ -49,6 +46,7 @@ namespace ETS_WS.WebUserControls { utils.obj.emptySessionVal("srcOggetto"); } + updateVisual(); } /// /// salvo ricerca fonte @@ -65,6 +63,7 @@ namespace ETS_WS.WebUserControls { utils.obj.emptySessionVal("srcFonte"); } + updateVisual(); } /// /// salvo ricerca fase @@ -81,6 +80,7 @@ namespace ETS_WS.WebUserControls { utils.obj.emptySessionVal("srcFase"); } + updateVisual(); } /// /// salvo ricerca commessa @@ -97,27 +97,18 @@ namespace ETS_WS.WebUserControls { utils.obj.emptySessionVal("srcCommessa"); } + updateVisual(); } /// /// aggiorna tutti i valori visualizzati /// private void updateVisual() { - //// verifico attivazione button submin (ovvero ci sono tutti i valori...) - //btnSubmit.Visible = (tacCommesse.valore != "" && tacFasi.valore != "" && tacFonti.label != "" && txtOggetto.Text != ""); + // aggiorno label num records + lblTotRec.Text = utils.obj.taDoc.getBySearch_Count(0, 0, utils.obj.StringSessionObj("srcCommessa"), utils.obj.StringSessionObj("srcFase"), utils.obj.StringSessionObj("srcFonte"), utils.obj.StringSessionObj("srcOggetto"), "", txtSearchAll.Text.Trim(), 0, 0, "").ToString(); } - /// - /// - /// - /// - /// - protected void txtOggetto_TextChanged(object sender, EventArgs e) - { - updateVisual(); - } - /// /// salvo la ricerca libera... /// @@ -127,6 +118,7 @@ namespace ETS_WS.WebUserControls { // salvo valore selezionato utils.obj.setSessionVal("srcSearchAll", txtSearchAll.Text.Trim()); + updateVisual(); } /// /// imposto visibilità campo ricerca da selezione check @@ -147,6 +139,7 @@ namespace ETS_WS.WebUserControls utils.obj.emptySessionVal("srcCommessa"); } tacCommesse.Visible = chkCommessa.Checked; + updateVisual(); } /// /// imposto visibilità campo ricerca da selezione check @@ -167,6 +160,7 @@ namespace ETS_WS.WebUserControls utils.obj.emptySessionVal("srcFase"); } tacFasi.Visible = chkFase.Checked; + updateVisual(); } /// /// imposto visibilità campo ricerca da selezione check @@ -187,6 +181,7 @@ namespace ETS_WS.WebUserControls utils.obj.emptySessionVal("srcFonte"); } tacFonti.Visible = chkFonte.Checked; + updateVisual(); } /// /// imposto visibilità campo ricerca da selezione check @@ -207,8 +202,13 @@ namespace ETS_WS.WebUserControls utils.obj.emptySessionVal("srcOggetto"); } tacOggetto.Visible = chkOggetto.Checked; + updateVisual(); } - + /// + /// selezionata nuova dim pagina + /// + /// + /// protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) { utils.obj.setSessionVal("srcPageSize", ddlPageSize.SelectedValue); @@ -217,5 +217,6 @@ namespace ETS_WS.WebUserControls eh_pageResize(this, new EventArgs()); } } + } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs index b2e7b2b..79f43d5 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs @@ -119,5 +119,14 @@ namespace ETS_WS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlPageSize; + + /// + /// lblTotRec control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTotRec; } } diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index b908b44..53206d0 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ