diff --git a/project/Equa_Auth/bin/SteamWare.dll b/project/Equa_Auth/bin/SteamWare.dll
index d8a899b..507b838 100644
Binary files a/project/Equa_Auth/bin/SteamWare.dll and b/project/Equa_Auth/bin/SteamWare.dll differ
diff --git a/project/Release Clienti/XPS.zip b/project/Release Clienti/XPS.zip
index 1f83f49..ab55882 100644
Binary files a/project/Release Clienti/XPS.zip and b/project/Release Clienti/XPS.zip differ
diff --git a/project/XPS/Web.EQUA.config b/project/XPS/Web.EQUA.config
index b518fad..fc1df7c 100644
--- a/project/XPS/Web.EQUA.config
+++ b/project/XPS/Web.EQUA.config
@@ -30,7 +30,7 @@
-
+
diff --git a/project/XPS/Web.config b/project/XPS/Web.config
index 4dad543..eda4862 100644
--- a/project/XPS/Web.config
+++ b/project/XPS/Web.config
@@ -133,7 +133,7 @@
-
+
@@ -167,8 +167,10 @@
-
-
+
+
+
diff --git a/project/XPS/XPS.csproj b/project/XPS/XPS.csproj
index eea2926..0b81828 100644
--- a/project/XPS/XPS.csproj
+++ b/project/XPS/XPS.csproj
@@ -755,6 +755,7 @@
Web.config
+ Designer
diff --git a/project/XPS/XPS.csproj.user b/project/XPS/XPS.csproj.user
index e0f6316..7dd6d51 100644
--- a/project/XPS/XPS.csproj.user
+++ b/project/XPS/XPS.csproj.user
@@ -2,7 +2,7 @@
ShowAllFiles
- 218
+ EQUA
diff --git a/project/XPS/bin/SteamWare.dll b/project/XPS/bin/SteamWare.dll
index d8a899b..507b838 100644
Binary files a/project/XPS/bin/SteamWare.dll and b/project/XPS/bin/SteamWare.dll differ
diff --git a/project/XPS/bin/XPS.dll b/project/XPS/bin/XPS.dll
index a8033c6..60397a4 100644
Binary files a/project/XPS/bin/XPS.dll and b/project/XPS/bin/XPS.dll differ
diff --git a/project/XPS/bin/XPS_data.dll b/project/XPS/bin/XPS_data.dll
index 20308b4..7de72de 100644
Binary files a/project/XPS/bin/XPS_data.dll and b/project/XPS/bin/XPS_data.dll differ
diff --git a/project/XPS/obj/EQUA/CSAutoParameterize.parameters.xml b/project/XPS/obj/EQUA/CSAutoParameterize.parameters.xml
new file mode 100644
index 0000000..56604b9
--- /dev/null
+++ b/project/XPS/obj/EQUA/CSAutoParameterize.parameters.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/XPS/obj/EQUA/CSAutoParameterize/original/Web.config b/project/XPS/obj/EQUA/CSAutoParameterize/original/Web.config
new file mode 100644
index 0000000..c3f25cf
--- /dev/null
+++ b/project/XPS/obj/EQUA/CSAutoParameterize/original/Web.config
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/XPS/obj/EQUA/CSAutoParameterize/transformed/Web.config b/project/XPS/obj/EQUA/CSAutoParameterize/transformed/Web.config
new file mode 100644
index 0000000..6770845
--- /dev/null
+++ b/project/XPS/obj/EQUA/CSAutoParameterize/transformed/Web.config
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/XPS/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache b/project/XPS/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..c572781
Binary files /dev/null and b/project/XPS/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/project/XPS/obj/EQUA/ProfileTransformWebConfig/assist/Web.config b/project/XPS/obj/EQUA/ProfileTransformWebConfig/assist/Web.config
new file mode 100644
index 0000000..b518fad
--- /dev/null
+++ b/project/XPS/obj/EQUA/ProfileTransformWebConfig/assist/Web.config
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/XPS/obj/EQUA/ProfileTransformWebConfig/original/Web.config b/project/XPS/obj/EQUA/ProfileTransformWebConfig/original/Web.config
new file mode 100644
index 0000000..c3f25cf
--- /dev/null
+++ b/project/XPS/obj/EQUA/ProfileTransformWebConfig/original/Web.config
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/XPS/obj/EQUA/RdlCompile.cache b/project/XPS/obj/EQUA/RdlCompile.cache
new file mode 100644
index 0000000..576b332
Binary files /dev/null and b/project/XPS/obj/EQUA/RdlCompile.cache differ
diff --git a/project/XPS/obj/EQUA/RdlCompile.compiled b/project/XPS/obj/EQUA/RdlCompile.compiled
new file mode 100644
index 0000000..e69de29
diff --git a/project/XPS/obj/EQUA/TransformWebConfig/assist/Web.config b/project/XPS/obj/EQUA/TransformWebConfig/assist/Web.config
new file mode 100644
index 0000000..b518fad
--- /dev/null
+++ b/project/XPS/obj/EQUA/TransformWebConfig/assist/Web.config
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/XPS/obj/EQUA/TransformWebConfig/original/Web.config b/project/XPS/obj/EQUA/TransformWebConfig/original/Web.config
new file mode 100644
index 0000000..1f5fdc7
--- /dev/null
+++ b/project/XPS/obj/EQUA/TransformWebConfig/original/Web.config
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/XPS/obj/EQUA/TransformWebConfig/transformed/Web.config b/project/XPS/obj/EQUA/TransformWebConfig/transformed/Web.config
new file mode 100644
index 0000000..c3f25cf
--- /dev/null
+++ b/project/XPS/obj/EQUA/TransformWebConfig/transformed/Web.config
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/XPS/obj/EQUA/XPS.csproj.FileListAbsolute.txt b/project/XPS/obj/EQUA/XPS.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..05b3579
--- /dev/null
+++ b/project/XPS/obj/EQUA/XPS.csproj.FileListAbsolute.txt
@@ -0,0 +1,31 @@
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\MDB_Data\si_dt30.mdb
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\XPS.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\XPS.pdb
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\AjaxControlToolkit.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\AjaxMin.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\SanitizerProviders.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\SteamWare.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\XPS_data.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\ICSharpCode.SharpZipLib.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\XPS_data.pdb
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\ar\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\cs\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\de\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\es\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\fr\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\he\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\hi\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\it\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\ja\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\ko\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\nl\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\pt\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\ru\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\tr-TR\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\zh-CHS\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\bin\zh-CHT\AjaxControlToolkit.resources.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\obj\EQUA\XPS.csprojResolveAssemblyReference.cache
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\obj\EQUA\RdlCompile.cache
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\obj\EQUA\RdlCompile.compiled
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\obj\EQUA\XPS.dll
+C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\XPS\obj\EQUA\XPS.pdb
diff --git a/project/XPS/obj/EQUA/XPS.csprojResolveAssemblyReference.cache b/project/XPS/obj/EQUA/XPS.csprojResolveAssemblyReference.cache
new file mode 100644
index 0000000..b2af1ae
Binary files /dev/null and b/project/XPS/obj/EQUA/XPS.csprojResolveAssemblyReference.cache differ
diff --git a/project/XPS/obj/EQUA/XPS.dll b/project/XPS/obj/EQUA/XPS.dll
new file mode 100644
index 0000000..60397a4
Binary files /dev/null and b/project/XPS/obj/EQUA/XPS.dll differ
diff --git a/project/XPS/obj/EQUA/_WPPLastBuildInfo.txt b/project/XPS/obj/EQUA/_WPPLastBuildInfo.txt
new file mode 100644
index 0000000..70db109
Binary files /dev/null and b/project/XPS/obj/EQUA/_WPPLastBuildInfo.txt differ
diff --git a/project/XPST/bin/SteamWare.dll b/project/XPST/bin/SteamWare.dll
index d8a899b..507b838 100644
Binary files a/project/XPST/bin/SteamWare.dll and b/project/XPST/bin/SteamWare.dll differ
diff --git a/project/XPST/bin/XPS_data.dll b/project/XPST/bin/XPS_data.dll
index 20308b4..7de72de 100644
Binary files a/project/XPST/bin/XPS_data.dll and b/project/XPST/bin/XPS_data.dll differ
diff --git a/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache b/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..12ff6cc
Binary files /dev/null and b/project/XPST/obj/EQUA/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/project/XPST/obj/EQUA/build.force b/project/XPST/obj/EQUA/build.force
new file mode 100644
index 0000000..e69de29
diff --git a/project/XPS_app.v11.suo b/project/XPS_app.v11.suo
index fd37a61..c55aa11 100644
Binary files a/project/XPS_app.v11.suo and b/project/XPS_app.v11.suo differ
diff --git a/project/XPS_data/DS_XPS.Designer.cs b/project/XPS_data/DS_XPS.Designer.cs
index a2b12c9..346d909 100644
--- a/project/XPS_data/DS_XPS.Designer.cs
+++ b/project/XPS_data/DS_XPS.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.18046
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -9851,7 +9851,7 @@ SELECT CodMappa, DescrMappa FROM AnagMappe WHERE (CodMappa = @CodMappa)";
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.IDbCommand[2];
+ this._commandCollection = new global::System.Data.IDbCommand[3];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Connection = new global::System.Data.SqlClient.SqlConnection(global::XPS_data.Properties.Settings.Default.Equa_XPSConnectionString);
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandText = "dbo.sp_clonaTransizEventi";
@@ -9869,6 +9869,12 @@ SELECT CodMappa, DescrMappa FROM AnagMappe WHERE (CodMappa = @CodMappa)";
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMappa", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxTipoObjFrom", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxTipoObjTo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Connection = new global::System.Data.SqlClient.SqlConnection(global::XPS_data.Properties.Settings.Default.Equa_XPSConnectionString);
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandText = "dbo.stp_CaricaAnagCliSwing";
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandType = global::System.Data.CommandType.StoredProcedure;
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@esito", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.InputOutput, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -9956,6 +9962,41 @@ SELECT CodMappa, DescrMappa FROM AnagMappe WHERE (CodMappa = @CodMappa)";
}
return returnValue;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ public virtual int stp_CaricaAnagCliSwing(ref string esito) {
+ global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[2]));
+ if ((esito == null)) {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[1].Value = ((string)(esito));
+ }
+ global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+ if (((command.Connection.State & global::System.Data.ConnectionState.Open)
+ != global::System.Data.ConnectionState.Open)) {
+ command.Connection.Open();
+ }
+ int returnValue;
+ try {
+ returnValue = command.ExecuteNonQuery();
+ }
+ finally {
+ if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+ command.Connection.Close();
+ }
+ }
+ if (((command.Parameters[1].Value == null)
+ || (command.Parameters[1].Value.GetType() == typeof(global::System.DBNull)))) {
+ esito = null;
+ }
+ else {
+ esito = ((string)(command.Parameters[1].Value));
+ }
+ return returnValue;
+ }
}
///
diff --git a/project/XPS_data/DS_XPS.xsd b/project/XPS_data/DS_XPS.xsd
index 208b00a..95fac91 100644
--- a/project/XPS_data/DS_XPS.xsd
+++ b/project/XPS_data/DS_XPS.xsd
@@ -9,7 +9,7 @@
-
+
DELETE FROM [dbo].[Note] WHERE (([NumNota] = @Original_NumNota) AND ((@IsNull_IdxObj = 1 AND [IdxObj] IS NULL) OR ([IdxObj] = @Original_IdxObj)) AND ((@IsNull_CodFase = 1 AND [CodFase] IS NULL) OR ([CodFase] = @Original_CodFase)) AND ((@IsNull_UserNota = 1 AND [UserNota] IS NULL) OR ([UserNota] = @Original_UserNota)) AND ((@IsNull_Data = 1 AND [Data] IS NULL) OR ([Data] = @Original_Data)) AND ((@IsNull_ExtView = 1 AND [ExtView] IS NULL) OR ([ExtView] = @Original_ExtView)) AND ((@IsNull_Nota = 1 AND [Nota] IS NULL) OR ([Nota] = @Original_Nota)))
@@ -94,7 +94,7 @@ SELECT NumNota, IdxObj, CodFase, UserNota, Data, ExtView, Nota FROM Note WHERE (
-
+
DELETE FROM [dbo].[Step4Obj] WHERE (([IdxObj] = @Original_IdxObj) AND ([IdxStep] = @Original_IdxStep) AND ((@IsNull_IdxStato = 1 AND [IdxStato] IS NULL) OR ([IdxStato] = @Original_IdxStato)) AND ((@IsNull_StartDatePrev = 1 AND [StartDatePrev] IS NULL) OR ([StartDatePrev] = @Original_StartDatePrev)) AND ((@IsNull_DueDatePrev = 1 AND [DueDatePrev] IS NULL) OR ([DueDatePrev] = @Original_DueDatePrev)) AND ((@IsNull_StartDateReal = 1 AND [StartDateReal] IS NULL) OR ([StartDateReal] = @Original_StartDateReal)) AND ((@IsNull_DueDateReal = 1 AND [DueDateReal] IS NULL) OR ([DueDateReal] = @Original_DueDateReal)) AND ((@IsNull_RatioCompl = 1 AND [RatioCompl] IS NULL) OR ([RatioCompl] = @Original_RatioCompl)))
@@ -184,7 +184,7 @@ SELECT IdxObj, IdxStep, IdxStato, StartDatePrev, DueDatePrev, StartDateReal, Due
-
+
DELETE FROM [dbo].[Object2Set] WHERE (([IdxSet] = @Original_IdxSet) AND ([CodObj] = @Original_CodObj) AND ((@IsNull_Qta = 1 AND [Qta] IS NULL) OR ([Qta] = @Original_Qta)) AND ((@IsNull_UserQtyReq = 1 AND [UserQtyReq] IS NULL) OR ([UserQtyReq] = @Original_UserQtyReq)) AND ((@IsNull_Posizione = 1 AND [Posizione] IS NULL) OR ([Posizione] = @Original_Posizione)) AND ((@IsNull_TimeTrackEnab = 1 AND [TimeTrackEnab] IS NULL) OR ([TimeTrackEnab] = @Original_TimeTrackEnab)) AND ((@IsNull_ProcReq = 1 AND [ProcReq] IS NULL) OR ([ProcReq] = @Original_ProcReq)) AND ((@IsNull_ExtView = 1 AND [ExtView] IS NULL) OR ([ExtView] = @Original_ExtView)))
@@ -271,7 +271,7 @@ SELECT IdxSet, CodObj, Qta, UserQtyReq, Posizione, TimeTrackEnab, ProcReq, ExtVi
-
+
SELECT IdxSet, CodObj, Qta, UserQtyReq, Posizione, TimeTrackEnab, ProcReq, ExtView
@@ -287,7 +287,7 @@ WHERE (IdxSet = @IdxSet)
-
+
DELETE FROM [dbo].[UM] WHERE (([UM] = @Original_UM) AND ((@IsNull_DescrUM = 1 AND [DescrUM] IS NULL) OR ([DescrUM] = @Original_DescrUM)) AND ((@IsNull_FattoreSI = 1 AND [FattoreSI] IS NULL) OR ([FattoreSI] = @Original_FattoreSI)))
@@ -344,7 +344,7 @@ SELECT UM, DescrUM, FattoreSI FROM UM WHERE (UM = @UM)
-
+
DELETE FROM [dbo].[Eventi] WHERE (([CodEvento] = @Original_CodEvento) AND ((@IsNull_CodTipoEvento = 1 AND [CodTipoEvento] IS NULL) OR ([CodTipoEvento] = @Original_CodTipoEvento)) AND ((@IsNull_DescrEvento = 1 AND [DescrEvento] IS NULL) OR ([DescrEvento] = @Original_DescrEvento)) AND ((@IsNull_Action = 1 AND [Action] IS NULL) OR ([Action] = @Original_Action)))
@@ -405,7 +405,7 @@ SELECT CodEvento, CodTipoEvento, DescrEvento, Action FROM Eventi WHERE (CodEvent
-
+
DELETE FROM [dbo].[Eventi] WHERE ([idxEvento] = @Original_idxEvento)
@@ -415,7 +415,7 @@ SELECT CodEvento, CodTipoEvento, DescrEvento, Action FROM Eventi WHERE (CodEvent
-
+
UPDATE Eventi
@@ -434,7 +434,7 @@ WHERE (CodEvento = @Original_CodEvento)
-
+
DELETE FROM [dbo].[TipoEventi] WHERE (([CodTipoEvento] = @Original_CodTipoEvento) AND ((@IsNull_DescrTipoEv = 1 AND [DescrTipoEv] IS NULL) OR ([DescrTipoEv] = @Original_DescrTipoEv)))
@@ -484,7 +484,7 @@ SELECT CodTipoEvento, DescrTipoEv FROM TipoEventi WHERE (CodTipoEvento = @CodTip
-
+
SELECT CodMappa, IdxTipoObj, DescrObj, CodStato, StatoCurr, CodEvento, DescrEvento, NextCodStato, StatoNext FROM dbo.v_ev2stati
@@ -505,7 +505,7 @@ SELECT CodTipoEvento, DescrTipoEv FROM TipoEventi WHERE (CodTipoEvento = @CodTip
-
+
SELECT CodEvento, CodMappa, CodStato, DescrEvento, DescrObj, IdxTipoObj, NextCodStato, StatoCurr, StatoNext FROM v_ev2stati WHERE (CodEvento = @CodEvento) AND (IdxTipoObj = @IdxTipoObj) AND (CodMappa = @CodMappa)
@@ -517,7 +517,7 @@ SELECT CodTipoEvento, DescrTipoEv FROM TipoEventi WHERE (CodTipoEvento = @CodTip
-
+
INSERT INTO TransizioneEventiStati
@@ -537,7 +537,7 @@ VALUES (@CodMappa,@CodStato,@IdxTipoObj,@CodEvento,@NextCodStato)
-
+
DELETE FROM [dbo].[AnagStati] WHERE (([CodStato] = @Original_CodStato) AND ([FamStato] = @Original_FamStato) AND ((@IsNull_DescrStato = 1 AND [DescrStato] IS NULL) OR ([DescrStato] = @Original_DescrStato)))
@@ -592,7 +592,7 @@ SELECT CodStato, FamStato, DescrStato FROM AnagStati WHERE (CodStato = @CodStato
-
+
DELETE FROM [dbo].[AnagObj] WHERE (([CodObj] = @Original_CodObj) AND ((@IsNull_DescrObj = 1 AND [DescrObj] IS NULL) OR ([DescrObj] = @Original_DescrObj)) AND ((@IsNull_FamStato = 1 AND [FamStato] IS NULL) OR ([FamStato] = @Original_FamStato)) AND ((@IsNull_Concreto = 1 AND [Concreto] IS NULL) OR ([Concreto] = @Original_Concreto)))
@@ -656,7 +656,7 @@ SELECT CodObj, DescrObj, FamStato, Concreto FROM AnagObj WHERE (CodObj = @CodObj
-
+
DELETE FROM [dbo].[AnagMappe] WHERE (([CodMappa] = @Original_CodMappa) AND ((@IsNull_DescrMappa = 1 AND [DescrMappa] IS NULL) OR ([DescrMappa] = @Original_DescrMappa)))
@@ -703,7 +703,7 @@ SELECT CodMappa, DescrMappa FROM AnagMappe WHERE (CodMappa = @CodMappa)
-
+
DELETE FROM AnagMappe
@@ -714,7 +714,7 @@ WHERE (CodMappa = @Original_CodMappa)
-
+
UPDATE AnagMappe
@@ -732,7 +732,7 @@ WHERE (CodMappa = @Original_CodMappa)
-
+
dbo.sp_clonaTransizEventi
@@ -746,7 +746,7 @@ WHERE (CodMappa = @Original_CodMappa)
-
+
dbo.sp_clonaStati
@@ -759,41 +759,52 @@ WHERE (CodMappa = @Original_CodMappa)
+
+
+
+ dbo.stp_CaricaAnagCliSwing
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
@@ -803,104 +814,104 @@ WHERE (CodMappa = @Original_CodMappa)
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -910,17 +921,17 @@ WHERE (CodMappa = @Original_CodMappa)
-
+
-
+
-
+
@@ -930,66 +941,66 @@ WHERE (CodMappa = @Original_CodMappa)
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -999,24 +1010,24 @@ WHERE (CodMappa = @Original_CodMappa)
-
+
-
+
-
+
-
+
@@ -1026,45 +1037,45 @@ WHERE (CodMappa = @Original_CodMappa)
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1124,8 +1135,8 @@ WHERE (CodMappa = @Original_CodMappa)
-
-
+
+
\ No newline at end of file
diff --git a/project/XPS_data/DS_XPS.xss b/project/XPS_data/DS_XPS.xss
index e56051a..0e20857 100644
--- a/project/XPS_data/DS_XPS.xss
+++ b/project/XPS_data/DS_XPS.xss
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
@@ -15,8 +15,8 @@
-
+
diff --git a/project/XPS_data/DS_XPS2.cs b/project/XPS_data/DS_XPS2.cs
deleted file mode 100644
index 280d540..0000000
--- a/project/XPS_data/DS_XPS2.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace XPS_data
-{
-
-}
\ No newline at end of file
diff --git a/project/XPS_data/bin/Release/XPS_data.dll b/project/XPS_data/bin/Release/XPS_data.dll
index fa9cfe4..4a07f9a 100644
Binary files a/project/XPS_data/bin/Release/XPS_data.dll and b/project/XPS_data/bin/Release/XPS_data.dll differ
diff --git a/project/XPS_data/extSync.cs b/project/XPS_data/extSync.cs
index de72274..60ba2c0 100644
--- a/project/XPS_data/extSync.cs
+++ b/project/XPS_data/extSync.cs
@@ -157,12 +157,21 @@ namespace XPS_data
}
}
#endif
+ string esito = "";
// chiamo stored x caricare anag clienti + email
- DS_importTableAdapters.caricaSwingData taSwing = new DS_importTableAdapters.caricaSwingData();
- string esito="";
- taSwing.stp_CaricaAnagCliSwing(ref esito);
-
- SteamWare.logger.lg.scriviLog(string.Format("Effettuato caricamento dati anagrafiche, esito: {0}{1}", Environment.NewLine,esito), SteamWare.tipoLog.INFO);
+ //DS_importTableAdapters.caricaSwingData taSwing = new DS_importTableAdapters.caricaSwingData();
+ //taSwing.stp_CaricaAnagCliSwing(ref esito);
+ SteamWare.logger.lg.scriviLog("Richiesto refresh dati anagrafiche", SteamWare.tipoLog.INFO);
+ try
+ {
+ XPS_data.DS_XPSTableAdapters.SP taSP = new XPS_data.DS_XPSTableAdapters.SP();
+ taSP.stp_CaricaAnagCliSwing(ref esito);
+ SteamWare.logger.lg.scriviLog(string.Format("Effettuato caricamento dati anagrafiche, esito: {0}{1}", Environment.NewLine, esito), SteamWare.tipoLog.INFO);
+ }
+ catch (Exception exc)
+ {
+ SteamWare.logger.lg.scriviLog(string.Format("Errore in caricamento dati anagrafiche: {0}{1}", Environment.NewLine, exc), SteamWare.tipoLog.INFO);
+ }
ragSocNotImp += esito;
// return messaggio
return ragSocNotImp;
diff --git a/project/XPS_data/obj/Debug/TempPE/DS_XPS.Designer.cs.dll b/project/XPS_data/obj/Debug/TempPE/DS_XPS.Designer.cs.dll
index b0210b1..8b2b626 100644
Binary files a/project/XPS_data/obj/Debug/TempPE/DS_XPS.Designer.cs.dll and b/project/XPS_data/obj/Debug/TempPE/DS_XPS.Designer.cs.dll differ
diff --git a/project/XPS_data/obj/Release/TempPE/DS_XPS.Designer.cs.dll b/project/XPS_data/obj/Release/TempPE/DS_XPS.Designer.cs.dll
index 3c197bc..298ded7 100644
Binary files a/project/XPS_data/obj/Release/TempPE/DS_XPS.Designer.cs.dll and b/project/XPS_data/obj/Release/TempPE/DS_XPS.Designer.cs.dll differ
diff --git a/project/XPS_data/obj/Release/XPS_data.dll b/project/XPS_data/obj/Release/XPS_data.dll
index fa9cfe4..4a07f9a 100644
Binary files a/project/XPS_data/obj/Release/XPS_data.dll and b/project/XPS_data/obj/Release/XPS_data.dll differ