diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo index 7a43c80..a98ac7d 100644 Binary files a/ETS-WS/ETS-WS.suo and b/ETS-WS/ETS-WS.suo differ diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx index e7cf339..f2aeaff 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx @@ -31,26 +31,18 @@

- +

- - -
- calcolati: Num Commessa | Committente | descr commessa +

- - +

@@ -66,6 +58,9 @@ generatore:
Lettera (doc) | FAX (doc) | Email
+
+ +
<%--buttons finali--%> diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs index 5783685..3b132dd 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs @@ -15,6 +15,23 @@ namespace ETS_WS.WebUserControls { rblProto.SelectedIndex = 0; } + tacCommesse.eh_valSelezionato += new EventHandler(tacCommesse_eh_valSelezionato); + } + /// + /// imposto valori secondari + /// + /// + /// + void tacCommesse_eh_valSelezionato(object sender, EventArgs e) + { + updateVisual(); + } + /// + /// aggiorna tutti i valori visualizzati + /// + private void updateVisual() + { + // sistemo valori... } protected void rblProto_SelectedIndexChanged(object sender, EventArgs e) @@ -30,5 +47,10 @@ namespace ETS_WS.WebUserControls lblNumProto.Visible = showProto; lblNumProto.Text = DateTime.Now.ToString("HHmmss"); } + + protected void btnSubmit_Click(object sender, EventArgs e) + { + updateVisual(); + } } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs index f230a10..136bc68 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs @@ -49,13 +49,13 @@ namespace ETS_WS.WebUserControls { protected global::System.Web.UI.WebControls.Label lblFonte; /// - /// mod_textAutocomplete1 control. + /// tacFonti control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::ETS_WS.WebUserControls.mod_textAutocomplete mod_textAutocomplete1; + protected global::ETS_WS.WebUserControls.mod_textAutocomplete tacFonti; /// /// lblCommessa control. @@ -67,22 +67,13 @@ namespace ETS_WS.WebUserControls { protected global::System.Web.UI.WebControls.Label lblCommessa; /// - /// txtCommessa control. + /// tacCommesse control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtCommessa; - - /// - /// aceCommessa control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::AjaxControlToolkit.AutoCompleteExtender aceCommessa; + protected global::ETS_WS.WebUserControls.mod_textAutocomplete tacCommesse; /// /// lblFase control. @@ -94,22 +85,13 @@ namespace ETS_WS.WebUserControls { protected global::System.Web.UI.WebControls.Label lblFase; /// - /// txtFase control. + /// tacFasi control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtFase; - - /// - /// aceFase control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::AjaxControlToolkit.AutoCompleteExtender aceFase; + protected global::ETS_WS.WebUserControls.mod_textAutocomplete tacFasi; /// /// lblOggetto control. @@ -128,5 +110,14 @@ namespace ETS_WS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtOggetto; + + /// + /// btnSubmit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnSubmit; } } diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx index ff41124..159746c 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx @@ -6,9 +6,10 @@ <% } %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> + Visible="true" ViewStateMode="Enabled" Width="3em" Font-Size="6pt" BackColor="Transparent" BorderStyle="None" /> + \ No newline at end of file diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs index 68fb74a..804a95d 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.cs @@ -37,13 +37,17 @@ namespace ETS_WS.WebUserControls if (!script.IsClientScriptBlockRegistered(this.GetType(), uid + "_ace")) { string pre = ""; string fullScript = string.Format("{0} {1} {2}", pre, scrVal, post); script.RegisterClientScriptBlock(this.GetType(), uid + "_ace", fullScript); } hiddenFieldID.ID = hiddenFieldID.ID.Replace("$", "_"); + btnPost.ID = btnPost.ID.Replace("$", "_"); txtValueAce.OnClientItemSelected = string.Format("{0}_SetSelectedValue", uid); } /// @@ -128,5 +132,18 @@ namespace ETS_WS.WebUserControls //hiddenFieldID.Visible = value; } } + /// + /// salva evento selezione + /// + /// + /// + protected void btnPost_Click(object sender, EventArgs e) + { + _valore = hiddenFieldID.Text; + if (eh_valSelezionato != null) + { + eh_valSelezionato(this, new EventArgs()); + } + } } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.designer.cs index a031f5f..0b73bc1 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.designer.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx.designer.cs @@ -38,5 +38,14 @@ namespace ETS_WS.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::AjaxControlToolkit.AutoCompleteExtender txtValueAce; + + /// + /// btnPost control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnPost; } } diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 72a7c4e..04da222 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS_Data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/ETS_Data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 81ab78c..8643ada 100644 Binary files a/ETS_Data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS_Data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ