diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index bb84dbf..5fff0ef 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs index d4aa60e..4bb66be 100644 --- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs +++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs @@ -104,8 +104,8 @@ namespace WebSCR.WebUserControls LinkButton lb = (LinkButton)sender; dataSel = Convert.ToDateTime(lb.CommandArgument); - Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}&Data={2:yyyy-MM-dd}", qsVal("CodCliente"), qsVal("Indir"), dataSel)); - //mod_schedaGiorno.data = dataSel; + //Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}&Data={2:yyyy-MM-dd}", qsVal("CodCliente"), qsVal("Indir"), dataSel)); + Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}", devicesAuthProxy.pagCorrente, qsVal("CodCliente"), qsVal("Indir"), dataSel)); } /// /// esegue update componenti diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 18e1fb8..75a5b16 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 8f3e19e..a167dc5 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 3aa6a3a..8da5cc4 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index 08500e8..91248a6 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 8f3e19e..eba012c 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 ad7bdfb..4c2da5b 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -8761,7 +8761,6 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxImpegno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOra", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoOrario", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RifOC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -8888,7 +8887,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo [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 updateQuery(global::System.Nullable Original_IdxImpegno, global::System.Nullable DataOra, string TipoOrario, string CodSquadra, string RifOC, string NoteGen, string UrlDoc, global::System.Nullable NumOp, global::System.Nullable RitUsato, global::System.Nullable Ascensore, global::System.Nullable PianoCons, string UserMod) { + public virtual int updateQuery(global::System.Nullable Original_IdxImpegno, string TipoOrario, string CodSquadra, string RifOC, string NoteGen, string UrlDoc, global::System.Nullable NumOp, global::System.Nullable RitUsato, global::System.Nullable Ascensore, global::System.Nullable PianoCons, string UserMod) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((Original_IdxImpegno.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_IdxImpegno.Value)); @@ -8896,71 +8895,65 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo else { command.Parameters[1].Value = global::System.DBNull.Value; } - if ((DataOra.HasValue == true)) { - command.Parameters[2].Value = ((System.DateTime)(DataOra.Value)); - } - else { + if ((TipoOrario == null)) { command.Parameters[2].Value = global::System.DBNull.Value; } - if ((TipoOrario == null)) { + else { + command.Parameters[2].Value = ((string)(TipoOrario)); + } + if ((CodSquadra == null)) { command.Parameters[3].Value = global::System.DBNull.Value; } else { - command.Parameters[3].Value = ((string)(TipoOrario)); + command.Parameters[3].Value = ((string)(CodSquadra)); } - if ((CodSquadra == null)) { + if ((RifOC == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } else { - command.Parameters[4].Value = ((string)(CodSquadra)); + command.Parameters[4].Value = ((string)(RifOC)); } - if ((RifOC == null)) { + if ((NoteGen == null)) { command.Parameters[5].Value = global::System.DBNull.Value; } else { - command.Parameters[5].Value = ((string)(RifOC)); + command.Parameters[5].Value = ((string)(NoteGen)); } - if ((NoteGen == null)) { + if ((UrlDoc == null)) { command.Parameters[6].Value = global::System.DBNull.Value; } else { - command.Parameters[6].Value = ((string)(NoteGen)); - } - if ((UrlDoc == null)) { - command.Parameters[7].Value = global::System.DBNull.Value; - } - else { - command.Parameters[7].Value = ((string)(UrlDoc)); + command.Parameters[6].Value = ((string)(UrlDoc)); } if ((NumOp.HasValue == true)) { - command.Parameters[8].Value = ((int)(NumOp.Value)); + command.Parameters[7].Value = ((int)(NumOp.Value)); + } + else { + command.Parameters[7].Value = global::System.DBNull.Value; + } + if ((RitUsato.HasValue == true)) { + command.Parameters[8].Value = ((int)(RitUsato.Value)); } else { command.Parameters[8].Value = global::System.DBNull.Value; } - if ((RitUsato.HasValue == true)) { - command.Parameters[9].Value = ((int)(RitUsato.Value)); + if ((Ascensore.HasValue == true)) { + command.Parameters[9].Value = ((int)(Ascensore.Value)); } else { command.Parameters[9].Value = global::System.DBNull.Value; } - if ((Ascensore.HasValue == true)) { - command.Parameters[10].Value = ((int)(Ascensore.Value)); + if ((PianoCons.HasValue == true)) { + command.Parameters[10].Value = ((int)(PianoCons.Value)); } else { command.Parameters[10].Value = global::System.DBNull.Value; } - if ((PianoCons.HasValue == true)) { - command.Parameters[11].Value = ((int)(PianoCons.Value)); - } - else { + if ((UserMod == null)) { command.Parameters[11].Value = global::System.DBNull.Value; } - if ((UserMod == null)) { - command.Parameters[12].Value = global::System.DBNull.Value; - } else { - command.Parameters[12].Value = ((string)(UserMod)); + command.Parameters[11].Value = ((string)(UserMod)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index f6e1bef..e7d23cd 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -589,14 +589,13 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo - + dbo.stp_Imp_updateQuery - @@ -611,7 +610,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo - + dbo.stp_Imp_updStart @@ -794,7 +793,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -818,7 +817,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -854,7 +853,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -879,7 +878,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -997,7 +996,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1122,7 +1121,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1132,7 +1131,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1148,7 +1147,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1178,7 +1177,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + @@ -1234,7 +1233,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq - + \ No newline at end of file diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 91a5cee..9e0c384 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 18e1fb8..c95106a 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 3aa6a3a..d3b76a2 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/bin/Release/SteamWare.dll b/WebSCR_data/bin/Release/SteamWare.dll index 8e5627b..75a5b16 100644 Binary files a/WebSCR_data/bin/Release/SteamWare.dll and b/WebSCR_data/bin/Release/SteamWare.dll differ diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll index ad4fe16..8da5cc4 100644 Binary files a/WebSCR_data/bin/Release/WebSCR_data.dll and b/WebSCR_data/bin/Release/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 711333a..d893c05 100644 Binary files a/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 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 e66d79d..c87daec 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 4e40eca..0705b51 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 3aa6a3a..d3b76a2 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index c094ea2..7c562b2 100644 Binary files a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Release/TempPE/DS_Utility.Designer.cs.dll b/WebSCR_data/obj/Release/TempPE/DS_Utility.Designer.cs.dll index 8f9a39f..2c776b4 100644 Binary files a/WebSCR_data/obj/Release/TempPE/DS_Utility.Designer.cs.dll and b/WebSCR_data/obj/Release/TempPE/DS_Utility.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache index 62c45ad..9bdc352 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Release/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.dll b/WebSCR_data/obj/Release/WebSCR_data.dll index ad4fe16..8da5cc4 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ