diff --git a/C2P/App_Start/RouteConfig.cs b/C2P/App_Start/RouteConfig.cs index 81e5c35..a2c7b1f 100644 --- a/C2P/App_Start/RouteConfig.cs +++ b/C2P/App_Start/RouteConfig.cs @@ -13,6 +13,7 @@ namespace C2P var settings = new FriendlyUrlSettings(); settings.AutoRedirectMode = RedirectMode.Permanent; routes.EnableFriendlyUrls(settings); + //routes.Add(new Route("Services/{resource}.asmx/{*pathInfo}", new StopRoutingHandler())); } } } diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 18eaf42..91ae0b8 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -86,6 +86,7 @@ + False @@ -193,6 +194,7 @@ + @@ -296,6 +298,7 @@ + @@ -380,6 +383,13 @@ Bootstrap.Master + + DbSync.aspx + ASPXCodeBehind + + + DbSync.aspx + Default.aspx ASPXCodeBehind @@ -612,6 +622,13 @@ mod_slider.ascx + + mod_SyncVoc.ascx + ASPXCodeBehind + + + mod_SyncVoc.ascx + mod_testata.ascx ASPXCodeBehind @@ -649,6 +666,9 @@ C2P_Data + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/C2P/DbSync.aspx b/C2P/DbSync.aspx new file mode 100644 index 0000000..bb60325 --- /dev/null +++ b/C2P/DbSync.aspx @@ -0,0 +1 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/c2p/Bootstrap.Master" AutoEventWireup="true" CodeBehind="DbSync.aspx.cs" Inherits="C2P.DbSync" %> diff --git a/C2P/DbSync.aspx.cs b/C2P/DbSync.aspx.cs new file mode 100644 index 0000000..d8e4564 --- /dev/null +++ b/C2P/DbSync.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P +{ + public partial class DbSync : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/DbSync.aspx.designer.cs b/C2P/DbSync.aspx.designer.cs new file mode 100644 index 0000000..3588d91 --- /dev/null +++ b/C2P/DbSync.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P +{ + + + public partial class DbSync + { + } +} diff --git a/C2P/Services/WS_data.asmx.cs b/C2P/Services/WS_data.asmx.cs index 008170f..11aad0f 100644 --- a/C2P/Services/WS_data.asmx.cs +++ b/C2P/Services/WS_data.asmx.cs @@ -5,6 +5,7 @@ using System.Web; using System.Web.Services; using System.Web.Script.Services; using C2P_Data; +using SteamWare; namespace C2P.Services { @@ -82,56 +83,23 @@ namespace C2P.Services } return suggerimenti.ToArray(); } - //[WebMethod] - //[ScriptMethod(ResponseFormat = ResponseFormat.Json)] - //public string[] Fornitori(string prefixText) - //{ - // // inizializzo risposta - // List suggerimenti = new List(); - // // elenco candidati - // DS_utilsProjEts.v_selFornitoriClaDataTable tabella = DataProxy_ProjEts.DP.taSelForn.getBySearchLike(prefixText); - // // 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(); - //} - - //[WebMethod] - //[ScriptMethod(ResponseFormat = ResponseFormat.Json)] - //public string[] Commesse(string prefixText) - //{ - // // inizializzo risposta - // List suggerimenti = new List(); - // // elenco candidati - // DS_utilsProjEts.v_selCommesseDataTable tabella = DataProxy_ProjEts.DP.taSelCom.getBySearchLike(prefixText); - // // aggiungo ogni riga... - // foreach (DS_utilsProjEts.v_selCommesseRow riga in tabella) - // { - // //suggerimenti.Add(riga.label); - // suggerimenti.Add(string.Format("{0}#{1}", riga.label, riga.value)); - // } - // return suggerimenti.ToArray(); - //} - - - //[WebMethod] - //[ScriptMethod(ResponseFormat = ResponseFormat.Json)] - //public string[] Protocolli(string prefixText) - //{ - // // inizializzo risposta - // List suggerimenti = new List(); - // // elenco candidati - // DS_utilsWebShip.v_selDocDataTable tabella = DataProxy_ETS_WS.DP.taVSD.GetData(prefixText); - // // aggiungo ogni riga... - // foreach (DS_utilsWebShip.v_selDocRow riga in tabella) - // { - // //suggerimenti.Add(riga.label); - // suggerimenti.Add(string.Format("{0}#{1}", riga.value, riga.label)); - // } - // return suggerimenti.ToArray(); - //} + [WebMethod] + [ScriptMethod(ResponseFormat = ResponseFormat.Json)] + public string[] Vocabolario() + { + // inizializzo risposta + List suggerimenti = new List(); + // elenco candidati + DataLayer_generic.VocabolarioDataTable tabella = selDataVoc.mgr.getVocabolario(); + // aggiungo ogni riga... + foreach (DataLayer_generic.VocabolarioRow riga in tabella) + { + //suggerimenti.Add(riga.label); + suggerimenti.Add(string.Format("{0}#{1}#{2}", riga.Lingua, riga.Lemma, riga.Traduzione)); + } + return suggerimenti.ToArray(); + } + + } } diff --git a/C2P/Web.config b/C2P/Web.config index c8daa60..29eccb7 100644 --- a/C2P/Web.config +++ b/C2P/Web.config @@ -114,4 +114,8 @@ + + + + \ No newline at end of file diff --git a/C2P/WebUserControls/mod_SyncVoc.ascx b/C2P/WebUserControls/mod_SyncVoc.ascx new file mode 100644 index 0000000..720974f --- /dev/null +++ b/C2P/WebUserControls/mod_SyncVoc.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_SyncVoc.ascx.cs" Inherits="C2P.WebUserControls.mod_SyncVoc" %> diff --git a/C2P/WebUserControls/mod_SyncVoc.ascx.cs b/C2P/WebUserControls/mod_SyncVoc.ascx.cs new file mode 100644 index 0000000..6591bae --- /dev/null +++ b/C2P/WebUserControls/mod_SyncVoc.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P.WebUserControls +{ + public partial class mod_SyncVoc : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_SyncVoc.ascx.designer.cs b/C2P/WebUserControls/mod_SyncVoc.ascx.designer.cs new file mode 100644 index 0000000..b26bc50 --- /dev/null +++ b/C2P/WebUserControls/mod_SyncVoc.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P.WebUserControls +{ + + + public partial class mod_SyncVoc + { + } +} diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index a70ff2c..e2d2539 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 96b0053..696eafc 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 60c1a5e..74422d1 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P/bin/SteamWare.xml b/C2P/bin/SteamWare.xml index ba38a39..4e37ea1 100644 --- a/C2P/bin/SteamWare.xml +++ b/C2P/bin/SteamWare.xml @@ -3055,6 +3055,11 @@ classe accesso tabelle selettori + + + singleton + + tabella vocabolario diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index 96b0053..72aebee 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Data/bin/Release/SteamWare.dll b/C2P_Data/bin/Release/SteamWare.dll index 60c1a5e..4b18295 100644 Binary files a/C2P_Data/bin/Release/SteamWare.dll and b/C2P_Data/bin/Release/SteamWare.dll differ