diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 4d80e84..c54f42b 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebUserControls/mod_filtroZona.ascx.cs b/WebSCR/WebUserControls/mod_filtroZona.ascx.cs index dd75697..7fb58a2 100644 --- a/WebSCR/WebUserControls/mod_filtroZona.ascx.cs +++ b/WebSCR/WebUserControls/mod_filtroZona.ascx.cs @@ -5,6 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using WebSCR_data; +using SteamWare; namespace WebSCR.WebUserControls { @@ -87,10 +88,18 @@ namespace WebSCR.WebUserControls try { riga = DtProxy.man.taVcz.getBySearch(ricerca)[0]; - lblCliente.Text = string.Format("{0}
{1} ", riga.RagSoc, riga.Indir); - lblIndirizzo.Text = string.Format("{0} | {1}", riga.Localita, riga.Prov); - lblZona.Text = riga.Zona; - Zona = riga.Zona; + if (riga != null) + { + lblCliente.Text = string.Format("{0}
{1} ", riga.RagSoc, riga.Indir); + lblIndirizzo.Text = string.Format("{0} | {1}", riga.Localita, riga.Prov); + lblZona.Text = riga.Zona; + Zona = riga.Zona; + memLayer.ML.setSessionVal("currDoc", ricerca); + } + else + { + memLayer.ML.emptySessionVal("currDoc"); + } } catch { } diff --git a/WebSCR/WebUserControls/mod_giornata.ascx b/WebSCR/WebUserControls/mod_giornata.ascx index 744e1aa..b321ea6 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx +++ b/WebSCR/WebUserControls/mod_giornata.ascx @@ -52,7 +52,7 @@ OnBeforeEventRender="DayPilotCalendar1_BeforeEventRender" OnEventClick="DayPilotCalendar1_EventClick" Width="95%" - HourFontSize="7pt" + HourFontSize="6" EventFontSize="8pt"> diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.cs b/WebSCR/WebUserControls/mod_giornata.ascx.cs index f0d325d..5124acf 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx.cs +++ b/WebSCR/WebUserControls/mod_giornata.ascx.cs @@ -80,9 +80,13 @@ namespace WebSCR.WebUserControls // se ho squadra selezionata... if (rblSquadre.SelectedIndex >= 0) { - // recupero indirizzo e cliente !!FARE!!! + // recupero OC se in sessione... + string doc = memLayer.ML.StringSessionObj("currDoc"); + if (doc == "") doc = "OC00000000"; // selezionato periodo, salvo evento inizio... - DtProxy.man.taImp.insertQuery(e.Start, "INDIC", rblSquadre.SelectedValue, "OC00000000"); + DtProxy.man.taImp.insertQuery(e.Start, "INDIC", rblSquadre.SelectedValue, doc); + // consumo il doc selezionato e quindi rimuovo da sessione... + memLayer.ML.emptySessionVal("currDoc"); } doUpdate(); } diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index befb25f..1c0d87c 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -68,6 +68,7 @@ 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") != "") @@ -77,6 +78,10 @@ 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 8c18dd5..27a35b2 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 9c0adf8..50b6d66 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 6b33656..61a5b09 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 b986fa6..3e16765 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 9c0adf8..50b6d66 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 8c18dd5..27a35b2 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 6b33656..61a5b09 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 5a2e4ec..4a187e5 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 6b33656..61a5b09 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ