diff --git a/PROJ-ETS/PROJ-ETS/Progetti.aspx b/PROJ-ETS/PROJ-ETS/Progetti.aspx index f795c9b..2266f1f 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.aspx +++ b/PROJ-ETS/PROJ-ETS/Progetti.aspx @@ -6,16 +6,16 @@
-
+ <%--
--%> -
+ <%--
-
+
--%>
diff --git a/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs b/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs index 4ad98f2..af94373 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs +++ b/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs @@ -28,8 +28,10 @@ namespace PROJ_ETS utils.obj.emptySessionVal("nomeCli_sel"); } } - mod_progetti1.eh_selValore +=mod_progetti1_eh_selValore; - mod_progetti1.eh_resetSelezione+=mod_progetti1_eh_resetSelezione; +#if false + mod_progetti1.eh_selValore +=mod_progetti1_eh_selValore; +#endif + mod_progetti1.eh_resetSelezione += mod_progetti1_eh_resetSelezione; } /// /// reset selezione: nascondo dettaglio! @@ -38,8 +40,9 @@ namespace PROJ_ETS /// private void mod_progetti1_eh_resetSelezione(object sender, EventArgs e) { - showDetail(false); + mod_progetti1.showDetail(false); } +#if false /// /// mostra dettagli /// @@ -48,7 +51,7 @@ namespace PROJ_ETS { mod_commesse1.Visible = visibile; btnSposta.Visible = visibile; - } + } /// /// selezionato progetto: mostro commesse + fasi associate! /// @@ -95,5 +98,6 @@ namespace PROJ_ETS utils.obj.setSessionVal("idxCli_sel", idxCli); utils.obj.setSessionVal("nomeCli_sel", nomeCli); } +#endif } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/Progetti.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/Progetti.aspx.designer.cs index 2ea022f..eb01c23 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.aspx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/Progetti.aspx.designer.cs @@ -20,23 +20,5 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::PROJ_ETS.WebUserControls.mod_progetti mod_progetti1; - - /// - /// mod_commesse1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::PROJ_ETS.WebUserControls.mod_commesse mod_commesse1; - - /// - /// btnSposta control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button btnSposta; } } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx index 783b84f..816e17c 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx @@ -1,6 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_progetti.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_progetti" %> <%@ Register Src="mod_periodoAnalisi.ascx" TagName="mod_periodoAnalisi" TagPrefix="uc1" %> <%@ Register Src="mod_autocomplete.ascx" TagName="mod_autocomplete" TagPrefix="uc2" %> +<%@ Register Src="mod_commesse.ascx" TagName="mod_commesse" TagPrefix="uc3" %>
@@ -15,140 +16,144 @@
+
+ + +
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
-
- - +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+
+ + +
-
-
- -
- - -
- Cliente:
- -
-
- Nome progetto
- -
-
-
- descrizione:
- +
+
-
- Attivo: + + +
+ Cliente:
+ +
+
+ Nome progetto
+ +
+
+
+ descrizione:
+ +
+
+ Attivo: +
-
- + - -
- Cliente:
- -
-
- Nome progetto
- -
-
-
- descrizione:
- + +
+ Cliente:
+
-
- +
+ Nome progetto
+ +
+
+
+ descrizione:
+ +
+
+ - + - - - - - - - - / + + + + + + + + / -
- - - - - - - / +
+ + + + + + + / -
- -
- - - - <%-- +
+ + + + + + <%-- @@ -158,65 +163,72 @@ --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +
+ +
+ +
+
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs index 6209119..49ce8f6 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.cs @@ -200,6 +200,18 @@ namespace PROJ_ETS.WebUserControls showVuoti = true; } filtroCli.eh_valSelezionato += filtroCli_eh_valSelezionato; + filtroCli.eh_reset += filtroCli_eh_reset; + } + + void filtroCli_eh_reset(object sender, EventArgs e) + { + utils.obj.setSessionVal("idxCli_sel", 0); + grView.SelectedIndex = -1; + grView.DataBind(); + if (eh_resetSelezione != null) + { + eh_resetSelezione(this, new EventArgs()); + } } /// /// selezionato filtro cliente @@ -280,10 +292,14 @@ namespace PROJ_ETS.WebUserControls protected void grView_SelectedIndexChanged(object sender, EventArgs e) { idxProgetto = Convert.ToInt32(grView.SelectedDataKey["idxProgetto"]); +#if false if (eh_selValore != null) { eh_selValore(this, new EventArgs()); - } + } +#endif + mod_commesse1.idxProgetto = idxProgetto; + showDetail(true); } /// /// idxProgetto selezionato @@ -503,7 +519,59 @@ namespace PROJ_ETS.WebUserControls protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e) { } - + /// + /// salvo ricerca + /// + /// + /// + protected void txtCerca_TextChanged(object sender, EventArgs e) + { + utils.obj.setSessionVal("valoreCercato", txtCerca.Text.Trim()); + } + /// + /// mostra dettagli + /// + /// + public void showDetail(bool visibile) + { + mod_commesse1.Visible = visibile; + btnSposta.Visible = visibile; + } + /// + /// click x andare a spostamento commesse! + /// + /// + /// + protected void btnSposta_Click(object sender, EventArgs e) + { + salvaIdxCli(); + Response.Redirect("SpostaCommesse"); + } + /// + /// salva idxCliente selezionato + /// + private void salvaIdxCli() + { + // salvo idxCli... + int idxCli = 0; + string nomeCli = ""; + try + { + idxCli = DataProxy_ProjEts.DP.taAP.getByIdxPrj(idxProgetto)[0].idxCliente; + } + catch + { } + // cerco di recuperare nome cliente... + try + { + nomeCli = DataProxy_ProjEts.DP.taSelCli.getByValue(idxCli)[0].label; + } + catch + { } + // salvo in sessione + utils.obj.setSessionVal("idxCli_sel", idxCli); + utils.obj.setSessionVal("nomeCli_sel", nomeCli); + } #endregion } diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs index 40e83c7..3374aff 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx.designer.cs @@ -48,6 +48,24 @@ namespace PROJ_ETS.WebUserControls { /// protected global::PROJ_ETS.WebUserControls.mod_periodoAnalisi mod_periodoAnalisi1; + /// + /// lblCerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblCerca; + + /// + /// txtCerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtCerca; + /// /// grView control. /// @@ -83,5 +101,23 @@ namespace PROJ_ETS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblNumRec; + + /// + /// mod_commesse1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PROJ_ETS.WebUserControls.mod_commesse mod_commesse1; + + /// + /// btnSposta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnSposta; } } diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index ebffc9b..603dde6 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index 2b86d93..4cfa32d 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ