diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj index ac4f6db..b0ddc91 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj +++ b/ETS-WS/ETS-WS/ETS-WS.csproj @@ -84,6 +84,10 @@ 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 diff --git a/ETS-WS/ETS-WS/MyDocs.aspx.cs b/ETS-WS/ETS-WS/MyDocs.aspx.cs index fdb455b..ed26d10 100644 --- a/ETS-WS/ETS-WS/MyDocs.aspx.cs +++ b/ETS-WS/ETS-WS/MyDocs.aspx.cs @@ -63,6 +63,8 @@ namespace ETS_WS pnlFileUpload.Visible = showUpload; pnlInputDati.Visible = !showUpload; mod_myTempFile1.editMode = !showUpload; + mod_pathAndDocs1.Visible = !showUpload; + mod_myTempFile1.Visible = !showUpload; } /// /// variabile in session x definire se vada mostrato file upload o metadati input diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index c0d3119..3f6a9e4 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -28,7 +28,7 @@ - + diff --git a/ETS-WS/ETS-WS/bin/DocumentFormat.OpenXml.dll b/ETS-WS/ETS-WS/bin/DocumentFormat.OpenXml.dll new file mode 100644 index 0000000..a3249c1 Binary files /dev/null and b/ETS-WS/ETS-WS/bin/DocumentFormat.OpenXml.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 4b10eb8..f8602c6 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-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index 7cab6a5..ecfeee9 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/obj/ETS/CSAutoParameterize.parameters.xml b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize.parameters.xml index e94fc3c..65cacf9 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize.parameters.xml +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize.parameters.xml @@ -1,9 +1,9 @@  - + - + \ No newline at end of file diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config index e5171e5..c5e1dea 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config @@ -28,7 +28,7 @@ - + @@ -45,12 +45,12 @@ - - + + - - + + diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config index 0b6989f..84493d2 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config @@ -28,7 +28,7 @@ - + @@ -45,8 +45,8 @@ - - + + diff --git a/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache b/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache index 74a9be7..6fbf3ae 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csproj.FileListAbsolute.txt b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csproj.FileListAbsolute.txt index 74c67ba..937edd7 100644 --- a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csproj.FileListAbsolute.txt +++ b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csproj.FileListAbsolute.txt @@ -33,3 +33,4 @@ C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\obj\ETS C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\obj\ETS\ETS-WS.dll C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\obj\ETS\ETS-WS.pdb C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\AjaxMin.dll +C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS-WS\ETS-WS\bin\DocumentFormat.OpenXml.dll diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache index d845f16..0083116 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache differ diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll index 4b10eb8..f8602c6 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.SetParameters.xml b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.SetParameters.xml index 8de3aab..1eb58a3 100644 --- a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.SetParameters.xml +++ b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.SetParameters.xml @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip index 46d6958..0d77858 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip and b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip differ diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config index 28dbdf5..e99c539 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config @@ -28,7 +28,7 @@ - + diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config index e5171e5..c5e1dea 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config @@ -28,7 +28,7 @@ - + @@ -45,12 +45,12 @@ - - + + - - + + diff --git a/ETS-WS/ETS-WS/packages.config b/ETS-WS/ETS-WS/packages.config index be74dc8..3dac57e 100644 --- a/ETS-WS/ETS-WS/packages.config +++ b/ETS-WS/ETS-WS/packages.config @@ -2,6 +2,7 @@ + diff --git a/ETS-WS/packages/DocumentFormat.OpenXml.1.0/DocumentFormat.OpenXml.1.0.nupkg b/ETS-WS/packages/DocumentFormat.OpenXml.1.0/DocumentFormat.OpenXml.1.0.nupkg new file mode 100644 index 0000000..68f6f2d Binary files /dev/null and b/ETS-WS/packages/DocumentFormat.OpenXml.1.0/DocumentFormat.OpenXml.1.0.nupkg differ diff --git a/ETS-WS/packages/DocumentFormat.OpenXml.1.0/DocumentFormat.OpenXml.1.0.nuspec b/ETS-WS/packages/DocumentFormat.OpenXml.1.0/DocumentFormat.OpenXml.1.0.nuspec new file mode 100644 index 0000000..f8bc9ec --- /dev/null +++ b/ETS-WS/packages/DocumentFormat.OpenXml.1.0/DocumentFormat.OpenXml.1.0.nuspec @@ -0,0 +1,16 @@ + + + + DocumentFormat.OpenXml + 1.0 + DocumentFormat.OpenXml + Microsot + Microsot + false + Microsoft OpenXML SDK 2.0 + Microsoft OpenXML SDK 2.0 + + + + + \ No newline at end of file diff --git a/ETS-WS/packages/DocumentFormat.OpenXml.1.0/lib/DocumentFormat.OpenXml.dll b/ETS-WS/packages/DocumentFormat.OpenXml.1.0/lib/DocumentFormat.OpenXml.dll new file mode 100644 index 0000000..a3249c1 Binary files /dev/null and b/ETS-WS/packages/DocumentFormat.OpenXml.1.0/lib/DocumentFormat.OpenXml.dll differ diff --git a/ETS_Data/ETS_Data.csproj b/ETS_Data/ETS_Data.csproj index 5e7008b..bcae156 100644 --- a/ETS_Data/ETS_Data.csproj +++ b/ETS_Data/ETS_Data.csproj @@ -63,7 +63,10 @@ true - + + True + ..\ETS-WS\packages\DocumentFormat.OpenXml.1.0\lib\DocumentFormat.OpenXml.dll + ..\ETS-WS\packages\NLog.2.0.0.2000\lib\net40\NLog.dll diff --git a/ETS_Data/bin/ETS/DocumentFormat.OpenXml.dll b/ETS_Data/bin/ETS/DocumentFormat.OpenXml.dll new file mode 100644 index 0000000..a3249c1 Binary files /dev/null and b/ETS_Data/bin/ETS/DocumentFormat.OpenXml.dll differ diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll index 7cab6a5..ecfeee9 100644 Binary files a/ETS_Data/bin/ETS/ETS_Data.dll and b/ETS_Data/bin/ETS/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache b/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache index fbfbabb..5028513 100644 Binary files a/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt b/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt index e7a44c9..5f99dbc 100644 --- a/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt +++ b/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt @@ -7,3 +7,4 @@ C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\ETS\NLog C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.csprojResolveAssemblyReference.cache C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.dll C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.pdb +C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\ETS\DocumentFormat.OpenXml.dll diff --git a/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache index c6f0812..d0a4a67 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache and b/ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache differ diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index 7cab6a5..ecfeee9 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/ETS_Data.pdb b/ETS_Data/obj/ETS/ETS_Data.pdb index f75efd3..6cf8df9 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.pdb and b/ETS_Data/obj/ETS/ETS_Data.pdb differ diff --git a/ETS_Data/packages.config b/ETS_Data/packages.config index 0d30cd4..d48ab31 100644 --- a/ETS_Data/packages.config +++ b/ETS_Data/packages.config @@ -1,5 +1,6 @@  +