diff --git a/GMW/Bootstrap.Master b/GMW/Bootstrap.Master index 335ae764..3efd9dc6 100644 --- a/GMW/Bootstrap.Master +++ b/GMW/Bootstrap.Master @@ -95,7 +95,7 @@ GMW | - 2010-<%: DateTime.Now.Year %> © + 2010-<%: DateTime.Now.Year %>©

diff --git a/GMW/ContentPage.master b/GMW/ContentPage.master index b0099a96..aa98d0be 100644 --- a/GMW/ContentPage.master +++ b/GMW/ContentPage.master @@ -10,7 +10,7 @@
- +
diff --git a/GMW/ContentPage.master.designer.cs b/GMW/ContentPage.master.designer.cs index 0c9801fc..15373dcc 100644 --- a/GMW/ContentPage.master.designer.cs +++ b/GMW/ContentPage.master.designer.cs @@ -31,12 +31,12 @@ namespace GMW { protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; /// - /// MainContent control. + /// MCon control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + protected global::System.Web.UI.WebControls.ContentPlaceHolder MCon; } } diff --git a/GMW/DettaglioBlocco.aspx b/GMW/DettaglioBlocco.aspx index eec15b79..19789713 100644 --- a/GMW/DettaglioBlocco.aspx +++ b/GMW/DettaglioBlocco.aspx @@ -6,7 +6,7 @@ - +

diff --git a/GMW/DtxExtraCiclo.aspx b/GMW/DtxExtraCiclo.aspx index 1c205bf5..3e1d022e 100644 --- a/GMW/DtxExtraCiclo.aspx +++ b/GMW/DtxExtraCiclo.aspx @@ -5,7 +5,7 @@ - +
diff --git a/GMW/DtxProveDim.aspx b/GMW/DtxProveDim.aspx index d4ecd707..374f6f1b 100644 --- a/GMW/DtxProveDim.aspx +++ b/GMW/DtxProveDim.aspx @@ -5,7 +5,7 @@ - +
diff --git a/GMW/DtxProveDistr.aspx b/GMW/DtxProveDistr.aspx index 507141a8..7035a0ee 100644 --- a/GMW/DtxProveDistr.aspx +++ b/GMW/DtxProveDistr.aspx @@ -5,8 +5,8 @@ - -
+ +
diff --git a/GMW/ElencoListePrelievo.aspx b/GMW/ElencoListePrelievo.aspx index 65f572a0..08a4bf2a 100644 --- a/GMW/ElencoListePrelievo.aspx +++ b/GMW/ElencoListePrelievo.aspx @@ -5,6 +5,6 @@ - + diff --git a/GMW/ErrorCodes.aspx b/GMW/ErrorCodes.aspx index c2e71563..206d6de2 100644 --- a/GMW/ErrorCodes.aspx +++ b/GMW/ErrorCodes.aspx @@ -6,7 +6,7 @@

Elenco codici errore

<%-- Utilizzare il menù di ricerca sottostante per il codice di errore cercato--%> - +
  • [ERR-BCD-001] Errore! Codice non riconosciuto! diff --git a/GMW/FullPage.master b/GMW/FullPage.master index 26a8c22a..4570fa40 100644 --- a/GMW/FullPage.master +++ b/GMW/FullPage.master @@ -9,6 +9,6 @@ - + diff --git a/GMW/FullPage.master.designer.cs b/GMW/FullPage.master.designer.cs index 27525e53..6b3993a8 100644 --- a/GMW/FullPage.master.designer.cs +++ b/GMW/FullPage.master.designer.cs @@ -31,12 +31,12 @@ namespace GMW { protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; /// - /// MainContent control. + /// MCon control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + protected global::System.Web.UI.WebControls.ContentPlaceHolder MCon; } } diff --git a/GMW/JumboPage.master b/GMW/JumboPage.master index 74610e1c..b5576b0c 100644 --- a/GMW/JumboPage.master +++ b/GMW/JumboPage.master @@ -21,7 +21,7 @@
    - +
    diff --git a/GMW/JumboPage.master.designer.cs b/GMW/JumboPage.master.designer.cs index 95af4079..01b9e088 100644 --- a/GMW/JumboPage.master.designer.cs +++ b/GMW/JumboPage.master.designer.cs @@ -40,12 +40,12 @@ namespace GMW { protected global::System.Web.UI.WebControls.LinkButton btnLearnMore; /// - /// MainContent control. + /// MCon control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + protected global::System.Web.UI.WebControls.ContentPlaceHolder MCon; } } diff --git a/GMW/MenuSxPage.master b/GMW/MenuSxPage.master index f70e85ce..a408bc58 100644 --- a/GMW/MenuSxPage.master +++ b/GMW/MenuSxPage.master @@ -9,7 +9,7 @@
    - +
    \ No newline at end of file diff --git a/GMW/MenuSxPage.master.designer.cs b/GMW/MenuSxPage.master.designer.cs index 32809d78..e8e381ed 100644 --- a/GMW/MenuSxPage.master.designer.cs +++ b/GMW/MenuSxPage.master.designer.cs @@ -31,12 +31,12 @@ namespace GMW { protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; /// - /// MainContent control. + /// MCon control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + protected global::System.Web.UI.WebControls.ContentPlaceHolder MCon; } } diff --git a/GMW/POST_PRE_TT.aspx b/GMW/POST_PRE_TT.aspx index 0f41069e..efa32db8 100644 --- a/GMW/POST_PRE_TT.aspx +++ b/GMW/POST_PRE_TT.aspx @@ -7,7 +7,7 @@ - +
    diff --git a/GMW/POST_PRE_TT_DT.aspx b/GMW/POST_PRE_TT_DT.aspx index 945cdd3f..6e41c1fa 100644 --- a/GMW/POST_PRE_TT_DT.aspx +++ b/GMW/POST_PRE_TT_DT.aspx @@ -6,7 +6,7 @@ - +
    diff --git a/GMW/PostLiquidi_DT.aspx b/GMW/PostLiquidi_DT.aspx index c66a4583..3131a80c 100644 --- a/GMW/PostLiquidi_DT.aspx +++ b/GMW/PostLiquidi_DT.aspx @@ -7,7 +7,7 @@ - +
    diff --git a/GMW/PostLiquidi_NT.aspx b/GMW/PostLiquidi_NT.aspx index 5e552241..588a817d 100644 --- a/GMW/PostLiquidi_NT.aspx +++ b/GMW/PostLiquidi_NT.aspx @@ -6,7 +6,7 @@ - +
    diff --git a/GMW/PostProveMecc.aspx b/GMW/PostProveMecc.aspx index 1d60df79..b56ef424 100644 --- a/GMW/PostProveMecc.aspx +++ b/GMW/PostProveMecc.aspx @@ -7,7 +7,7 @@ - +
    diff --git a/GMW/PostRX.aspx b/GMW/PostRX.aspx index 8db8094b..0c251f71 100644 --- a/GMW/PostRX.aspx +++ b/GMW/PostRX.aspx @@ -7,7 +7,7 @@ - +
    diff --git a/GMW/PostRX_DT.aspx b/GMW/PostRX_DT.aspx index 31b6f7a2..c51230d9 100644 --- a/GMW/PostRX_DT.aspx +++ b/GMW/PostRX_DT.aspx @@ -7,7 +7,7 @@ - +
    diff --git a/GMW/PostTT.aspx b/GMW/PostTT.aspx index 358fc9b1..37c6d8e0 100644 --- a/GMW/PostTT.aspx +++ b/GMW/PostTT.aspx @@ -8,7 +8,7 @@ - +
    diff --git a/GMW/SearchMag.aspx b/GMW/SearchMag.aspx index cb886e06..4c0925d4 100644 --- a/GMW/SearchMag.aspx +++ b/GMW/SearchMag.aspx @@ -11,7 +11,7 @@ - +
    diff --git a/GMW/StatoMag.aspx b/GMW/StatoMag.aspx index beb7f46a..01ece7f5 100644 --- a/GMW/StatoMag.aspx +++ b/GMW/StatoMag.aspx @@ -5,6 +5,6 @@ - + diff --git a/GMW/WS/DataFeed.asmx.cs b/GMW/WS/DataFeed.asmx.cs index 0b46dca2..0f079605 100644 --- a/GMW/WS/DataFeed.asmx.cs +++ b/GMW/WS/DataFeed.asmx.cs @@ -53,6 +53,44 @@ namespace GMW.WS } return suggerimenti.ToArray(); } + [WebMethod] + [ScriptMethod(ResponseFormat = ResponseFormat.Json)] + public string[] particolari(string prefixText) + { + // inizializzo risposta + List suggerimenti = new List(); + // proseguo SOLO SE min "MinCharAutocomplete" char... + if (prefixText.Length >= memLayer.ML.confReadInt("MinCharAutocomplete")) + { + // elenco candidati + DS_Utility.v_selParticolariDataTable tabParticolari = utils.obj.taSelPart.getByConditioPref("P", prefixText); + // aggiungo ogni riga... + foreach (DS_Utility.v_selParticolariRow riga in tabParticolari) + { + suggerimenti.Add(string.Format("{0}#{1}", riga.value, riga.value)); + } + } + return suggerimenti.ToArray(); + } + [WebMethod] + [ScriptMethod(ResponseFormat = ResponseFormat.Json)] + public string[] anime(string prefixText) + { + // inizializzo risposta + List suggerimenti = new List(); + // proseguo SOLO SE min "MinCharAutocomplete" char... + if (prefixText.Length >= memLayer.ML.confReadInt("MinCharAutocomplete")) + { + // elenco candidati + DS_Utility.v_selParticolariDataTable tabParticolari = utils.obj.taSelPart.getByConditioPref("A", prefixText); + // aggiungo ogni riga... + foreach (DS_Utility.v_selParticolariRow riga in tabParticolari) + { + suggerimenti.Add(string.Format("{0}#{1}", riga.value, riga.value)); + } + } + return suggerimenti.ToArray(); + } } } diff --git a/GMW/WebUserControls/mod_SearchProvUDC.ascx b/GMW/WebUserControls/mod_SearchProvUDC.ascx index 60484b2e..133c9254 100644 --- a/GMW/WebUserControls/mod_SearchProvUDC.ascx +++ b/GMW/WebUserControls/mod_SearchProvUDC.ascx @@ -21,16 +21,18 @@
    -
    -
    +
    +
    -
    +
    - +
    + +
    -
    +
    diff --git a/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs b/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs index 21319d02..ed4b2634 100644 --- a/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs +++ b/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs @@ -46,9 +46,7 @@ namespace GMW.WebUserControls { doTraduci(); mod_detailUDC1.Visible = false; -#if true mod_execUDC1.abilitato = false; -#endif memLayer.ML.setSessionVal("RicercaUdcAttiva", false, false); memLayer.ML.setSessionVal("_inizio", DateTime.Now.AddYears(-memLayer.ML.confReadInt("defaultYearSAO"))); memLayer.ML.setSessionVal("_fine", DateTime.Now.AddDays(1)); @@ -60,16 +58,12 @@ namespace GMW.WebUserControls mod_execUDC1.eh_nuovoValore += new EventHandler(mod_execUDC1_eh_nuovoValore); if (memLayer.ML.BoolSessionObj("RicercaUdcAttiva")) { -#if true mod_execUDC1.Visible = !udcConsumato; -#endif mod_detailUDC1.Visible = true; } else { -#if true mod_execUDC1.abilitato = false; -#endif mod_detailUDC1.Visible = false; } fixDetailVisibility(); @@ -171,9 +165,8 @@ namespace GMW.WebUserControls mod_detailUDC1.doUpdate(); mod_detLDP1.doUpdate(); mod_detAttr1.doUpdate(); -#if true - mod_execUDC1.abilitato = !udcConsumato; -#endif + mod_execUDC1.Visible = !udcConsumato; + mod_execUDC1.abilitato = !udcConsumato; mod_execUDC1.doUpdate(); // salvo dati UDC selezionato... UDC_sel c'è già... string UDC = memLayer.ML.StringSessionObj("UDC_sel"); @@ -265,9 +258,7 @@ namespace GMW.WebUserControls { mod_listUDC1.doUpdate(); mod_detailUDC1.Visible = false; -#if true mod_execUDC1.abilitato = false; -#endif fixDetailVisibility(); } /// @@ -294,9 +285,7 @@ namespace GMW.WebUserControls memLayer.ML.setSessionVal("RicercaUdcAttiva", false, false); mod_listUDC1.doRefresh(); mod_detailUDC1.Visible = false; -#if true mod_execUDC1.abilitato = false; -#endif mod_detLDP1.Visible = false; mod_detAttr1.Visible = false; } diff --git a/GMW/WebUserControls/mod_autocomplete.ascx b/GMW/WebUserControls/mod_autocomplete.ascx index 8191c557..bdc6c852 100644 --- a/GMW/WebUserControls/mod_autocomplete.ascx +++ b/GMW/WebUserControls/mod_autocomplete.ascx @@ -1,9 +1,9 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_autocomplete.ascx.cs" Inherits="GMW.WebUserControls.mod_autocomplete" %>