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

Inserita modifica x upload valori modificati

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-12-28 16:18:43 +01:00
parent 486a660867
commit f6f496f83c
9 changed files with 350 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SHERPA/v15/Server/sqlite3/storage.ide
BIN
View File
Binary file not shown.
.vs/SHERPA/v15/Server/sqlite3/storage.ide-shm
BIN
View File
Binary file not shown.
.vs/SHERPA/v15/Server/sqlite3/storage.ide-wal
BIN
View File
Binary file not shown.
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=78']) {
withEnv(['NEXT_BUILD_NUMBER=80']) {
// env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SHERPA'
SHERPA/Web.config
+200 -200
View File
@@ -84,206 +84,206 @@
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Sockets" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
SHERPA/WebUserControl/mod_uploadStats.ascx
+19 -11
View File
@@ -14,12 +14,22 @@
<asp:TemplateField HeaderText="Fatt Caricate" SortExpression="numFattUpl">
<ItemTemplate>
<div class="row">
<div class="col-8">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("numFattUpl") %>' />
<div class="col-12">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("numFattUpl") %>' />&nbsp;
<asp:LinkButton runat="server" ID="lbtUploadFatt" CssClass="btn btn-outline-success" Visible='<%# checkNum(Eval("numFatt"),Eval("numFattUpl")) %>' OnClick="lbtUploadFatt_Click" CommandArgument='<%# Eval("anno") %>'>
<i class="fa fa-file-text-o" aria-hidden="true"></i> UPLOAD NEW <i class="fa fa-upload" aria-hidden="true"></i>
</asp:LinkButton>
</div>
<div class="col-4">
<asp:LinkButton runat="server" ID="lbtUploadFatt" CssClass="btn btn-block btn-outline-success" Visible='<%# checkNum(Eval("numFatt"),Eval("numFattUpl")) %>' OnClick="lbtUploadFatt_Click" CommandArgument='<%# Eval("anno") %>'>
<i class="fa fa-file-text-o" aria-hidden="true"></i> <i class="fa fa-upload" aria-hidden="true"></i>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Fatt Modificate" SortExpression="numFattMod">
<ItemTemplate>
<div class="row">
<div class="col-12">
<asp:Label ID="lblFattMod" runat="server" Text='<%# Eval("numFattMod") %>' />&nbsp;
<asp:LinkButton runat="server" ID="lbtUploadFattMod" CssClass="btn btn-block2 btn-outline-info" Visible='<%# (Eval("numFattMod").ToString() !="0") %>' OnClick="lbtUploadFattMod_Click" CommandArgument='<%# Eval("anno") %>'>
<i class="fa fa-file-text-o" aria-hidden="true"></i> UPLOAD MOD <i class="fa fa-upload" aria-hidden="true"></i>
</asp:LinkButton>
</div>
</div>
@@ -29,12 +39,10 @@
<asp:TemplateField HeaderText="Clienti Caricati" SortExpression="numCliUpl">
<ItemTemplate>
<div class="row">
<div class="col-8">
<asp:Label ID="Label2" runat="server" Text='<%# Eval("numCliUpl") %>' />
</div>
<div class="col-4">
<asp:LinkButton runat="server" ID="lbtUploadCli" CssClass="btn btn-block btn-outline-secondary" Visible='<%# checkNum(Eval("numCli"),Eval("numCliUpl")) %>' OnClick="lbtUploadCli_Click" CommandArgument='<%# Eval("anno") %>'>
<i class="fa fa-upload" aria-hidden="true"></i> <i class="fa fa-user" aria-hidden="true"></i>
<div class="col-12">
<asp:Label ID="Label2" runat="server" Text='<%# Eval("numCliUpl") %>' />&nbsp;
<asp:LinkButton runat="server" ID="lbtUploadCli" CssClass="btn btn-outline-secondary" Visible='<%# checkNum(Eval("numCli"),Eval("numCliUpl")) %>' OnClick="lbtUploadCli_Click" CommandArgument='<%# Eval("anno") %>'>
<i class="fa fa-upload" aria-hidden="true"></i> UPLOAD NEW <i class="fa fa-user" aria-hidden="true"></i>
</asp:LinkButton>
</div>
</div>
SHERPA/WebUserControl/mod_uploadStats.ascx.cs
+16 -2
View File
@@ -25,7 +25,21 @@ namespace SHERPA.WebUserControl
int.TryParse(nUpl.ToString(), out numUpl);
return (numUpl < numTot);
}
/// <summary>
/// evento upload doc
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtUploadFattMod_Click(object sender, EventArgs e)
{
int anno = 0;
int.TryParse(((LinkButton)sender).CommandArgument, out anno);
// effettuo caricamento fattura...
string fatto = FattInCloud.man.uploadDocsModAnno(dlTipo.SelectedValue, anno);
lblOutMess.Text = fatto;
// aggiorno grid!
grView.DataBind();
}
/// <summary>
/// evento upload doc
/// </summary>
@@ -40,7 +54,7 @@ namespace SHERPA.WebUserControl
lblOutMess.Text = fatto;
// aggiorno grid!
grView.DataBind();
}
}
/// <summary>
/// evento upload doc
/// </summary>
SHERPA_SYNC/DataStruct.cs
+13 -3
View File
@@ -1,9 +1,6 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SHERPA_SYNC
{
@@ -600,7 +597,20 @@ namespace SHERPA_SYNC
/// </summary>
public string token;
}
/// <summary>
/// Classe doc modificato (estende nuovo)
/// </summary>
public class DocModificaRequest : DocNuovoRequest
{
/// <summary>
/// TOken identificativo del documento esistente
/// </summary>
public string token;
}
/// <summary>
/// Classe nuovo Articolo /riga doc)
/// </summary>
public class DocNuovoArticolo
{
/// <summary>
SHERPA_SYNC/FattInCloud.cs
+101 -36
View File
@@ -3,9 +3,6 @@ using RestSharp;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SHERPA_SYNC
{
@@ -101,7 +98,6 @@ namespace SHERPA_SYNC
private string updateDoc(int idxDoc, String idCliente)
{
string answ = "";
#if false
// cerco il documento...
var rDocumento = BillingProxy.man.taDocs.getByKey(idxDoc)[0];
// recupero tutte le righe (=articoli)
@@ -119,62 +115,87 @@ namespace SHERPA_SYNC
case "DDT/BOLLA DI CONSEGNA":
tipo = "ddt";
break;
case "NOTA DI CREDITO":
tipo = "ndc";
break;
default:
tipo = "proforma";
break;
}
var request = new RestRequest(string.Format("{0}/nuovo", tipo), Method.POST);
var request = new RestRequest(string.Format("{0}/modifica", tipo), Method.POST);
// add parametri json
request.RequestFormat = DataFormat.Json;
// compongo righe doc
List<DocNuovoArticolo> elArticoli = new List<DocNuovoArticolo>();
DocNuovoArticolo currArt = new DocNuovoArticolo();
int idx = 0;
foreach (var item in tabArticoli)
{
currArt = new DocNuovoArticolo
{
um = item.um,
quantita = item.qta,
quantita = Math.Abs(item.qta),
descrizione = item.Descrizione,
prezzo_netto = (double)item.prezzoUm,
cod_iva = 0, // 0 = 22% standard, vedere note in DataStruct
tassabile = true,
sconto = item.sconto,
sconto_rosso = 1
sconto = item.sconto * 100, // sconto è in percentuale CON virgola
sconto_rosso = 1,
ordine = idx
};
elArticoli.Add(currArt);
idx++;
}
// imposto un UNICO pagamento a 30gg DFFM
DateTime scadenza = DateTime.Today.AddMonths(2).AddDays(-DateTime.Today.Day);
// imposto un UNICA scadenza standard a 30gg DFFM
DateTime scadenza = rDocumento.emesso.AddMonths(2).AddDays(-DateTime.Today.Day);
List<DocNuovoPagamento> elPagam = new List<DocNuovoPagamento>();
DocNuovoPagamento singlePagam = new DocNuovoPagamento
{
data_scadenza = scadenza.ToString("dd/MM/yyyy"),
importo = "auto",
metodo = "not",
data_saldo = scadenza.ToString("dd/MM/yyyy")
metodo = "not"
};
// verifico saldo
DateTime saldo;
// se è stato pagato registro saldo...
if (rDocumento.totPagato > 0 && rDocumento.totScadenze == 0)
{
try
{
saldo = rDocumento.dataPagam;
}
catch
{
saldo = scadenza;
}
singlePagam.data_saldo = saldo.ToString("dd/MM/yyyy");
singlePagam.metodo = "UBI 71905"; // inserisco il conto come saldo su quello...
}
// registro pagamento...
elPagam.Add(singlePagam);
// compongo doc
DocNuovoRequest req = new DocNuovoRequest
// compongo doc...
DocModificaRequest req = new DocModificaRequest
{
api_uid = apiUID,
api_key = apiKey,
token = rDocumento.id_ext,
id_cliente = idCliente,
autocompila_anagrafica = true,
salva_anagrafica = false,
numero = string.Format("{0}a", rDocumento.num),
numero = string.Format("{0}", rDocumento.num),
data = rDocumento.emesso.ToString("dd/MM/yyyy"),
prezzi_ivati = false,
oggetto_visibile = "FATTURA",
oggetto_visibile = rDocumento.tipo.ToUpper(),
oggetto_interno = rDocumento.Descrizione,
mostra_info_pagamento = true,
PA = false,
split_payment = false,
lista_articoli = elArticoli,
lista_pagamenti = elPagam
};
// includo righe SE modificato righe...
if (rDocumento.changed > 1)
{
req.lista_articoli = elArticoli;
}
string jsonPar = SimpleJson.SimpleJson.SerializeObject(req);
request.AddParameter("application/json", jsonPar, ParameterType.RequestBody);
@@ -188,8 +209,13 @@ namespace SHERPA_SYNC
// salvo
BillingProxy.man.taDocs.updateCodExt(idxDoc, risultato.token, risultato.new_id);
answ = risultato.token;
}
#endif
}
else
{
logger.lg.scriviLog(response.Content, tipoLog.ERROR);
answ = response.Content;
}
return answ;
}
/// <summary>
@@ -218,6 +244,9 @@ namespace SHERPA_SYNC
case "DDT/BOLLA DI CONSEGNA":
tipo = "ddt";
break;
case "NOTA DI CREDITO":
tipo = "ndc";
break;
default:
tipo = "proforma";
break;
@@ -234,12 +263,12 @@ namespace SHERPA_SYNC
currArt = new DocNuovoArticolo
{
um = item.um,
quantita = item.qta,
quantita = Math.Abs(item.qta),
descrizione = item.Descrizione,
prezzo_netto = (double)item.prezzoUm,
cod_iva = 0, // 0 = 22% standard, vedere note in DataStruct
tassabile = true,
sconto = item.sconto,
sconto = item.sconto * 100, // sconto è in percentuale CON virgola
sconto_rosso = 1,
ordine = idx
};
@@ -285,7 +314,7 @@ namespace SHERPA_SYNC
numero = string.Format("{0}a", rDocumento.num),
data = rDocumento.emesso.ToString("dd/MM/yyyy"),
prezzi_ivati = false,
oggetto_visibile = "FATTURA",
oggetto_visibile = rDocumento.tipo.ToUpper(),
oggetto_interno = rDocumento.Descrizione,
mostra_info_pagamento = true,
PA = false,
@@ -400,7 +429,52 @@ namespace SHERPA_SYNC
return answ;
}
/// <summary>
/// Effettua upload dei DOCS dell'anno richiesto
/// </summary>
/// <param name="anno"></param>
/// <returns></returns>
public string uploadDocsModAnno(string tipo, int anno)
{
string fatto = "";
string codCliFIC = "";
string codDocFIC = "";
int maxCall = 30;
int numCall = 0;
// recupero elenco clienti dell'anno con modifiche SOLO testata
DS_Billing.DocumentiDataTable elDoc = BillingProxy.man.taDocs.getByAnno(tipo, anno, false, true);
if (elDoc.Count > 0)
{
foreach (DS_Billing.DocumentiRow item in elDoc)
{
// recupero codCli...
var tabCli = BillingProxy.man.taClienti.getByKey(item.idxCli);
if (tabCli.Rows.Count > 0)
{
codCliFIC = tabCli[0].id_ext;
// AGGIORNO doc esistente
codDocFIC = updateDoc(item.idxDoc, codCliFIC);
// controllo eventuale errore
if (codDocFIC.Contains("error_code") && codDocFIC.Contains("2002"))
{
fatto = codDocFIC;
maxCall = 1;
}
else
{
fatto = "OK";
}
maxCall--;
numCall++;
}
if (maxCall == 0)
{
return string.Format("{0} - {1} call", fatto, numCall);
}
}
}
return string.Format("{0} - {1} call", fatto, numCall);
}
/// <summary>
/// Effettua upload dei DOCS dell'anno richiesto
/// </summary>
@@ -414,7 +488,7 @@ namespace SHERPA_SYNC
int maxCall = 30;
int numCall = 0;
// recupero elenco clienti dell'anno NON caricati...
var elDoc = BillingProxy.man.taDocs.getByAnno(tipo, anno, true);
var elDoc = BillingProxy.man.taDocs.getByAnno(tipo, anno, true, false);
if (elDoc.Count > 0)
{
foreach (var item in elDoc)
@@ -429,15 +503,6 @@ namespace SHERPA_SYNC
// controllo eventuale errore
if (codDocFIC.Contains("error_code") && codDocFIC.Contains("2002"))
{
#if false
// attendo i secondi richiesti...
int numSec = 10;
int idxAtt = codDocFIC.IndexOf("Attendi");
string textSec = codDocFIC.Substring(idxAtt + 8, 2);
int.TryParse(textSec, out numSec);
logger.lg.scriviLog(string.Format("Imposto attesa {0} sec", numSec), tipoLog.INFO);
System.Threading.Thread.Sleep(1000 * numSec);
#endif
fatto = codDocFIC;
maxCall = 1;
}