diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 36dd91f..df6c1ad 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index 1cfeb55..4dbac10 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.067.294")] -[assembly: AssemblyFileVersion("2.0.067.294")] +[assembly: AssemblyVersion("2.0.077.294")] +[assembly: AssemblyFileVersion("2.0.077.294")] [assembly: AssemblyCopyright("Steamware © 2015-2016")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index e8760ac..5f01050 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.067.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.0.067.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.0.077.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.0.077.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 15a201d..4a332bb 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/obj/Debug/TempPE/WebSC.cs.dll b/VersGen/obj/Debug/TempPE/WebSC.cs.dll index fd51c66..0cb9567 100644 Binary files a/VersGen/obj/Debug/TempPE/WebSC.cs.dll and b/VersGen/obj/Debug/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll index 15a201d..4a332bb 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/WebSCR/WebUserControls/mod_giornata.ascx b/WebSCR/WebUserControls/mod_giornata.ascx index 7a2fbf0..3c38172 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx +++ b/WebSCR/WebUserControls/mod_giornata.ascx @@ -34,15 +34,17 @@ ShowEventStartEnd="True" CellHeight="15" TimeRangeSelectedHandling="JavaScript" - EventMoveHandling="CallBack" + TimeRangeSelectedJavaScript="newRange(start,end)" EventClickHandling="JavaScript" EventClickJavaScript="eventClick(e)" Theme="calendar_white" + EventMoveHandling="CallBack" + OnEventMove="DayPilotCalendar1_EventMove" OnBeforeEventRender="DayPilotCalendar1_BeforeEventRender" Width="95%" HourFontSize="6" DayFontSize="8pt" - EventFontSize="7pt" Days="5" OnEventClick="DayPilotCalendar1_EventClick" OnEventMove="DayPilotCalendar1_EventMove" OnTimeRangeSelected="DayPilotCalendar1_TimeRangeSelected" TimeRangeSelectedJavaScript="newRange(start,end)"> + EventFontSize="7pt" Days="5"> diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.cs b/WebSCR/WebUserControls/mod_giornata.ascx.cs index 54c792a..5c40a0d 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx.cs +++ b/WebSCR/WebUserControls/mod_giornata.ascx.cs @@ -87,9 +87,24 @@ namespace WebSCR.WebUserControls } protected void DayPilotCalendar1_EventMove(object sender, DayPilot.Web.Ui.Events.EventMoveEventArgs e) { - // sposto evento! - DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart); - doUpdate(); + // controllo che sia presente matricola altrimenti NON lo permetto... + if (matrOp != "") + { + // sposto evento! + DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart); + if (memLayer.ML.confReadBool("svuotaMatrOp")) + { + // rimuovo matrOp + memLayer.ML.emptySessionVal("matrOp"); + errorMess = "spostamento effettuato"; + } + doUpdate(); + } + else + { + errorMess = "Attenzione manca matricola! prego selezionare prima di effettuare spostamento."; + //Response.Redirect(devicesAuthProxy.pagCorrente); + } } /// /// anno selezionato @@ -109,11 +124,11 @@ namespace WebSCR.WebUserControls /// /// anno selezionato /// - public string errMessGiorn + public string errorMess { set { - memLayer.ML.setSessionVal("errMessGiorn", value); + memLayer.ML.setSessionVal("errorMess", value); } } diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 80c78d9..ddf7638 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -99,11 +99,21 @@ namespace WebSCR.WebUserControls if (qsVal("Action") == "NEW") { // creo NUOVO impegno - creaImpegno(); + tryCreaImpegno(); // ricarico!!! Response.Redirect(devicesAuthProxy.pagCorrente); } +#if false + else if (qsVal("Action") == "MOVE") + { + // prova a spostare + tryMove(); + + // ricarico!!! + Response.Redirect(devicesAuthProxy.pagCorrente); + } +#endif else if (qsVal("Action") == "EDIT") { errorMess = "EDIT"; @@ -135,6 +145,42 @@ namespace WebSCR.WebUserControls } } +#if false + private void tryMove() + { + // verifico di avere MatrOP selezionata + if (matrOp != "") + { + DateTime newStart = DateTime.Now; + DateTime adesso = newStart; + try + { + newStart = Convert.ToDateTime(qsVal("newStart")); + } + catch + { } + int idxImpegno = 0; + try + { + idxImpegno = Convert.ToInt32(qsVal("IdxImpegno")); + } + catch + { } + if (newStart != adesso) + { + if (idxImpegno > 0) + { + DtProxy.man.taImp.updStart(idxImpegno, newStart); + } + } + } + else + { + errorMess = "Prego indicare Matricola Operatore per procedere"; + } + } +#endif + /// /// anno selezionato /// @@ -213,7 +259,7 @@ namespace WebSCR.WebUserControls /// /// genera un nuovo impegno (oppure mostra warning...) /// - private void creaImpegno() + private void tryCreaImpegno() { if (codSquadra != "") { diff --git a/WebSCR/WebUserControls/mod_selSquadre.ascx.cs b/WebSCR/WebUserControls/mod_selSquadre.ascx.cs index ca3860b..a34f08e 100644 --- a/WebSCR/WebUserControls/mod_selSquadre.ascx.cs +++ b/WebSCR/WebUserControls/mod_selSquadre.ascx.cs @@ -12,7 +12,7 @@ namespace WebSCR.WebUserControls public partial class mod_selSquadre : System.Web.UI.UserControl { /// - /// elenco squadre slezionate + /// elenco squadre selezionate /// public List selected; protected void Page_Load(object sender, EventArgs e) diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index f817d50..769818d 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 df47e76..b7d0434 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 e7294d0..ddbf24e 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index f817d50..769818d 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 e7294d0..ddbf24e 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/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index a581d7f..0dde439 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 e7294d0..ddbf24e 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ