diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index a5aaa3f..a0deb67 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/WebSCR/Web.config b/WebSCR/Web.config index c45628e..9f8cfe6 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -15,6 +15,7 @@ + diff --git a/WebSCR/WebUserControls/mod_giornata.ascx b/WebSCR/WebUserControls/mod_giornata.ascx index 3c38172..318db70 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx +++ b/WebSCR/WebUserControls/mod_giornata.ascx @@ -8,10 +8,12 @@ //alert('Event with id ' + e.id() + ' was selected.'); document.location = '<%= SteamWare.devicesAuthProxy.pagCorrente %>?Action=EDIT&CodCliente=<%= this.CodCliente %>&Indir=<%= this.Indir %>&Data=<%= this.Data %>&IdxImpegno=' + e.id(); } - function newRange(start,end) { - //alert('Event with id ' + e.id() + ' was selected.'); + function newRange(start, end) { document.location = '<%= SteamWare.devicesAuthProxy.pagCorrente %>?Action=NEW&Data=<%= this.Data %>&codSquadra=<%= this.codSquadra %>&currDoc=<%= this.currDoc %>&matrOp=<%= this.matrOp %>&start=' + start + '&end=' + end; } + <%--function move(start, end) { + document.location = '<%= SteamWare.devicesAuthProxy.pagCorrente %>?Action=MOVE&Data=<%= this.Data %>&codSquadra=<%= this.codSquadra %>&currDoc=<%= this.currDoc %>&matrOp=<%= this.matrOp %>&start=' + start + '&end=' + end; + }--%> @@ -38,7 +40,7 @@ EventClickHandling="JavaScript" EventClickJavaScript="eventClick(e)" Theme="calendar_white" - EventMoveHandling="CallBack" + EventMoveHandling="PostBack" OnEventMove="DayPilotCalendar1_EventMove" OnBeforeEventRender="DayPilotCalendar1_BeforeEventRender" Width="95%" @@ -52,3 +54,6 @@ + + +<%----%> diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.cs b/WebSCR/WebUserControls/mod_giornata.ascx.cs index 40b3f78..ca5c50d 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx.cs +++ b/WebSCR/WebUserControls/mod_giornata.ascx.cs @@ -93,19 +93,20 @@ namespace WebSCR.WebUserControls if (matrOp != "") { // sposto evento! - DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart); - if (memLayer.ML.confReadBool("svuotaMatrOp")) + DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart, matrOp, DateTime.Now); + if (memLayer.ML.confReadBool("svuotaMatrOpMove")) { // rimuovo matrOp memLayer.ML.emptySessionVal("matrOp"); errorMess = "spostamento effettuato"; } doUpdate(); + Response.Redirect(devicesAuthProxy.pagCorrente); } else { errorMess = "Attenzione manca matricola! prego selezionare prima di effettuare spostamento."; - //Response.Redirect(devicesAuthProxy.pagCorrente); + Response.Redirect(devicesAuthProxy.pagCorrente); } } /// diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index ddf7638..caf22bf 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -104,7 +104,6 @@ namespace WebSCR.WebUserControls // ricarico!!! Response.Redirect(devicesAuthProxy.pagCorrente); } -#if false else if (qsVal("Action") == "MOVE") { // prova a spostare @@ -113,7 +112,6 @@ namespace WebSCR.WebUserControls // ricarico!!! Response.Redirect(devicesAuthProxy.pagCorrente); } -#endif else if (qsVal("Action") == "EDIT") { errorMess = "EDIT"; @@ -144,8 +142,7 @@ namespace WebSCR.WebUserControls mod_giornata.Visible = true; } } - -#if false + private void tryMove() { // verifico di avere MatrOP selezionata @@ -170,7 +167,7 @@ namespace WebSCR.WebUserControls { if (idxImpegno > 0) { - DtProxy.man.taImp.updStart(idxImpegno, newStart); + DtProxy.man.taImp.updStart(idxImpegno, newStart, matrOp, DateTime.Now); } } } @@ -179,7 +176,6 @@ namespace WebSCR.WebUserControls errorMess = "Prego indicare Matricola Operatore per procedere"; } } -#endif /// /// anno selezionato diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index d67a9be..2019290 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 20d21bf..caf8a18 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR.dll.config b/WebSCR/bin/WebSCR.dll.config index c45628e..9f8cfe6 100644 --- a/WebSCR/bin/WebSCR.dll.config +++ b/WebSCR/bin/WebSCR.dll.config @@ -15,6 +15,7 @@ + diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 6dc04bc..f92349c 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index b799872..7238f02 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -12629,6 +12629,8 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca this._commandCollection[11].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[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxImpegno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOraNew", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOp", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LastMod", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -13075,7 +13077,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca [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 updStart(global::System.Nullable IdxImpegno, global::System.Nullable DataOraNew) { + public virtual int updStart(global::System.Nullable IdxImpegno, global::System.Nullable DataOraNew, string MatrOp, global::System.Nullable LastMod) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[11]; if ((IdxImpegno.HasValue == true)) { command.Parameters[1].Value = ((int)(IdxImpegno.Value)); @@ -13089,6 +13091,18 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca else { command.Parameters[2].Value = global::System.DBNull.Value; } + if ((MatrOp == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(MatrOp)); + } + if ((LastMod.HasValue == true)) { + command.Parameters[4].Value = ((System.DateTime)(LastMod.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index c435efc..a04568a 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -749,6 +749,8 @@ FROM v_elencoImpegni + + diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index d67a9be..2019290 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 6dc04bc..f92349c 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 b35fe25..3990613 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 f02ba9d..3a76f14 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 6dc04bc..f92349c 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ