diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 483b516..eeefc21 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Web.config b/WebSCR/Web.config index 6a5f5ab..f327925 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -11,6 +11,7 @@ + diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index ce59ccb..a5e69b9 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -360,14 +360,14 @@ + + - - @@ -569,6 +569,20 @@ mod_fileUpload.ascx + + mod_filtroPeriodo.ascx + ASPXCodeBehind + + + mod_filtroPeriodo.ascx + + + mod_filtroZona.ascx + ASPXCodeBehind + + + mod_filtroZona.ascx + mod_footer.ascx ASPXCodeBehind @@ -611,20 +625,6 @@ mod_schedaGiorno.ascx - - mod_selettoreIndirizzo.ascx - ASPXCodeBehind - - - mod_selettoreIndirizzo.ascx - - - mod_selettoreSlot.ascx - ASPXCodeBehind - - - mod_selettoreSlot.ascx - diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx b/WebSCR/WebUserControls/mod_filtroPeriodo.ascx similarity index 96% rename from WebSCR/WebUserControls/mod_selettoreSlot.ascx rename to WebSCR/WebUserControls/mod_filtroPeriodo.ascx index cc5a290..90fc766 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx +++ b/WebSCR/WebUserControls/mod_filtroPeriodo.ascx @@ -1,5 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selettoreSlot.ascx.cs" Inherits="WebSCR.WebUserControls.mod_selettoreSlot" %> - +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_filtroPeriodo.ascx.cs" Inherits="WebSCR.WebUserControls.mod_filtroPeriodo" %>
@@ -44,5 +43,4 @@
- - + \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs b/WebSCR/WebUserControls/mod_filtroPeriodo.ascx.cs similarity index 98% rename from WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs rename to WebSCR/WebUserControls/mod_filtroPeriodo.ascx.cs index d5166e9..b140d99 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs +++ b/WebSCR/WebUserControls/mod_filtroPeriodo.ascx.cs @@ -8,7 +8,7 @@ using SteamWare; namespace WebSCR.WebUserControls { - public partial class mod_selettoreSlot : System.Web.UI.UserControl + public partial class mod_filtroPeriodo : System.Web.UI.UserControl { public event EventHandler eh_selData; /// @@ -162,6 +162,5 @@ namespace WebSCR.WebUserControls lblZona.Text = newVal; } } - } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs b/WebSCR/WebUserControls/mod_filtroPeriodo.ascx.designer.cs similarity index 98% rename from WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs rename to WebSCR/WebUserControls/mod_filtroPeriodo.ascx.designer.cs index b5990ec..e9c44f2 100644 --- a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_filtroPeriodo.ascx.designer.cs @@ -10,7 +10,7 @@ namespace WebSCR.WebUserControls { - public partial class mod_selettoreSlot { + public partial class mod_filtroPeriodo { /// /// divDisponib control. diff --git a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx b/WebSCR/WebUserControls/mod_filtroZona.ascx similarity index 90% rename from WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx rename to WebSCR/WebUserControls/mod_filtroZona.ascx index eb9ebfb..a6dbb1e 100644 --- a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx +++ b/WebSCR/WebUserControls/mod_filtroZona.ascx @@ -1,5 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selettoreIndirizzo.ascx.cs" Inherits="WebSCR.WebUserControls.mod_selettoreIndirizzo" %> - +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_filtroZona.ascx.cs" Inherits="WebSCR.WebUserControls.mod_filtroZona" %>
@@ -11,6 +10,7 @@
indirizzo (post ricerca...) +
@@ -36,4 +36,4 @@ ---%> +--%> \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs b/WebSCR/WebUserControls/mod_filtroZona.ascx.cs similarity index 87% rename from WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs rename to WebSCR/WebUserControls/mod_filtroZona.ascx.cs index 206a1cc..c9284b2 100644 --- a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs +++ b/WebSCR/WebUserControls/mod_filtroZona.ascx.cs @@ -1,5 +1,4 @@ -using SteamWare; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -8,13 +7,37 @@ using System.Web.UI.WebControls; namespace WebSCR.WebUserControls { - public partial class mod_selettoreIndirizzo : System.Web.UI.UserControl + public partial class mod_filtroZona : System.Web.UI.UserControl { public event EventHandler eh_selIndir; protected void Page_Load(object sender, EventArgs e) { } + + /// + /// valore zona selezionata da QueryString + /// + public string Zona + { + get + { + string answ = "Z00"; + try + { + answ = lblZona.Text; + } + catch + { } + return answ; + } + set + { + string newVal = "Z00"; + if (value != newVal) newVal = value; + lblZona.Text = newVal; + } + } #if false protected void Page_Load(object sender, EventArgs e) { diff --git a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.designer.cs b/WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs similarity index 67% rename from WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.designer.cs rename to WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs index 368746d..1368703 100644 --- a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_filtroZona.ascx.designer.cs @@ -10,7 +10,7 @@ namespace WebSCR.WebUserControls { - public partial class mod_selettoreIndirizzo { + public partial class mod_filtroZona { /// /// txtCerca control. @@ -20,5 +20,14 @@ namespace WebSCR.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtCerca; + + /// + /// lblZona control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblZona; } } diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx index f18c750..70c9fa2 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -2,13 +2,26 @@ -<%@ Register Src="~/WebUserControls/mod_selettoreIndirizzo.ascx" TagName="mod_selettoreIndirizzo" TagPrefix="uc1" %> - -<%@ Register Src="~/WebUserControls/mod_selettoreSlot.ascx" TagName="mod_selettoreSlot" TagPrefix="uc2" %> <%@ Register Src="~/WebUserControls/mod_resocontoImpegni.ascx" TagName="mod_resocontoImpegni" TagPrefix="uc3" %> +<%@ Register Src="~/WebUserControls/mod_filtroZona.ascx" TagPrefix="uc1" TagName="mod_filtroZona" %> +<%@ Register Src="~/WebUserControls/mod_filtroPeriodo.ascx" TagPrefix="uc1" TagName="mod_filtroPeriodo" %> - - + + +
+ +
+
+ +
+
+
+ SX +
+
+ DX +
+
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index bfe86d3..19580e1 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -10,19 +10,29 @@ namespace WebSCR.WebUserControls { public partial class mod_pianificazione : System.Web.UI.UserControl { + /// + /// avvio pagina + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { fixVisibility(); if (!Page.IsPostBack) { - mod_selettoreSlot1.numGG = memLayer.ML.confReadInt("numGgDef"); + mod_filtroZona.Zona = memLayer.ML.confReadString("zonaDef"); + mod_filtroPeriodo.numGG = memLayer.ML.confReadInt("numGgDef"); refreshDetail(); } - mod_selettoreIndirizzo1.eh_selIndir += mod_selettoreIndirizzo1_eh_selIndir; - mod_selettoreSlot1.eh_selData += mod_selettoreSlot1_eh_selData; + mod_filtroZona.eh_selIndir += mod_selettoreIndirizzo1_eh_selIndir; + mod_filtroPeriodo.eh_selData += mod_filtroPeriodo_eh_selData; } - - void mod_selettoreSlot1_eh_selData(object sender, EventArgs e) + /// + /// evento selezione nuova data in filtro + /// + /// + /// + void mod_filtroPeriodo_eh_selData(object sender, EventArgs e) { refreshDetail(); } @@ -33,6 +43,8 @@ namespace WebSCR.WebUserControls /// protected string qsVal(string nome) { + return memLayer.ML.QSS(nome); +#if false string answ = ""; try { @@ -40,18 +52,22 @@ namespace WebSCR.WebUserControls } catch { } - return answ; + return answ; +#endif } /// /// imposta visibilità dato elementi già impostati /// private void fixVisibility() - { - if (true) - { - // imposto zona... - mod_selettoreSlot1.Zona = "Z00"; // mod_selettoreIndirizzo1.selAddr.zona; - mod_selettoreSlot1.Visible = true; + { +#if false + if (true) + { +#endif + // imposto zona... + mod_resocontoImpegni1.Zona = mod_filtroZona.Zona; + mod_filtroPeriodo.Visible = true; +#if false } // vecchia modalità con selezione "Pre" dell'indirizzo... else @@ -59,7 +75,7 @@ namespace WebSCR.WebUserControls // controllo se c'è CodCliente if ((qsVal("CodCliente") != "") && memLayer.ML.isInSessionObject("CodCliente") && memLayer.ML.isInSessionObject("Cliente")) { - mod_selettoreIndirizzo1.Visible = true; + mod_filtroZona.Visible = true; } // controllo se c'è indirizzo... if (qsVal("Indir") != "") @@ -72,7 +88,8 @@ namespace WebSCR.WebUserControls { mod_selettoreSlot1.Visible = false; } - } + } +#endif } /// @@ -87,9 +104,9 @@ namespace WebSCR.WebUserControls private void refreshDetail() { - mod_resocontoImpegni1.DataFrom = mod_selettoreSlot1.dataFrom.ToString("yyyy-MM-dd"); - mod_resocontoImpegni1.NumGG = mod_selettoreSlot1.numGG.ToString(); - mod_resocontoImpegni1.Zona = mod_selettoreSlot1.Zona; + mod_resocontoImpegni1.DataFrom = mod_filtroPeriodo.dataFrom.ToString("yyyy-MM-dd"); + mod_resocontoImpegni1.NumGG = mod_filtroPeriodo.numGG.ToString(); + mod_resocontoImpegni1.Zona = mod_filtroZona.Zona; mod_resocontoImpegni1.doUpdate(); } diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs index 9d82415..42f4226 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs @@ -13,22 +13,22 @@ namespace WebSCR.WebUserControls { public partial class mod_pianificazione { /// - /// mod_selettoreIndirizzo1 control. + /// mod_filtroZona control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WebSCR.WebUserControls.mod_selettoreIndirizzo mod_selettoreIndirizzo1; + protected global::WebSCR.WebUserControls.mod_filtroZona mod_filtroZona; /// - /// mod_selettoreSlot1 control. + /// mod_filtroPeriodo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WebSCR.WebUserControls.mod_selettoreSlot mod_selettoreSlot1; + protected global::WebSCR.WebUserControls.mod_filtroPeriodo mod_filtroPeriodo; /// /// mod_resocontoImpegni1 control. diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx index 6f8ecf7..2ae9437 100644 --- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx +++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx @@ -5,13 +5,12 @@
-
- - - - - - + + + + + +
<%#Eval("Data","{0:ddd dd/MM/yy}") %> @@ -22,17 +21,16 @@ zona: <%# Eval("ScoreZona","{0:P0}") %>
- - - - - - - - - - -
+ + + + + + + + + +
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 4e5b5c5..34a33e9 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/SteamWare.xml b/WebSCR/bin/SteamWare.xml index dd8e6e2..71ec65e 100644 --- a/WebSCR/bin/SteamWare.xml +++ b/WebSCR/bin/SteamWare.xml @@ -3101,6 +3101,34 @@ + + + recupera valore querystring STRING + + + valore string + + + + recupera valore querystring INT + + + valore INT + + + + recupera valore querystring BOOL + + + valore string + + + + recupera valore querystring DATE + + + valore DATE + carica dalla sessione un dato di tipo object generico diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 3ec1c6d..0eaab23 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 ee61586..5bae307 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 29a51e2..c9fb978 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 0844563..9a2e9a6 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 3ec1c6d..0eaab23 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 4e5b5c5..34a33e9 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/SteamWare.xml b/WebSCR_data/bin/Debug/SteamWare.xml index dd8e6e2..71ec65e 100644 --- a/WebSCR_data/bin/Debug/SteamWare.xml +++ b/WebSCR_data/bin/Debug/SteamWare.xml @@ -3101,6 +3101,34 @@ + + + recupera valore querystring STRING + + + valore string + + + + recupera valore querystring INT + + + valore INT + + + + recupera valore querystring BOOL + + + valore string + + + + recupera valore querystring DATE + + + valore DATE + carica dalla sessione un dato di tipo object generico diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index ee61586..5bae307 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 e508b39..0912226 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 ee61586..5bae307 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ