diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 1c6fa55..bca10e7 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 28f4645..609d3f2 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Debug/TempPE/WebSC.cs.dll b/VersGen/obj/Debug/TempPE/WebSC.cs.dll index f6b7a33..56200f4 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 1c6fa55..bca10e7 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 28f4645..609d3f2 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 8d0090b..c17dfea 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebUserControls/mod_filtroPeriodo.ascx.cs b/WebSCR/WebUserControls/mod_filtroPeriodo.ascx.cs index 5582dd7..d4904c8 100644 --- a/WebSCR/WebUserControls/mod_filtroPeriodo.ascx.cs +++ b/WebSCR/WebUserControls/mod_filtroPeriodo.ascx.cs @@ -16,6 +16,8 @@ namespace WebSCR.WebUserControls /// protected void reportEvent() { + // salvo data! + dataSel = dataFrom; // evento! if (eh_selData != null) { @@ -45,7 +47,16 @@ namespace WebSCR.WebUserControls txtNumGG.Text = newVal.ToString(); } } - + /// + /// stringa UID univoca + /// + public string uid + { + get + { + return this.UniqueID.Replace("$", "_").Replace("-", "_"); + } + } /// /// data riferimento /// @@ -53,14 +64,7 @@ namespace WebSCR.WebUserControls { get { - DateTime answ = DateTime.Now.Date; - try - { - answ = Convert.ToDateTime(txtDataFrom.Text.Trim()); - } - catch - { } - return answ; + return dataSel; } set { @@ -68,18 +72,18 @@ namespace WebSCR.WebUserControls } } /// - /// data selezionata (da query string o inizializzata... + /// data selezionata (da query string o inizializzata...) /// protected DateTime dataSel { get { DateTime answ = DateTime.Now; - if (memLayer.ML.isInSessionObject("DataStart")) + if (memLayer.ML.isInSessionObject("DataStart" + uid)) { try { - answ = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataStart")); + answ = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataStart" + uid)); } catch { } @@ -88,7 +92,7 @@ namespace WebSCR.WebUserControls } set { - memLayer.ML.setSessionVal("DataStart", value); + memLayer.ML.setSessionVal("DataStart" + uid, value); } } protected void Page_Load(object sender, EventArgs e) diff --git a/WebSCR/WebUserControls/mod_giornata.ascx b/WebSCR/WebUserControls/mod_giornata.ascx index c319963..744e1aa 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx +++ b/WebSCR/WebUserControls/mod_giornata.ascx @@ -6,6 +6,7 @@ //alert('Event with id ' + e.id() + ' was selected.'); document.location = '<%= SteamWare.devicesAuthProxy.pagCorrente %>?CodCliente=<%= this.CodCliente %>&Indir=<%= this.Indir %>&Data=<%= this.Data %>&IdxImpegno=' + e.id(); } + @@ -38,20 +39,21 @@ TimeFormat="Clock24Hours" ViewType="Day" ToolTip="NomeImpegno" - HeightSpec="Full" - BusinessBeginsHour="07" + BusinessBeginsHour="7" BusinessEndsHour="21" - ScrollPositionHour="13" + HeightSpec="Full" ShowEventStartEnd="True" - CellHeight="15" + CellHeight="11" TimeRangeSelectedHandling="CallBack" EventMoveHandling="CallBack" EventClickHandling="JavaScript" EventClickJavaScript="eventClick(e)" Theme="calendar_white" OnBeforeEventRender="DayPilotCalendar1_BeforeEventRender" - OnEventClick="DayPilotCalendar1_EventClick" Width="95%" HourFontSize="6"> - + OnEventClick="DayPilotCalendar1_EventClick" + Width="95%" + HourFontSize="7pt" + EventFontSize="8pt"> diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 1c0d87c..befb25f 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -68,7 +68,6 @@ namespace WebSCR.WebUserControls // sistemo visibilità giornata/impegni mod_giornata.eh_newData += mod_giornata_eh_newData; - mod_giornata.Visible = false; mod_dettInt.Visible = false; mod_impegno.Visible = false; if (qsVal("Data") != "") @@ -78,10 +77,6 @@ namespace WebSCR.WebUserControls mod_impegno.Visible = true; mod_dettInt.Visible = true; } - else - { - mod_giornata.Visible = true; - } } } /// diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index e2e6a02..e2efec3 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 e787d63..de13026 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 d405ffd..b9a4686 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 21a2fd5..5304f7f 100644 Binary files a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index 391b3b9..6732861 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 b78241c..de13026 100644 Binary files a/WebSCR/obj/Debug/WebSCR.dll and b/WebSCR/obj/Debug/WebSCR.dll differ diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 660ebe2..e2efec3 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 3068167..b9a4686 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 f0f2262..b336b24 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 a27c820..0c849e0 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 3068167..b9a4686 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ