diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index e9b5979..d5a806a 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index 4dbac10..41c76b6 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.077.294")] -[assembly: AssemblyFileVersion("2.0.077.294")] +[assembly: AssemblyVersion("2.0.079.302")] +[assembly: AssemblyFileVersion("2.0.079.302")] [assembly: AssemblyCopyright("Steamware © 2015-2016")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 5f01050..34e41f0 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.077.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.0.077.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.0.079.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.0.079.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 4a332bb..0a1f9cc 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/obj/Debug/TempPE/WebSC.cs.dll b/VersGen/obj/Debug/TempPE/WebSC.cs.dll index 0cb9567..22a5644 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 4a332bb..0a1f9cc 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index e4a908a..86f3d57 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -422,6 +422,7 @@ + @@ -798,6 +799,13 @@ mod_selData.ascx + + mod_selDataOra.ascx + ASPXCodeBehind + + + mod_selDataOra.ascx + mod_selSquadre.ascx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_giornata.ascx.cs b/WebSCR/WebUserControls/mod_giornata.ascx.cs index ca5c50d..f8c5616 100644 --- a/WebSCR/WebUserControls/mod_giornata.ascx.cs +++ b/WebSCR/WebUserControls/mod_giornata.ascx.cs @@ -35,7 +35,7 @@ namespace WebSCR.WebUserControls DayPilotCalendar1.EventMove += DayPilotCalendar1_EventMove; #endif } - + public int day2show { @@ -187,6 +187,15 @@ namespace WebSCR.WebUserControls { // this assumes your event object in Events collection has "color" field or property e.BackgroundColor = (string)e.DataItem["CssColor"]; +#if false + string tUser = ""; + e.Html = e.Html.Replace("6P", string.Format("{0}{0}{0}{0}{0}{0}", tUser)); + e.Html = e.Html.Replace("5P", string.Format("{0}{0}{0}{0}{0}", tUser)); + e.Html = e.Html.Replace("4P", string.Format("{0}{0}{0}{0}", tUser)); + e.Html = e.Html.Replace("3P", string.Format("{0}{0}{0}", tUser)); + e.Html = e.Html.Replace("2P", string.Format("{0}{0}", tUser)); + e.Html = e.Html.Replace("1P", string.Format("{0}", tUser)); +#endif } catch { } @@ -213,6 +222,6 @@ namespace WebSCR.WebUserControls return memLayer.ML.StringSessionObj("elencoSquadre").Split(',')[0].ToString(); } } - + } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_impegno.ascx b/WebSCR/WebUserControls/mod_impegno.ascx index 268ee82..05742c6 100644 --- a/WebSCR/WebUserControls/mod_impegno.ascx +++ b/WebSCR/WebUserControls/mod_impegno.ascx @@ -1,4 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_impegno.ascx.cs" Inherits="WebSCR.WebUserControls.mod_impegno" %> +<%@ Register Src="~/WebUserControls/mod_selDataOra.ascx" TagPrefix="uc1" TagName="mod_selDataOra" %> + @@ -9,10 +11,19 @@
- +
+
+ +
+
+ +
+
-
- +
+ + <%--<%# string.Format("{0: dddd dd/MM/yy HH:mm} --> {1:HH:mm}", Eval("DataOraCom"),Convert.ToDateTime(Eval("DataOraCom")).AddHours(1)) %>--%> + --> +1h
@@ -130,10 +141,19 @@
- +
+
+ +
+
+ +
+
-
- +
+ + <%# string.Format("{0: dddd dd/MM/yy HH:mm} --> {1:HH:mm}", Eval("DataOraCom"),Convert.ToDateTime(Eval("DataOraCom")).AddHours(1)) %> + <%----%>
diff --git a/WebSCR/WebUserControls/mod_selData.ascx b/WebSCR/WebUserControls/mod_selData.ascx index 161b229..283f66f 100644 --- a/WebSCR/WebUserControls/mod_selData.ascx +++ b/WebSCR/WebUserControls/mod_selData.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selData.ascx.cs" Inherits="WebSCR.WebUserControls.mod_selData" %> -
+
diff --git a/WebSCR/WebUserControls/mod_selDataOra.ascx b/WebSCR/WebUserControls/mod_selDataOra.ascx new file mode 100644 index 0000000..f1bc2db --- /dev/null +++ b/WebSCR/WebUserControls/mod_selDataOra.ascx @@ -0,0 +1,13 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selDataOra.ascx.cs" Inherits="WebSCR.WebUserControls.mod_selDataOra" %> + + +
+
+ +
+
+ +
+
+ + diff --git a/WebSCR/WebUserControls/mod_selDataOra.ascx.cs b/WebSCR/WebUserControls/mod_selDataOra.ascx.cs new file mode 100644 index 0000000..e547cab --- /dev/null +++ b/WebSCR/WebUserControls/mod_selDataOra.ascx.cs @@ -0,0 +1,81 @@ +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_selDataOra : System.Web.UI.UserControl + { + /// + /// selezionata NUOVA data + /// + public event EventHandler eh_update; + /// + /// solleva evento selezione data + /// + protected void reportEvent() + { + // evento! + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + /// + /// stringa UID univoca + /// + public string uid + { + get + { + return this.UniqueID.Replace("$", "_").Replace("-", "_"); + } + } + protected void Page_Load(object sender, EventArgs e) + { +#if false + if (!Page.IsPostBack) + { + txtDataSel.Text = dataSel.ToString("yyyy-MM-dd"); + } +#endif + } + /// + /// data-ora selezionata + /// + public DateTime dataOraSel + { + get + { + DateTime answ = DateTime.Now; + try + { + answ = Convert.ToDateTime(txtDataSel.Text.Trim()); + // aggiungo ora + DateTime oraSel = Convert.ToDateTime(ddlOrario.SelectedValue); + double ore = oraSel.Hour + Convert.ToDouble(oraSel.Minute) / 60; + answ = answ.AddHours(ore); + } + catch + { } + return answ; + } + set + { + ddlOrario.DataBind(); + try + { + txtDataSel.Text = string.Format("{0:yyyy-MM-dd}", value); + ddlOrario.SelectedValue = string.Format("{0:HH:mm:00}", value); + } + catch + { } + } + } + + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_selDataOra.ascx.designer.cs b/WebSCR/WebUserControls/mod_selDataOra.ascx.designer.cs new file mode 100644 index 0000000..cf6d360 --- /dev/null +++ b/WebSCR/WebUserControls/mod_selDataOra.ascx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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_selDataOra { + + /// + /// txtDataSel control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtDataSel; + + /// + /// ddlOrario control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlOrario; + + /// + /// odsOrario control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsOrario; + } +} diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 82b5df6..e2326f7 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 59983ac..38c0c3b 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 4ad1c08..1c827d9 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index 38218f8..cefbe6d 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -2276,6 +2276,8 @@ namespace WebSCR_data { private global::System.Data.DataColumn columnIdxImpegno; + private global::System.Data.DataColumn columnDataOraCom; + private global::System.Data.DataColumn columnDataOra; private global::System.Data.DataColumn columnTipoOrario; @@ -2399,6 +2401,14 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn DataOraComColumn { + get { + return this.columnDataOraCom; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn DataOraColumn { @@ -2766,6 +2776,7 @@ namespace WebSCR_data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ImpegniRow AddImpegniRow( int IdxImpegno, + System.DateTime DataOraCom, System.DateTime DataOra, string TipoOrario, string CodCliente, @@ -2810,6 +2821,7 @@ namespace WebSCR_data { ImpegniRow rowImpegniRow = ((ImpegniRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxImpegno, + DataOraCom, DataOra, TipoOrario, CodCliente, @@ -2881,6 +2893,7 @@ namespace WebSCR_data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] internal void InitVars() { this.columnIdxImpegno = base.Columns["IdxImpegno"]; + this.columnDataOraCom = base.Columns["DataOraCom"]; this.columnDataOra = base.Columns["DataOra"]; this.columnTipoOrario = base.Columns["TipoOrario"]; this.columnCodCliente = base.Columns["CodCliente"]; @@ -2929,6 +2942,8 @@ namespace WebSCR_data { private void InitClass() { this.columnIdxImpegno = new global::System.Data.DataColumn("IdxImpegno", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnIdxImpegno); + this.columnDataOraCom = new global::System.Data.DataColumn("DataOraCom", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDataOraCom); this.columnDataOra = new global::System.Data.DataColumn("DataOra", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnDataOra); this.columnTipoOrario = new global::System.Data.DataColumn("TipoOrario", typeof(string), null, global::System.Data.MappingType.Element); @@ -3015,6 +3030,8 @@ namespace WebSCR_data { this.columnIdxImpegno}, true)); this.columnIdxImpegno.AllowDBNull = false; this.columnIdxImpegno.Unique = true; + this.columnDataOraCom.AllowDBNull = false; + this.columnDataOraCom.Caption = "DataOra"; this.columnDataOra.AllowDBNull = false; this.columnTipoOrario.AllowDBNull = false; this.columnTipoOrario.MaxLength = 10; @@ -7298,6 +7315,17 @@ namespace WebSCR_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public System.DateTime DataOraCom { + get { + return ((global::System.DateTime)(this[this.tableImpegni.DataOraComColumn])); + } + set { + this[this.tableImpegni.DataOraComColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public System.DateTime DataOra { diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 74d843f..8d0095f 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -1526,6 +1526,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 8ec7446..d351adc 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -4,13 +4,13 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + @@ -20,7 +20,7 @@ - + diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 82b5df6..e2326f7 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 4ad1c08..1c827d9 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 a2a1002..84af970 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 fabf31e..b3cc78f 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 4ad1c08..1c827d9 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ