diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 3f260a0..2c7b32f 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebUserControls/mod_elencoSquadre.ascx b/WebSCR/WebUserControls/mod_elencoSquadre.ascx index eb5d003..474a362 100644 --- a/WebSCR/WebUserControls/mod_elencoSquadre.ascx +++ b/WebSCR/WebUserControls/mod_elencoSquadre.ascx @@ -14,16 +14,55 @@ - - - - - - + + +
+ <%----%> + +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + + + + diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 89090e9..84b5ffa 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 28ef343..e628be4 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 8f58891..1a1ce34 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/logs/20150417.txt b/WebSCR/logs/20150417.txt index 3937af9..4f22dda 100644 --- a/WebSCR/logs/20150417.txt +++ b/WebSCR/logs/20150417.txt @@ -2242,3 +2242,9 @@ System.InvalidCastException: Impossibile eseguire il cast di oggetti di tipo 'Sy 9:34:33 8305 [EXCEPTION] - Errore recupero permessi! System.InvalidCastException: Impossibile eseguire il cast di oggetti di tipo 'System.String' sul tipo 'PermessiDataTable'. in SteamWare.devicesAuthProxy.get_permessi() in c:\Users\samuele\Documents\Visual Studio 2012\Projects\SteamWareLibrary\SteamWare\devicesAuthProxy.cs:riga 316 +12:17:20 6952 [EXCEPTION] - Errore in auth cookie: System.NullReferenceException: Riferimento a un oggetto non impostato su un'istanza di oggetto. + in SteamWare.DS_AuthTableAdapters.AnagDevicesTableAdapter.getByDeviceSecret(String DeviceSecret) in c:\Users\samuele\Documents\Visual Studio 2012\Projects\SteamWareLibrary\SteamWare\DS_Auth.Designer.cs:riga 5428 + in WebSCR.WebUserControls.mod_header.checkAuthCookieWebSCR() in c:\Users\samuele\Documents\Visual Studio 2012\Projects\WebSCR\WebSCR\WebUserControls\mod_header.ascx.cs:riga 162 +12:17:20 7002 [EXCEPTION] - Errore recupero permessi! +System.InvalidCastException: Impossibile eseguire il cast di oggetti di tipo 'System.String' sul tipo 'PermessiDataTable'. + in SteamWare.devicesAuthProxy.get_permessi() in c:\Users\samuele\Documents\Visual Studio 2012\Projects\SteamWareLibrary\SteamWare\devicesAuthProxy.cs:riga 316 diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index ecc6bc8..508b84d 100644 Binary files a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache and b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.dll b/WebSCR/obj/Debug/WebSCR.dll index 28ef343..e628be4 100644 Binary files a/WebSCR/obj/Debug/WebSCR.dll and b/WebSCR/obj/Debug/WebSCR.dll differ diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index ca12ce2..8db659a 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -904,12 +904,18 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM AnagSquadre [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.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM dbo.AnagSqua" + "dre"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_AS_DeleteQuery"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].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, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1099,6 +1105,35 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM AnagSquadre public virtual int Update(string DescrSquadra, int NumOp, bool Elettrod, bool Clima, bool Inform, string Original_CodSquadra, string Original_DescrSquadra, int Original_NumOp, bool Original_Elettrod, bool Original_Clima, bool Original_Inform) { return this.Update(Original_CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform, Original_CodSquadra, Original_DescrSquadra, Original_NumOp, Original_Elettrod, Original_Clima, Original_Inform); } + + [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")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, false)] + public virtual int DeleteQuery(string Original_CodSquadra) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((Original_CodSquadra == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_CodSquadra)); + } + 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(); + } + } + return returnValue; + } } /// diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index a4e1a8b..5b554f2 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -73,7 +73,19 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM AnagSquadre - + + + + + dbo.stp_AS_DeleteQuery + + + + + + + + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 661714e..83a98e1 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -6,7 +6,7 @@ --> - + \ No newline at end of file diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 89090e9..84b5ffa 100644 Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 8f58891..1a1ce34 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 88423ce..040d468 100644 Binary files a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 400b37e..2a598d5 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll index 8f58891..1a1ce34 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ