diff --git a/ETS-WS/ETS-WS.sln b/ETS-WS/ETS-WS.sln index 824731d..d266dd5 100644 --- a/ETS-WS/ETS-WS.sln +++ b/ETS-WS/ETS-WS.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ETS-WS", "ETS-WS\ETS-WS.csproj", "{ACE9E793-6523-4B9A-82C6-282D61D358C9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ETS-DIP", "ETS-WS\ETS-DIP.csproj", "{ACE9E793-6523-4B9A-82C6-282D61D358C9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ETS_Data", "..\ETS_Data\ETS_Data.csproj", "{0A14058F-ED18-4F82-91C9-93945C2C409A}" EndProject diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-DIP.csproj similarity index 98% rename from ETS-WS/ETS-WS/ETS-WS.csproj rename to ETS-WS/ETS-WS/ETS-DIP.csproj index 8fdf540..e3de4aa 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj +++ b/ETS-WS/ETS-WS/ETS-DIP.csproj @@ -1,776 +1,776 @@ - - - - - Debug - AnyCPU - - - 2.0 - {ACE9E793-6523-4B9A-82C6-282D61D358C9} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - ETS_DIP - ETS-DIP - v4.0 - false - - - - - 4.0 - - - - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - Default Web Site/ETS-WS - false - false - - - pdbonly - true - bin\ - - - prompt - 4 - Default Web Site/ETS-WS - true - true - - - bin\ - - - true - pdbonly - AnyCPU - bin\ETS-WS.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - true - true - Default Web Site/ETS-WS - - - bin\ - true - pdbonly - AnyCPU - bin\ETS-WS.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - Default Web Site/ETS-WS - true - true - - - - False - ..\packages\AjaxControlToolkit.4.1.60919\lib\40\AjaxControlToolkit.dll - - - False - ..\packages\AjaxMin.4.74.4698.25434\lib\net40\AjaxMin.dll - - - True - ..\packages\DocumentFormat.OpenXml.1.0\lib\DocumentFormat.OpenXml.dll - - - ..\packages\AjaxControlToolkit.4.1.60919\lib\40\SanitizerProviders\HtmlAgilityPack.dll - - - - ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll - - - ..\packages\AjaxControlToolkit.4.1.60919\lib\40\SanitizerProviders\SanitizerProviders.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - Always - - - Always - - - Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Always - - - - - - - - - - - - Designer - - - Web.config - - - - - - - - - - - - - - - - - - - - - - Web.config - - - - - Admin.aspx - ASPXCodeBehind - - - Admin.aspx - - - AnagFasi.aspx - ASPXCodeBehind - - - AnagFasi.aspx - - - AnagTags.aspx - ASPXCodeBehind - - - AnagTags.aspx - - - Default.aspx - ASPXCodeBehind - - - Default.aspx - - - demoUpload.aspx - ASPXCodeBehind - - - demoUpload.aspx - - - getDocByProto.aspx - ASPXCodeBehind - - - getDocByProto.aspx - - - - GestioneDocumenti.aspx - ASPXCodeBehind - - - GestioneDocumenti.aspx - - - Help.aspx - ASPXCodeBehind - - - Help.aspx - - - Menu.aspx - ASPXCodeBehind - - - Menu.aspx - - - MyDocs.aspx - ASPXCodeBehind - - - MyDocs.aspx - - - - ricerca.aspx - ASPXCodeBehind - - - ricerca.aspx - - - test.aspx - ASPXCodeBehind - - - test.aspx - - - testMast.aspx - ASPXCodeBehind - - - testMast.aspx - - - AjaxSimpleFull.Master - ASPXCodeBehind - - - AjaxSimpleFull.Master - - - mod_admin.ascx - ASPXCodeBehind - - - mod_admin.ascx - - - mod_anagFasi.ascx - ASPXCodeBehind - - - mod_anagFasi.ascx - - - mod_anagTags.ascx - ASPXCodeBehind - - - mod_anagTags.ascx - - - mod_archivioDocumenti.ascx - ASPXCodeBehind - - - mod_archivioDocumenti.ascx - - - mod_clipboard.ascx - ASPXCodeBehind - - - mod_clipboard.ascx - - - mod_fileUpload.ascx - ASPXCodeBehind - - - mod_fileUpload.ascx - - - mod_filtroRicerca.ascx - ASPXCodeBehind - - - mod_filtroRicerca.ascx - - - mod_gestioneDati.ascx - ASPXCodeBehind - - - mod_gestioneDati.ascx - - - mod_inputDati.ascx - ASPXCodeBehind - - - mod_inputDati.ascx - - - mod_menu.ascx - ASPXCodeBehind - - - mod_menu.ascx - - - mod_menuBottomFullpage.ascx - ASPXCodeBehind - - - mod_menuBottomFullpage.ascx - - - mod_myTempFile.ascx - ASPXCodeBehind - - - mod_myTempFile.ascx - - - mod_pathAndDocs.ascx - ASPXCodeBehind - - - mod_pathAndDocs.ascx - - - mod_periodoAnalisi.ascx - ASPXCodeBehind - - - mod_periodoAnalisi.ascx - - - mod_singleFileUpload.ascx - ASPXCodeBehind - - - mod_singleFileUpload.ascx - - - mod_testata.ascx - ASPXCodeBehind - - - mod_testata.ascx - - - mod_testataProt.ascx - ASPXCodeBehind - - - mod_testataProt.ascx - - - mod_textAutocomplete.ascx - ASPXCodeBehind - - - mod_textAutocomplete.ascx - - - AutoCompletamento.asmx - Component - - - - - - - - - - - - Always - Designer - - - - - - - - - - Designer - - - - Web.config - - - Web.config - Designer - - - Designer - - - - - - - - {0A14058F-ED18-4F82-91C9-93945C2C409A} - ETS_Data - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - False - True - 52344 - / - - - False - False - - - False - - - - - - + + + + + Debug + AnyCPU + + + 2.0 + {ACE9E793-6523-4B9A-82C6-282D61D358C9} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + ETS_DIP + ETS-DIP + v4.0 + false + + + + + 4.0 + + + + + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + Default Web Site/ETS-WS + false + false + + + pdbonly + true + bin\ + + + prompt + 4 + Default Web Site/ETS-WS + true + true + + + bin\ + + + true + pdbonly + AnyCPU + bin\ETS-WS.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + true + true + Default Web Site/ETS-WS + + + bin\ + true + pdbonly + AnyCPU + bin\ETS-WS.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + Default Web Site/ETS-WS + true + true + + + + False + ..\packages\AjaxControlToolkit.4.1.60919\lib\40\AjaxControlToolkit.dll + + + False + ..\packages\AjaxMin.4.74.4698.25434\lib\net40\AjaxMin.dll + + + True + ..\packages\DocumentFormat.OpenXml.1.0\lib\DocumentFormat.OpenXml.dll + + + ..\packages\AjaxControlToolkit.4.1.60919\lib\40\SanitizerProviders\HtmlAgilityPack.dll + + + + ..\packages\NLog.2.0.1.2\lib\net40\NLog.dll + + + ..\packages\AjaxControlToolkit.4.1.60919\lib\40\SanitizerProviders\SanitizerProviders.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + Always + + + Always + + + Always + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + + + + + + + + + + Designer + + + Web.config + + + + + + + + + + + + + + + + + + + + + + Web.config + + + + + Admin.aspx + ASPXCodeBehind + + + Admin.aspx + + + AnagFasi.aspx + ASPXCodeBehind + + + AnagFasi.aspx + + + AnagTags.aspx + ASPXCodeBehind + + + AnagTags.aspx + + + Default.aspx + ASPXCodeBehind + + + Default.aspx + + + demoUpload.aspx + ASPXCodeBehind + + + demoUpload.aspx + + + getDocByProto.aspx + ASPXCodeBehind + + + getDocByProto.aspx + + + + GestioneDocumenti.aspx + ASPXCodeBehind + + + GestioneDocumenti.aspx + + + Help.aspx + ASPXCodeBehind + + + Help.aspx + + + Menu.aspx + ASPXCodeBehind + + + Menu.aspx + + + MyDocs.aspx + ASPXCodeBehind + + + MyDocs.aspx + + + + ricerca.aspx + ASPXCodeBehind + + + ricerca.aspx + + + test.aspx + ASPXCodeBehind + + + test.aspx + + + testMast.aspx + ASPXCodeBehind + + + testMast.aspx + + + AjaxSimpleFull.Master + ASPXCodeBehind + + + AjaxSimpleFull.Master + + + mod_admin.ascx + ASPXCodeBehind + + + mod_admin.ascx + + + mod_anagFasi.ascx + ASPXCodeBehind + + + mod_anagFasi.ascx + + + mod_anagTags.ascx + ASPXCodeBehind + + + mod_anagTags.ascx + + + mod_archivioDocumenti.ascx + ASPXCodeBehind + + + mod_archivioDocumenti.ascx + + + mod_clipboard.ascx + ASPXCodeBehind + + + mod_clipboard.ascx + + + mod_fileUpload.ascx + ASPXCodeBehind + + + mod_fileUpload.ascx + + + mod_filtroRicerca.ascx + ASPXCodeBehind + + + mod_filtroRicerca.ascx + + + mod_gestioneDati.ascx + ASPXCodeBehind + + + mod_gestioneDati.ascx + + + mod_inputDati.ascx + ASPXCodeBehind + + + mod_inputDati.ascx + + + mod_menu.ascx + ASPXCodeBehind + + + mod_menu.ascx + + + mod_menuBottomFullpage.ascx + ASPXCodeBehind + + + mod_menuBottomFullpage.ascx + + + mod_myTempFile.ascx + ASPXCodeBehind + + + mod_myTempFile.ascx + + + mod_pathAndDocs.ascx + ASPXCodeBehind + + + mod_pathAndDocs.ascx + + + mod_periodoAnalisi.ascx + ASPXCodeBehind + + + mod_periodoAnalisi.ascx + + + mod_singleFileUpload.ascx + ASPXCodeBehind + + + mod_singleFileUpload.ascx + + + mod_testata.ascx + ASPXCodeBehind + + + mod_testata.ascx + + + mod_testataProt.ascx + ASPXCodeBehind + + + mod_testataProt.ascx + + + mod_textAutocomplete.ascx + ASPXCodeBehind + + + mod_textAutocomplete.ascx + + + AutoCompletamento.asmx + Component + + + + + + + + + + + + Always + Designer + + + + + + + + + + Designer + + + + Web.config + + + Web.config + Designer + + + Designer + + + + + + + + {0A14058F-ED18-4F82-91C9-93945C2C409A} + ETS_Data + + + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + + + + + False + True + 52344 + / + + + False + False + + + False + + + + + + \ No newline at end of file diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj.user b/ETS-WS/ETS-WS/ETS-DIP.csproj.user similarity index 97% rename from ETS-WS/ETS-WS/ETS-WS.csproj.user rename to ETS-WS/ETS-WS/ETS-DIP.csproj.user index d6d198e..92d0bc2 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj.user +++ b/ETS-WS/ETS-WS/ETS-DIP.csproj.user @@ -1,31 +1,31 @@ - - - - ProjectFiles - 218 - - - - - - Default.aspx - SpecificPage - True - False - False - False - - - - - - - - - False - True - - - - + + + + ProjectFiles + 218 + + + + + + Default.aspx + SpecificPage + True + False + False + False + + + + + + + + + False + True + + + + \ No newline at end of file diff --git a/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx b/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx index cfcda3d..8bf2fd5 100644 --- a/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx +++ b/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx @@ -1 +1 @@ -<%@ WebService Language="C#" CodeBehind="AutoCompletamento.asmx.cs" Class="ETS_WS.WS.AutoCompletamento" %> +<%@ WebService Language="C#" CodeBehind="AutoCompletamento.asmx.cs" Class="ETS_DIP.WS.AutoCompletamento" %> diff --git a/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs b/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs index c24bc03..5d5ab9d 100644 --- a/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs +++ b/ETS-WS/ETS-WS/WS/AutoCompletamento.asmx.cs @@ -8,8 +8,6 @@ using ETS_Data; namespace ETS_DIP.WS { - - /// /// servizi per AutoCompletamento oggetti /// diff --git a/ETS-WS/ETS-WS/bin/ETS-DIP.dll b/ETS-WS/ETS-WS/bin/ETS-DIP.dll index e81979e..05bd6eb 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-DIP.dll and b/ETS-WS/ETS-WS/bin/ETS-DIP.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index a9822d3..8bbc2d3 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ diff --git a/ETS-WS/ETS-WS/css/BuildBlocks.css b/ETS-WS/ETS-WS/css/BuildBlocks.css index c58c335..032387f 100644 --- a/ETS-WS/ETS-WS/css/BuildBlocks.css +++ b/ETS-WS/ETS-WS/css/BuildBlocks.css @@ -289,35 +289,33 @@ } .autocomplete { - width: 400px; + width: 100%; color: Gray; background-color: White; - font-size: 8pt; - padding: 4px 1px 4px 1px; + padding: 4px 0px; border-bottom: 1px solid #888; } .autocompleteHiglight { - width: 400px; + width: 100%; color: Black; - background-color: Yellow; - font-size: 8pt; - padding: 4px 1px 4px 1px; + background-color: #d3dff4; + padding: 4px 0px; border-bottom: 1px solid #888; } .autocompleteElemID { - width: 400px; + width: 100%; background-color: Red; font-weight: bold; } .autocompleteListCssClass { - width: 400px; - font-size: 8pt; + width: 100%; + font-size: 7pt; background-color: White; - padding: 2px 2px 2px 2px; - border: 1px solid #333; + padding: 2px; + border: 2px solid #3260bc; /* z-index: 1; overflow: Auto;