diff --git a/GMW/GMW.csproj b/GMW/GMW.csproj index 52c2a501..cd9b5ab9 100644 --- a/GMW/GMW.csproj +++ b/GMW/GMW.csproj @@ -339,6 +339,7 @@ + diff --git a/GMW/WS/DataFeed.asmx.cs b/GMW/WS/DataFeed.asmx.cs index 1e3b9a4e..0b46dca2 100644 --- a/GMW/WS/DataFeed.asmx.cs +++ b/GMW/WS/DataFeed.asmx.cs @@ -36,12 +36,12 @@ namespace GMW.WS [WebMethod] [ScriptMethod(ResponseFormat = ResponseFormat.Json)] - public string[] celle(string prefixText, int count) + public string[] celle(string prefixText) { // inizializzo risposta List suggerimenti = new List(); // proseguo SOLO SE min "MinCharAutocomplete" char... - if (count >= memLayer.ML.confReadInt("MinCharAutocomplete")) + if (prefixText.Length >= memLayer.ML.confReadInt("MinCharAutocomplete")) { // elenco candidati DS_magazzino.CelleDataTable tabCelle = MagClass.magazzino.taCelle.getByCodCellaLike(prefixText, memLayer.ML.confReadString("CodCS")); @@ -54,22 +54,5 @@ namespace GMW.WS return suggerimenti.ToArray(); } - //[WebMethod] - //[ScriptMethod(ResponseFormat = ResponseFormat.Json)] - //public string[] Fornitori(string keywordStartsWith) - //{ - // // inizializzo risposta - // List suggerimenti = new List(); - // // elenco candidati - // DS_utilsProjEts.v_selFornitoriClaDataTable tabella = DataProxy_ProjEts.DP.taSelForn.getBySearchLike(keywordStartsWith); - // // aggiungo ogni riga... - // foreach (DS_utilsProjEts.v_selFornitoriClaRow riga in tabella) - // { - // //suggerimenti.Add(riga.label); - // suggerimenti.Add(string.Format("{0}#{1}", riga.label, riga.value)); - // } - // return suggerimenti.ToArray(); - //} - } } diff --git a/GMW/WebUserControls/mod_SearchProvParticolari.ascx b/GMW/WebUserControls/mod_SearchProvParticolari.ascx index 841a79f5..e81db827 100644 --- a/GMW/WebUserControls/mod_SearchProvParticolari.ascx +++ b/GMW/WebUserControls/mod_SearchProvParticolari.ascx @@ -11,7 +11,7 @@ <%--<%: traduci("Particolari") %>--%> -
+
diff --git a/GMW/WebUserControls/mod_SearchProvUDC.ascx b/GMW/WebUserControls/mod_SearchProvUDC.ascx index a4999f44..8a6cec4e 100644 --- a/GMW/WebUserControls/mod_SearchProvUDC.ascx +++ b/GMW/WebUserControls/mod_SearchProvUDC.ascx @@ -6,16 +6,17 @@ <%@ Register Src="mod_detailUDC_storico.ascx" TagName="mod_detailUDC_storico" TagPrefix="uc4" %> <%@ Register Src="mod_detLDP.ascx" TagName="mod_detLDP" TagPrefix="uc5" %> <%@ Register Src="mod_detAttr.ascx" TagName="mod_detAttr" TagPrefix="uc6" %> -<% if (false) - { %> - -<% } %> +<%if (false) + { %> + + +<%} %>
-
+
diff --git a/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs b/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs index 4411aea2..094fb1e3 100644 --- a/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs +++ b/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs @@ -12,6 +12,24 @@ namespace GMW.WebUserControls { public partial class mod_SearchProvUDC { + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// BundleReference2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + /// /// pnlSearchProvider control. /// diff --git a/GMW/WebUserControls/mod_autocomplete.ascx b/GMW/WebUserControls/mod_autocomplete.ascx index cccb29d1..1e48cf1a 100644 --- a/GMW/WebUserControls/mod_autocomplete.ascx +++ b/GMW/WebUserControls/mod_autocomplete.ascx @@ -1,9 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_autocomplete.ascx.cs" Inherits="GMW.WebUserControls.mod_autocomplete" %> -<%if (false) - { %> - - -<%} %> --%> +
GMWmag
-
-
-
- - -
-
-
- -
- - -
-
-   - <%: traduci("btnSearch") %> - -
- -
-
- - -
-
-
- -
- - -
+
+
+ <%: traduci("btnSearch") %>  +   +   + + + +
+
+
+ +
+ +
-
+
diff --git a/GMW/WebUserControls/mod_searchMag.ascx.cs b/GMW/WebUserControls/mod_searchMag.ascx.cs index 5606c428..4ed0e703 100644 --- a/GMW/WebUserControls/mod_searchMag.ascx.cs +++ b/GMW/WebUserControls/mod_searchMag.ascx.cs @@ -73,7 +73,8 @@ namespace GMW.WebUserControls { chkLikeType.Text = traduci("AbilitaRicercaLike"); chkLikeType.ToolTip = traduci("AbilitaRicercaLikeExpl"); - TBWE_search.WatermarkText = traduci("insertCod4search"); + txtSearch.Attributes.Remove("placeholder"); + txtSearch.Attributes.Add("placeholder", traduci("insertCod4search")); } protected void txtSearch_TextChanged(object sender, EventArgs e) { diff --git a/GMW/WebUserControls/mod_searchMag.ascx.designer.cs b/GMW/WebUserControls/mod_searchMag.ascx.designer.cs index 093b87d0..3d079787 100644 --- a/GMW/WebUserControls/mod_searchMag.ascx.designer.cs +++ b/GMW/WebUserControls/mod_searchMag.ascx.designer.cs @@ -31,13 +31,13 @@ namespace GMW.WebUserControls { protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; /// - /// updtRicerca control. + /// lbnSearch control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.UpdateProgress updtRicerca; + protected global::System.Web.UI.WebControls.LinkButton lbnSearch; /// /// txtSearch control. @@ -48,24 +48,6 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.TextBox txtSearch; - /// - /// lbnSearch control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbnSearch; - - /// - /// TBWE_search control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::AjaxControlToolkit.TextBoxWatermarkExtender TBWE_search; - /// /// chkLikeType control. /// @@ -76,13 +58,13 @@ namespace GMW.WebUserControls { protected global::System.Web.UI.WebControls.CheckBox chkLikeType; /// - /// updtRicerca2 control. + /// updtRicerca control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.UpdateProgress updtRicerca2; + protected global::System.Web.UI.UpdateProgress updtRicerca; /// /// pnlResults control. diff --git a/GMW/WebUserControls/mod_testata.ascx b/GMW/WebUserControls/mod_testata.ascx index eb4e5864..32d2bc4a 100644 --- a/GMW/WebUserControls/mod_testata.ascx +++ b/GMW/WebUserControls/mod_testata.ascx @@ -24,9 +24,8 @@ -
  • - - <%----%> +
  • + diff --git a/GMW/WebUserControls/mod_testata.ascx.cs b/GMW/WebUserControls/mod_testata.ascx.cs index 21879011..4e183d4b 100644 --- a/GMW/WebUserControls/mod_testata.ascx.cs +++ b/GMW/WebUserControls/mod_testata.ascx.cs @@ -47,6 +47,7 @@ namespace GMW.WebUserControls DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select(string.Format("URL = '{0}'", _paginaCorrente))[0]; lblTitolo.Text = traduci(riga.NOME); lblIconTitolo.CssClass = traduci(riga.DESCRIZIONE); + lnkPagCorr.HRef = string.Format("~/{0}", _paginaCorrente); } catch { @@ -67,9 +68,16 @@ namespace GMW.WebUserControls ///
    • private void updateTreeMenu() { - XmlDataSource1.Data = user_std.UtSn.mappaSito; - XmlDataSource1.XPath = "mainMenu/menu"; - XmlDataSource1.DataBind(); + try + { + XmlDataSource1.Data = user_std.UtSn.mappaSito; + XmlDataSource1.XPath = "mainMenu/menu"; + XmlDataSource1.DataBind(); + } + catch + { + Response.Redirect(_paginaCorrente); + } } /// /// forza l'update del menù sx @@ -95,12 +103,13 @@ namespace GMW.WebUserControls /// protected void PagCorrente() { - Uri MyUrl = Request.Url; - string delimStr = "/"; - char[] delimiter = delimStr.ToCharArray(); - string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter); - int n = finalUrl.Length; - _paginaCorrente = finalUrl[n - 1].ToString(); + //Uri MyUrl = Request.Url; + //string delimStr = "/"; + //char[] delimiter = delimStr.ToCharArray(); + //string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter); + //int n = finalUrl.Length; + //_paginaCorrente = finalUrl[n - 1].ToString(); + _paginaCorrente = Request.Url.LocalPath.Replace("/", ""); if (_paginaPrecedente == "") { _paginaPrecedente = _paginaCorrente; diff --git a/GMW/WebUserControls/mod_testata.ascx.designer.cs b/GMW/WebUserControls/mod_testata.ascx.designer.cs index b23ad98e..0a806c12 100644 --- a/GMW/WebUserControls/mod_testata.ascx.designer.cs +++ b/GMW/WebUserControls/mod_testata.ascx.designer.cs @@ -40,13 +40,13 @@ namespace GMW.WebUserControls { protected global::System.Web.UI.HtmlControls.HtmlAnchor A1; /// - /// A8 control. + /// lnkPagCorr control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.HtmlControls.HtmlAnchor A8; + protected global::System.Web.UI.HtmlControls.HtmlAnchor lnkPagCorr; /// /// lblIconTitolo control. diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 14ef3e16..2f376ec2 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index bc5579e2..1c018625 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index e381483e..3296c713 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index af0b7119..646a85de 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/GMW/images/fbloader.gif b/GMW/images/fbloader.gif new file mode 100644 index 00000000..84b16f18 Binary files /dev/null and b/GMW/images/fbloader.gif differ diff --git a/GMW/test.aspx b/GMW/test.aspx index 636eb81a..8e50be6b 100644 --- a/GMW/test.aspx +++ b/GMW/test.aspx @@ -12,7 +12,7 @@
    Autocomplete! - +
    diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index 54f70c8b..a8ab1a76 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.613.1529")] -[assembly: AssemblyFileVersion("2.5.613.1529")] +[assembly: AssemblyVersion("2.5.614.1529")] +[assembly: AssemblyFileVersion("2.5.614.1529")] //[assembly: AssemblyCopyright("© Steamware 2007-2014")] //[assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index b47f79c6..7576fcee 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.613.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.5.613.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.5.614.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.5.614.<#= this.RevisionNumber #>")] //[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")] //[assembly: AssemblyCompany("Steamware")] <#+