Egalware/ETS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
samuele
2012-12-18 19:50:53 +01:00
parent e9325d8389 f5931f8f91
commit 748e7b26ac
30 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS-WS/ETS-WS/ETS-WS.csproj
+4
View File
@@ -84,6 +84,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AjaxMin.4.74.4698.25434\lib\net40\AjaxMin.dll</HintPath>
</Reference>
<Reference Include="DocumentFormat.OpenXml, Version=2.0.5022.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\DocumentFormat.OpenXml.1.0\lib\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.0.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
<HintPath>..\packages\AjaxControlToolkit.4.1.60919\lib\40\SanitizerProviders\HtmlAgilityPack.dll</HintPath>
</Reference>
ETS-WS/ETS-WS/MyDocs.aspx.cs
+2
View File
@@ -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;
}
/// <summary>
/// variabile in session x definire se vada mostrato file upload o metadati input
ETS-WS/ETS-WS/Web.config
+1 -1
View File
@@ -28,7 +28,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="110" />
<add key="minRev" value="112" />
<add key="copyRight" value="SteamWare, ETS © 2012" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
ETS-WS/ETS-WS/bin/DocumentFormat.OpenXml.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/bin/ETS-WS.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize.parameters.xml
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<parameters>
<parameter name="ETS_Data.Properties.Settings.ETS_WSConnectionString-Web.config Connection String" description="ETS_Data.Properties.Settings.ETS_WSConnectionString Connection String used in web.config by the application to access the database." defaultvalue="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" tags="SqlConnectionString">
<parameter name="ETS_Data.Properties.Settings.ETS_WSConnectionString-Web.config Connection String" description="ETS_Data.Properties.Settings.ETS_WSConnectionString Connection String used in web.config by the application to access the database." defaultvalue="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=steamware;Password=viadante16" tags="SqlConnectionString">
<parameterEntry kind="XmlFile" scope="C:\\Users\\samuele\\Documents\\Visual\ Studio\ 2010\\Projects\\ETS\\ETS-WS\\ETS-WS\\obj\\ETS\\Package\\PackageTmp\\Web\.config$" match="/configuration/connectionStrings/add[@name='ETS_Data.Properties.Settings.ETS_WSConnectionString']/@connectionString" />
</parameter>
<parameter name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString-Web.config Connection String" description="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString Connection String used in web.config by the application to access the database." defaultvalue="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" tags="SqlConnectionString">
<parameter name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString-Web.config Connection String" description="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString Connection String used in web.config by the application to access the database." defaultvalue="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=steamware;Password=viadante16" tags="SqlConnectionString">
<parameterEntry kind="XmlFile" scope="C:\\Users\\samuele\\Documents\\Visual\ Studio\ 2010\\Projects\\ETS\\ETS-WS\\ETS-WS\\obj\\ETS\\Package\\PackageTmp\\Web\.config$" match="/configuration/connectionStrings/add[@name='ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString']/@connectionString" />
</parameter>
</parameters>
ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config
+5 -5
View File
@@ -28,7 +28,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="110" />
<add key="minRev" value="112" />
<add key="copyRight" value="SteamWare, ETS © 2012" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -45,12 +45,12 @@
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
<add key="ETS_WSConnectionString" value="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" />
<add key="ETS_WSConnectionString" value="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=steamware;Password=viadante16" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=steamware;Password=viadante16" />
</appSettings>
<connectionStrings>
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=steamware;Password=viadante16" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=steamware;Password=viadante16" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config
+3 -3
View File
@@ -28,7 +28,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="110" />
<add key="minRev" value="112" />
<add key="copyRight" value="SteamWare, ETS © 2012" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -45,8 +45,8 @@
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
<add key="ETS_WSConnectionString" value="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" />
<add key="ETS_WSConnectionString" value="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=steamware;Password=viadante16" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=steamware;Password=viadante16" />
</appSettings>
<connectionStrings>
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="$(ReplacableToken_ETS_Data.Properties.Settings.ETS_WSConnectionString-Web.config Connection String_0)" providerName="System.Data.SqlClient" />
ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/ETS-WS.csproj.FileListAbsolute.txt
+1
View File
@@ -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
ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.SetParameters.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<parameters>
<setParameter name="IIS Web Application Name" value="Default Web Site/ETS-WS" />
<setParameter name="ETS_Data.Properties.Settings.ETS_WSConnectionString-Web.config Connection String" value="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" />
<setParameter name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString-Web.config Connection String" value="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" />
<setParameter name="ETS_Data.Properties.Settings.ETS_WSConnectionString-Web.config Connection String" value="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=steamware;Password=viadante16" />
<setParameter name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString-Web.config Connection String" value="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=steamware;Password=viadante16" />
</parameters>
ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config
+1 -1
View File
@@ -28,7 +28,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="110" />
<add key="minRev" value="112" />
<add key="copyRight" value="SteamWare, ETS © 2012" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config
+5 -5
View File
@@ -28,7 +28,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="110" />
<add key="minRev" value="112" />
<add key="copyRight" value="SteamWare, ETS © 2012" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -45,12 +45,12 @@
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
<add key="ETS_WSConnectionString" value="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" />
<add key="ETS_WSConnectionString" value="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=steamware;Password=viadante16" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=steamware;Password=viadante16" />
</appSettings>
<connectionStrings>
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=Steamwarepwd16!" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=localhost;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=steamware;Password=viadante16" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=localhost;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=steamware;Password=viadante16" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
ETS-WS/ETS-WS/packages.config
+1
View File
@@ -2,6 +2,7 @@
<packages>
<package id="AjaxControlToolkit" version="4.1.60919" targetFramework="net40" />
<package id="AjaxMin" version="4.74.4698.25434" targetFramework="net40" />
<package id="DocumentFormat.OpenXml" version="1.0" targetFramework="net40" />
<package id="jQuery" version="1.8.2" targetFramework="net40" />
<package id="jQuery.UI.Combined" version="1.9.0" targetFramework="net40" />
<package id="NLog" version="2.0.0.2000" targetFramework="net40" />
ETS-WS/packages/DocumentFormat.OpenXml.1.0/DocumentFormat.OpenXml.1.0.nupkg
Vendored
BIN
View File
Binary file not shown.
ETS-WS/packages/DocumentFormat.OpenXml.1.0/DocumentFormat.OpenXml.1.0.nuspec
Vendored
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>DocumentFormat.OpenXml</id>
<version>1.0</version>
<title>DocumentFormat.OpenXml</title>
<authors>Microsot</authors>
<owners>Microsot</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Microsoft OpenXML SDK 2.0</description>
<summary>Microsoft OpenXML SDK 2.0</summary>
<references>
<reference file="DocumentFormat.OpenXml.dll" />
</references>
</metadata>
</package>
ETS-WS/packages/DocumentFormat.OpenXml.1.0/lib/DocumentFormat.OpenXml.dll
Vendored
BIN
View File
Binary file not shown.
ETS_Data/ETS_Data.csproj
+4 -1
View File
@@ -63,7 +63,10 @@
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
</PropertyGroup>
<ItemGroup>
<Reference Include="DocumentFormat.OpenXml, Version=2.0.5022.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="DocumentFormat.OpenXml, Version=2.0.5022.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\ETS-WS\packages\DocumentFormat.OpenXml.1.0\lib\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
<Reference Include="NLog">
<HintPath>..\ETS-WS\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
</Reference>
ETS_Data/bin/ETS/DocumentFormat.OpenXml.dll
BIN
View File
Binary file not shown.
ETS_Data/bin/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt
+1
View File
@@ -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
ETS_Data/obj/ETS/ETS_Data.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/ETS_Data.pdb
BIN
View File
Binary file not shown.
ETS_Data/packages.config
+1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DocumentFormat.OpenXml" version="1.0" targetFramework="net40" />
<package id="NLog" version="2.0.0.2000" targetFramework="net40" />
<package id="NLog.Config" version="2.0.0.2000" targetFramework="net40" />
<package id="NLog.Schema" version="2.0.0.2000" targetFramework="net40" />