diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index f2afab5..7cbb6eb 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebUserControls/mod_schedaGiorno.ascx b/WebSCR/WebUserControls/mod_schedaGiorno.ascx index 43c6fad..f8d10a4 100644 --- a/WebSCR/WebUserControls/mod_schedaGiorno.ascx +++ b/WebSCR/WebUserControls/mod_schedaGiorno.ascx @@ -28,12 +28,17 @@ TimeFormat="Clock24Hours" CssClassPrefix="calendar_white" ViewType="Day" + HeightSpec="BusinessHours" BusinessBeginsHour="8" BusinessEndsHour="20" - ScrollPositionHour="12" + ScrollPositionHour="13" ShowEventStartEnd="True" DataSourceID="ods" - DataValueField="IdxImpegno" TimeRangeSelectedHandling="CallBack"> + DataValueField="IdxImpegno" + TimeRangeSelectedHandling="CallBack" + EventMoveHandling="CallBack" + CellHeight="15" EventClickHandling="Disabled"> + diff --git a/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs b/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs index 1bb7187..bfa6f20 100644 --- a/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs +++ b/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs @@ -26,16 +26,16 @@ namespace WebSCR.WebUserControls protected void Page_Load(object sender, EventArgs e) { DayPilotCalendar1.TimeRangeSelected += DayPilotCalendar1_TimeRangeSelected; - DayPilotCalendar1.EventClick +=DayPilotCalendar1_EventClick; + DayPilotCalendar1.EventMove += DayPilotCalendar1_EventMove; } - private void DayPilotCalendar1_EventClick(object sender, DayPilot.Web.Ui.Events.EventClickEventArgs e) + void DayPilotCalendar1_EventMove(object sender, DayPilot.Web.Ui.Events.EventMoveEventArgs e) { - // selezionato periodo, salvo evento inizio... - DtProxy.man.taImp.insertQuery(e.Start, "Gialla", memLayer.ML.StringSessionObj("CodCliente"), "OC123456", "indirizzo1", "12345", "localita", "GG"); - DayPilotCalendar1.DataBind(); - reportEvent(); + // sposto evento! + DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart); + doUpdate(); } + /// /// evento selezione periodo inizio /// @@ -43,9 +43,21 @@ namespace WebSCR.WebUserControls /// void DayPilotCalendar1_TimeRangeSelected(object sender, DayPilot.Web.Ui.Events.TimeRangeSelectedEventArgs e) { - // selezionato periodo, salvo evento inizio... - DtProxy.man.taImp.insertQuery(e.Start, "Gialla", memLayer.ML.StringSessionObj("CodCliente"), "OC123456", "indirizzo1", "12345", "localita", "GG"); + // se ho squadra selezionata... + if (rblSquadre.SelectedIndex >= 0) + { + // selezionato periodo, salvo evento inizio... + DtProxy.man.taImp.insertQuery(e.Start, rblSquadre.SelectedValue, memLayer.ML.StringSessionObj("CodCliente"), "OC123456", "indirizzo1", "12345", "localita", "GG"); + } + doUpdate(); + } + + private void doUpdate() + { + //ods.DataBind(); + //rblSquadre.SelectedIndex = -1; DayPilotCalendar1.DataBind(); + DayPilotCalendar1.Update(); reportEvent(); } /// diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 748feef..295693a 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 58ada3d..42aaa7c 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 3eaecfa..3d41e09 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 d328e56..4e3d473 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 58ada3d..42aaa7c 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 51d2fc8..d220267 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -8560,7 +8560,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")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_elencoImpegni"; @@ -8590,6 +8590,13 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Cap", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Localita", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Prov", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "dbo.stp_Imp_updStart"; + 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("@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("@DataOraNew", 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()] @@ -8719,6 +8726,40 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo } 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 updStart(global::System.Nullable IdxImpegno, global::System.Nullable DataOraNew) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + if ((IdxImpegno.HasValue == true)) { + command.Parameters[1].Value = ((int)(IdxImpegno.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((DataOraNew.HasValue == true)) { + command.Parameters[2].Value = ((System.DateTime)(DataOraNew.Value)); + } + else { + command.Parameters[2].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)) { + 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 57a379a..df1c907 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -591,6 +591,18 @@ FROM v_elencoImpegni + + + + dbo.stp_Imp_updStart + + + + + + + + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 32901b7..424d0cf 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -10,7 +10,7 @@ - + diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 748feef..295693a 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 3eaecfa..3d41e09 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 40fbff5..54320c3 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 49b5d19..11ea652 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 3eaecfa..3d41e09 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ