diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 08c0b90..7dafe83 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Pianificazione.aspx b/WebSCR/Pianificazione.aspx index 532b7b2..9dd88fa 100644 --- a/WebSCR/Pianificazione.aspx +++ b/WebSCR/Pianificazione.aspx @@ -1,7 +1,8 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Pianificazione.aspx.cs" Inherits="WebSCR.Pianificazione" %> + +<%@ Register Src="WebUserControls/mod_pianificazione.ascx" TagName="mod_pianificazione" TagPrefix="uc1" %> -

- Pianificazione

+ diff --git a/WebSCR/Pianificazione.aspx.designer.cs b/WebSCR/Pianificazione.aspx.designer.cs index b7d427c..3c62add 100644 --- a/WebSCR/Pianificazione.aspx.designer.cs +++ b/WebSCR/Pianificazione.aspx.designer.cs @@ -3,15 +3,22 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace WebSCR -{ - - - public partial class Pianificazione - { +namespace WebSCR { + + + public partial class Pianificazione { + + /// + /// mod_pianificazione1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_pianificazione mod_pianificazione1; } } diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index 736dceb..457871c 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -351,6 +351,9 @@ + + + @@ -553,6 +556,27 @@ mod_Interventi.ascx + + mod_pianificazione.ascx + ASPXCodeBehind + + + mod_pianificazione.ascx + + + mod_selettoreIndirizzo.ascx + ASPXCodeBehind + + + mod_selettoreIndirizzo.ascx + + + mod_selettoreSlot.ascx + ASPXCodeBehind + + + mod_selettoreSlot.ascx + diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx b/WebSCR/WebUserControls/mod_pianificazione.ascx new file mode 100644 index 0000000..e2e6312 --- /dev/null +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx @@ -0,0 +1,98 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_pianificazione.ascx.cs" Inherits="WebSCR.WebUserControls.mod_pianificazione" %> + + + +<%@ Register src="mod_selettoreIndirizzo.ascx" tagname="mod_selettoreIndirizzo" tagprefix="uc1" %> + + + +
+Area selezione orizzonte temporale e quale +
+
+ + << + +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ + >> + +
+
+ +
+seleziono quale slot, COLORATI x vicinanza a zona indirizzo... icona mappa colorata V|G|R ? e tempo V|G|R come minuti? +
+ +
+ Data +
+ OreImp / OreDisp +
+
+ Data +
+ OreImp / OreDisp +
+
+ Data +
+ OreImp / OreDisp +
+
+ Data +
+ OreImp / OreDisp +
+
+ Data +
+ OreImp / OreDisp +
+
+ Data +
+ OreImp / OreDisp +
+
+ Data +
+ OreImp / OreDisp +
+
+ Data +
+ OreImp / OreDisp +
+
+ Data +
+ OreImp / OreDisp +
+
+ Data +
+ OreImp / OreDisp +
+
+
+
+Permetto di inserire uno o + task +
+selettore testuale x ADD +
+elenco task inseriti (gridview) \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs new file mode 100644 index 0000000..1f1a61a --- /dev/null +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -0,0 +1,36 @@ +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_pianificazione : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + if (memLayer.ML.StringSessionObj("CodCliente") != "") + { + mod_selettoreIndirizzo1.Visible = true; + } + else + { + mod_selettoreIndirizzo1.Visible = false; + } + mod_selettoreIndirizzo1.eh_selIndir += mod_selettoreIndirizzo1_eh_selIndir; + } + /// + /// evento seleizone indirizzo, allora mostro il resto + /// + /// + /// + void mod_selettoreIndirizzo1_eh_selIndir(object sender, EventArgs e) + { + divDisponib.Visible = true; + } + + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs new file mode 100644 index 0000000..4b27772 --- /dev/null +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs @@ -0,0 +1,78 @@ +//------------------------------------------------------------------------------ +// +// 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_pianificazione { + + /// + /// mod_selettoreIndirizzo1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_selettoreIndirizzo mod_selettoreIndirizzo1; + + /// + /// lbPrev control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbPrev; + + /// + /// lbMinus control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbMinus; + + /// + /// txtNumGG control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNumGG; + + /// + /// lbPlus control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbPlus; + + /// + /// lbNext control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbNext; + + /// + /// divDisponib control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDisponib; + } +} diff --git a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx new file mode 100644 index 0000000..c589374 --- /dev/null +++ b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx @@ -0,0 +1,23 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selettoreIndirizzo.ascx.cs" Inherits="WebSCR.WebUserControls.mod_selettoreIndirizzo" %> +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
diff --git a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs new file mode 100644 index 0000000..a127267 --- /dev/null +++ b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.cs @@ -0,0 +1,119 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace WebSCR.WebUserControls +{ + public partial class mod_selettoreIndirizzo : System.Web.UI.UserControl + { + public event EventHandler eh_selIndir; + protected void Page_Load(object sender, EventArgs e) + { + if (memLayer.ML.StringSessionObj("CodCliente") != "") + { + lblInd_01.Text = string.Format("{0}
{1}", "indirizzo Consegna", "24000 - BG"); + lblInd_02.Text = string.Format("{0}
{1}", "indirizzo 01", "24002 - BG"); + lblInd_03.Text = string.Format("{0}
{1}", "indirizzo 02", "24003 - BG"); + lblInd_04.Text = string.Format("Inserisci
NUOVO INDIRIZZO"); + } + fixBtnMode(""); + } + /// + /// oggetto indirizzo + /// + public address selAddr { get; set; } + + /// + /// sistema i buttons + /// + /// + protected void fixBtnMode(string btnSel) + { + // metto di base i buttons uguali + btn1.CssClass = "ui-btn ui-shadow ui-corner-all ui-icon-edit"; + btn2.CssClass = "ui-btn ui-shadow ui-corner-all ui-icon-edit"; + btn3.CssClass = "ui-btn ui-shadow ui-corner-all ui-icon-edit"; + btn4.CssClass = "ui-btn ui-shadow ui-corner-all ui-icon-edit"; + // in base a quale sia selezionato aggiorno... + switch (btnSel) + { + case "btn01": + btn1.CssClass += " ui-btn-active"; + break; + case "btn02": + btn2.CssClass += " ui-btn-active"; + break; + case "btn03": + btn3.CssClass += " ui-btn-active"; + break; + case "btn04": + btn4.CssClass += " ui-btn-active"; + break; + default: + break; + } + // evento! + if (eh_selIndir != null) + { + eh_selIndir(this, new EventArgs()); + } + } + + protected void btn1_Click(object sender, EventArgs e) + { + address newAdd = new address { }; + newAdd.via = "indirizzo 01"; + newAdd.cap = 12345; + newAdd.localita = "localita 12345"; + newAdd.prov = "BG"; + selAddr = newAdd; + fixBtnMode("btn01"); + } + + protected void btn2_Click(object sender, EventArgs e) + { + address newAdd = new address { }; + newAdd.via = "indirizzo 2"; + newAdd.cap = 12345; + newAdd.localita = "localita 12345"; + newAdd.prov = "BG"; + selAddr = newAdd; + fixBtnMode("btn02"); + } + + protected void btn3_Click(object sender, EventArgs e) + { + address newAdd = new address { }; + newAdd.via = "indirizzo 03"; + newAdd.cap = 12345; + newAdd.localita = "localita 12345"; + newAdd.prov = "BG"; + selAddr = newAdd; + fixBtnMode("btn03"); + } + + protected void btn4_Click(object sender, EventArgs e) + { + address newAdd = new address { }; + newAdd.via = "indirizzo 04"; + newAdd.cap = 12345; + newAdd.localita = "localita 12345"; + newAdd.prov = "BG"; + selAddr = newAdd; + fixBtnMode("btn04"); + } + + } + + public struct address + { + public string via { get; set; } + public int cap { get; set; } + public string localita { get; set; } + public string prov { get; set; } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.designer.cs b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.designer.cs new file mode 100644 index 0000000..e708eb1 --- /dev/null +++ b/WebSCR/WebUserControls/mod_selettoreIndirizzo.ascx.designer.cs @@ -0,0 +1,96 @@ +//------------------------------------------------------------------------------ +// +// 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_selettoreIndirizzo { + + /// + /// divIndirizzo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divIndirizzo; + + /// + /// btn1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btn1; + + /// + /// lblInd_01 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblInd_01; + + /// + /// btn2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btn2; + + /// + /// lblInd_02 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblInd_02; + + /// + /// btn3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btn3; + + /// + /// lblInd_03 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblInd_03; + + /// + /// btn4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton btn4; + + /// + /// lblInd_04 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblInd_04; + } +} diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx b/WebSCR/WebUserControls/mod_selettoreSlot.ascx new file mode 100644 index 0000000..a6754bd --- /dev/null +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selettoreSlot.ascx.cs" Inherits="WebSCR.WebUserControls.mod_selettoreSlot" %> diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs new file mode 100644 index 0000000..5db902c --- /dev/null +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace WebSCR.WebUserControls +{ + public partial class mod_selettoreSlot : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs new file mode 100644 index 0000000..f1b0360 --- /dev/null +++ b/WebSCR/WebUserControls/mod_selettoreSlot.ascx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// 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_selettoreSlot + { + } +} diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 7a98f47..9b581b8 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 19faa47..5c75989 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 20d1f57..d855d9c 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/logs/20150427.txt b/WebSCR/logs/20150427.txt index 03b4885..37be83a 100644 --- a/WebSCR/logs/20150427.txt +++ b/WebSCR/logs/20150427.txt @@ -124,3 +124,9 @@ System.Threading.ThreadAbortException: Thread interrotto. in System.Web.HttpResponse.Redirect(String url, Boolean endResponse, Boolean permanent) in System.Web.HttpResponse.Redirect(String url) in WebSCR.WebUserControls.mod_elencoClienti.grView_SelectedIndexChanged(Object sender, EventArgs e) in c:\Users\samuele\Documents\Visual Studio 2012\Projects\WebSCR\WebSCR\WebUserControls\mod_elencoClienti.ascx.cs:riga 52 +17:44:18 8508 [EXCEPTION] - Errore in auth cookie: System.NullReferenceException: Riferimento a un oggetto non impostato su un'istanza di oggetto. + in SteamWare.DS_AuthTableAdapters.AnagDevicesTableAdapter.getByDeviceSecret(String DeviceSecret) in c:\Users\samuele\Documents\Visual Studio 2012\Projects\SteamWareLibrary\SteamWare\DS_Auth.Designer.cs:riga 5428 + in WebSCR.WebUserControls.mod_header.checkAuthCookieWebSCR() in c:\Users\samuele\Documents\Visual Studio 2012\Projects\WebSCR\WebSCR\WebUserControls\mod_header.ascx.cs:riga 162 +17:44:18 8578 [EXCEPTION] - Errore recupero permessi! +System.InvalidCastException: Impossibile eseguire il cast di oggetti di tipo 'System.String' sul tipo 'PermessiDataTable'. + in SteamWare.devicesAuthProxy.get_permessi() in c:\Users\samuele\Documents\Visual Studio 2012\Projects\SteamWareLibrary\SteamWare\devicesAuthProxy.cs:riga 316 diff --git a/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e5cd21a..58c972b 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 53daf22..d1cd686 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 19faa47..5c75989 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 7a98f47..9b581b8 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 20d1f57..d855d9c 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 1363266..0f65198 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 20d1f57..d855d9c 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ