diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index eeefc21..f78a0a6 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index a5e69b9..fa6ca05 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -350,6 +350,7 @@ + @@ -499,6 +500,13 @@ mod_dettInt.ascx + + mod_dispPeriodo.ascx + ASPXCodeBehind + + + mod_dispPeriodo.ascx + mod_elencoClienti.ascx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_dispPeriodo.ascx b/WebSCR/WebUserControls/mod_dispPeriodo.ascx new file mode 100644 index 0000000..3cae3c1 --- /dev/null +++ b/WebSCR/WebUserControls/mod_dispPeriodo.ascx @@ -0,0 +1,27 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dispPeriodo.ascx.cs" Inherits="WebSCR.WebUserControls.mod_dispPeriodo" %> + + + + + + +
+
+ <%#Eval("Data","{0:ddd dd/MM/yy}") %> +
+
+ disp: <%# Eval("ScoreDisp","{0:P0}") %> +
+ zona: <%# Eval("ScoreZona","{0:P0}") %> +
+
+ + + + + + + + + + diff --git a/WebSCR/WebUserControls/mod_dispPeriodo.ascx.cs b/WebSCR/WebUserControls/mod_dispPeriodo.ascx.cs new file mode 100644 index 0000000..ff13aa8 --- /dev/null +++ b/WebSCR/WebUserControls/mod_dispPeriodo.ascx.cs @@ -0,0 +1,138 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace WebSCR.WebUserControls +{ + public partial class mod_dispPeriodo : System.Web.UI.UserControl + { + /// + /// data selezionata + /// + public DateTime dataSel { get; set; } + /// + /// caricamento pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// recupera valore querystring + /// + /// + /// + protected string qsVal(string nome) + { + return memLayer.ML.QSS(nome); + //string answ = ""; + //try + //{ + // answ = Request.QueryString[nome].ToString(); + //} + //catch + //{ } + //return answ; + } + /// + /// esegue update componenti + /// + public void doUpdate() + { + repSlot.DataBind(); + } + /// + /// campo (nascosto) data from + /// + public string DataFrom + { + get + { + return lblDataFrom.Text; + } + set + { + lblDataFrom.Text = value; + } + } + /// + /// campo (nascosto) data from + /// + public string Zona + { + get + { + return lblZona.Text; + } + set + { + lblZona.Text = value; + } + } + /// + /// campo (nascosto) data from + /// + public string NumGG + { + get + { + return lblNumGG.Text; + } + set + { + lblNumGG.Text = value; + } + } + /// + /// restituisce il codice css x il frame dati score x disponibilità e zona + /// + /// + /// + /// + /// + public string frameFromDispZona(object _scoreDisp, object _scoreZona) + { + string answ = ""; + double scoreDisp = Convert.ToDouble(_scoreDisp); + double scoreZona = Convert.ToDouble(_scoreZona); + if (scoreDisp > 0.75) + { + answ = "greenBox"; + } + else if (scoreDisp > 0.50) + { + answ = "yellowBox"; + } + else if (scoreDisp > 0.25) + { + answ = "orangeBox"; + } + else + { + answ = "redBox"; + } + // aggiungo classi base + answ += " ui-shadow ui-corner-all"; + return answ; + } + /// + /// evento selezione data + /// + /// + /// + protected void lbSelect_Click(object sender, EventArgs e) + { + LinkButton lb = (LinkButton)sender; + dataSel = Convert.ToDateTime(lb.CommandArgument); + + //Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}&Data={2:yyyy-MM-dd}", qsVal("CodCliente"), qsVal("Indir"), dataSel)); + Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}", devicesAuthProxy.pagCorrente, qsVal("CodCliente"), qsVal("Indir"), dataSel)); + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_dispPeriodo.ascx.designer.cs b/WebSCR/WebUserControls/mod_dispPeriodo.ascx.designer.cs new file mode 100644 index 0000000..043797c --- /dev/null +++ b/WebSCR/WebUserControls/mod_dispPeriodo.ascx.designer.cs @@ -0,0 +1,60 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace WebSCR.WebUserControls { + + + public partial class mod_dispPeriodo { + + /// + /// lblDataFrom control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox lblDataFrom; + + /// + /// lblNumGG control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox lblNumGG; + + /// + /// 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; + + /// + /// repSlot control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater repSlot; + + /// + /// odsSlot control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsSlot; + } +} diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx index 70c9fa2..7ea02db 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -1,27 +1,22 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_pianificazione.ascx.cs" Inherits="WebSCR.WebUserControls.mod_pianificazione" %> - - <%@ 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" %> - - - +<%@ Register Src="~/WebUserControls/mod_dispPeriodo.ascx" TagPrefix="uc1" TagName="mod_dispPeriodo" %>
- +
- SX +
- DX +
- diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index 19580e1..77f6e25 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -65,7 +65,7 @@ namespace WebSCR.WebUserControls { #endif // imposto zona... - mod_resocontoImpegni1.Zona = mod_filtroZona.Zona; + mod_dispPeriodo.Zona = mod_filtroZona.Zona; mod_filtroPeriodo.Visible = true; #if false } @@ -104,10 +104,10 @@ namespace WebSCR.WebUserControls private void refreshDetail() { - 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(); + mod_dispPeriodo.DataFrom = mod_filtroPeriodo.dataFrom.ToString("yyyy-MM-dd"); + mod_dispPeriodo.NumGG = mod_filtroPeriodo.numGG.ToString(); + mod_dispPeriodo.Zona = mod_filtroZona.Zona; + mod_dispPeriodo.doUpdate(); } } diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs index 42f4226..ec55bed 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs @@ -30,6 +30,15 @@ namespace WebSCR.WebUserControls { /// protected global::WebSCR.WebUserControls.mod_filtroPeriodo mod_filtroPeriodo; + /// + /// mod_dispPeriodo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_dispPeriodo mod_dispPeriodo; + /// /// mod_resocontoImpegni1 control. /// diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx index 2ae9437..8dec0e5 100644 --- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx +++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx @@ -3,37 +3,12 @@ <%@ Register Src="~/WebUserControls/mod_schedaGiorno.ascx" TagPrefix="uc4" TagName="mod_schedaGiorno" %> <%@ Register Src="~/WebUserControls/mod_dettImpegno.ascx" TagPrefix="uc5" TagName="mod_dettImpegno" %> -
+<%--
- - - - - - -
-
- <%#Eval("Data","{0:ddd dd/MM/yy}") %> -
-
- disp: <%# Eval("ScoreDisp","{0:P0}") %> -
- zona: <%# Eval("ScoreZona","{0:P0}") %> -
-
- - - - - - - - - - +
-
+
--%> -
-
+<%--
+
--%> diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs index 98421a1..0f57d75 100644 --- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs +++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.cs @@ -10,10 +10,6 @@ namespace WebSCR.WebUserControls { public partial class mod_resocontoImpegni : System.Web.UI.UserControl { - /// - /// data selezionata - /// - public DateTime dataSel { get; set; } /// /// avvio componente /// @@ -44,7 +40,8 @@ namespace WebSCR.WebUserControls /// void mod_schedaGiorno_eh_newData(object sender, EventArgs e) { - repSlot.DataBind(); + // FARE!!! spostamento di doUpdate(); + //repSlot.DataBind(); } /// /// recupera valore querystring @@ -53,108 +50,15 @@ namespace WebSCR.WebUserControls /// protected string qsVal(string nome) { - string answ = ""; - try - { - answ = Request.QueryString[nome].ToString(); - } - catch - { } - return answ; - } - /// - /// restituisce il codice css x il frame dati score x disponibilità e zona - /// - /// - /// - /// - /// - public string frameFromDispZona(object _scoreDisp, object _scoreZona) - { - string answ = ""; - double scoreDisp = Convert.ToDouble(_scoreDisp); - double scoreZona = Convert.ToDouble(_scoreZona); - if (scoreDisp > 0.75) - { - answ = "greenBox"; - } - else if (scoreDisp > 0.50) - { - answ = "yellowBox"; - } - else if (scoreDisp > 0.25) - { - answ = "orangeBox"; - } - else - { - answ = "redBox"; - } - // aggiungo classi base - answ += " ui-shadow ui-corner-all"; - return answ; - } - /// - /// evento selezione data - /// - /// - /// - protected void lbSelect_Click(object sender, EventArgs e) - { - LinkButton lb = (LinkButton)sender; - dataSel = Convert.ToDateTime(lb.CommandArgument); - - //Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}&Data={2:yyyy-MM-dd}", qsVal("CodCliente"), qsVal("Indir"), dataSel)); - Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}", devicesAuthProxy.pagCorrente, qsVal("CodCliente"), qsVal("Indir"), dataSel)); - } - /// - /// esegue update componenti - /// - public void doUpdate() - { - repSlot.DataBind(); - } - /// - /// campo (nascosto) data from - /// - public string DataFrom - { - get - { - return lblDataFrom.Text; - } - set - { - lblDataFrom.Text = value; - } - } - /// - /// campo (nascosto) data from - /// - public string Zona - { - get - { - return lblZona.Text; - } - set - { - lblZona.Text = value; - } - } - /// - /// campo (nascosto) data from - /// - public string NumGG - { - get - { - return lblNumGG.Text; - } - set - { - lblNumGG.Text = value; - } + return memLayer.ML.QSS(nome); + //string answ = ""; + //try + //{ + // answ = Request.QueryString[nome].ToString(); + //} + //catch + //{ } + //return answ; } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs index 49f7cc0..9e37b46 100644 --- a/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_resocontoImpegni.ascx.designer.cs @@ -12,51 +12,6 @@ namespace WebSCR.WebUserControls { public partial class mod_resocontoImpegni { - /// - /// lblDataFrom control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox lblDataFrom; - - /// - /// lblNumGG control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox lblNumGG; - - /// - /// 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; - - /// - /// repSlot control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Repeater repSlot; - - /// - /// odsSlot control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsSlot; - /// /// mod_schedaGiorno control. /// diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 34a33e9..3675ec2 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 0eaab23..f5604e7 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 5bae307..a2d5e50 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 c9fb978..8ff62fa 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 9a2e9a6..f441544 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 0eaab23..f5604e7 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 34a33e9..3675ec2 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 5bae307..a2d5e50 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 0912226..e502791 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 5bae307..a2d5e50 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ