diff --git a/XPS/App_Code/DS_applicazione.xsd b/XPS/App_Code/DS_applicazione.xsd
index 7bdff03..4e2b0c5 100644
--- a/XPS/App_Code/DS_applicazione.xsd
+++ b/XPS/App_Code/DS_applicazione.xsd
@@ -2,9 +2,10 @@
-
+
+
@@ -718,6 +719,138 @@ FROM AnagraficaEventi
+
+
+
+
+
+ DELETE FROM [dbo].[Eventi] WHERE (([CodEvento] = @Original_CodEvento))
+
+
+
+
+
+
+
+ INSERT INTO [dbo].[Eventi] ([CodEvento], [CodTipoEvento], [DescrEvento], [Action]) VALUES (@CodEvento, @CodTipoEvento, @DescrEvento, @Action)
+
+
+
+
+
+
+
+
+
+
+ SELECT CodEvento, CodTipoEvento, DescrEvento, Action FROM dbo.Eventi
+
+
+
+
+
+ UPDATE [dbo].[Eventi] SET [CodEvento] = @CodEvento, [CodTipoEvento] = @CodTipoEvento, [DescrEvento] = @DescrEvento, [Action] = @Action WHERE (([CodEvento] = @Original_CodEvento))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SELECT DISTINCT Eventi.CodEvento, Eventi.CodTipoEvento, Eventi.DescrEvento, Eventi.Action
+FROM Eventi INNER JOIN
+ TraEv2Stati ON Eventi.CodEvento = TraEv2Stati.CodEvento
+WHERE (TraEv2Stati.CodEvento = @CodEvento)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DELETE FROM [dbo].[TraEv2Stati] WHERE (([CodMappa] = @Original_CodMappa) AND ([CodObj] = @Original_CodObj) AND ([CodStato] = @Original_CodStato) AND ([CodEvento] = @Original_CodEvento))
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO [dbo].[TraEv2Stati] ([CodMappa], [CodObj], [CodStato], [CodEvento], [NextCodStato], [CmdPlugin], [text2show], [descrComando]) VALUES (@CodMappa, @CodObj, @CodStato, @CodEvento, @NextCodStato, @CmdPlugin, @text2show, @descrComando)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show, descrComando FROM dbo.TraEv2Stati
+
+
+
+
+
+ UPDATE [dbo].[TraEv2Stati] SET [CodMappa] = @CodMappa, [CodObj] = @CodObj, [CodStato] = @CodStato, [CodEvento] = @CodEvento, [NextCodStato] = @NextCodStato, [CmdPlugin] = @CmdPlugin, [text2show] = @text2show, [descrComando] = @descrComando WHERE (([CodMappa] = @Original_CodMappa) AND ([CodObj] = @Original_CodObj) AND ([CodStato] = @Original_CodStato) AND ([CodEvento] = @Original_CodEvento))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1198,6 +1331,102 @@ FROM AnagraficaEventi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1237,6 +1466,17 @@ FROM AnagraficaEventi
+
+
+
+
+
+
+
+
+
+
+
@@ -1244,6 +1484,7 @@ FROM AnagraficaEventi
+
\ No newline at end of file
diff --git a/XPS/App_Code/DS_applicazione.xss b/XPS/App_Code/DS_applicazione.xss
index 4b25b07..1034e4d 100644
--- a/XPS/App_Code/DS_applicazione.xss
+++ b/XPS/App_Code/DS_applicazione.xss
@@ -4,21 +4,23 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
927
@@ -30,7 +32,7 @@
-
+
1116
@@ -42,7 +44,7 @@
-
+
689
@@ -54,7 +56,7 @@
-
+
1162
@@ -66,5 +68,17 @@
+
+
+
+ 660
+ 854
+
+
+ 744
+ 854
+
+
+
\ No newline at end of file
diff --git a/XPS/App_Code/stateMachine.cs b/XPS/App_Code/stateMachine.cs
index c53e4b3..74ef9d5 100644
--- a/XPS/App_Code/stateMachine.cs
+++ b/XPS/App_Code/stateMachine.cs
@@ -8,10 +8,10 @@ using SteamWare;
///
public class stateMachine
{
- protected DS_applicazioneTableAdapters.AnagraficaEventiTableAdapter taAE;
+ protected DS_applicazioneTableAdapters.EventiTableAdapter taEv;
protected stateMachine()
{
- taAE = new DS_applicazioneTableAdapters.AnagraficaEventiTableAdapter();
+ taEv = new DS_applicazioneTableAdapters.EventiTableAdapter();
}
public static stateMachine st = new stateMachine();
///
@@ -25,7 +25,7 @@ public class stateMachine
string toDo = "";
try
{
- toDo = taAE.getByCodInviato(comando.currCmdIn)[0].Action;
+ toDo = taEv.getByCodEvento(comando.currCmdIn)[0].Action;
}
catch
{ }
@@ -34,7 +34,7 @@ public class stateMachine
case "ok":
_azione = tipoAzione.conferma;
break;
- case "canc":
+ case "ko":
_azione = tipoAzione.annulla;
break;
case "act":
diff --git a/XPS/Web.config b/XPS/Web.config
index fc8ce33..824489f 100644
--- a/XPS/Web.config
+++ b/XPS/Web.config
@@ -115,7 +115,9 @@
+ providerName="System.Data.SqlClient" />
+