diff --git a/eDos/Rems/RemsUnitTaskPersonVisits.aspx b/eDos/Rems/RemsUnitTaskPersonVisits.aspx index f541bb9..6aa5148 100644 --- a/eDos/Rems/RemsUnitTaskPersonVisits.aspx +++ b/eDos/Rems/RemsUnitTaskPersonVisits.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="eDos Tasks" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsUnitTaskPersonVisits.aspx.cs" Inherits="eDos2021.Rems.RemsUnitTaskPersonVisits" %> +<%@ Page Title="eDos Tasks" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsUnitTaskPersonVisits.aspx.cs" Inherits="eDos.Rems.RemsUnitTaskPersonVisits" %>
@@ -15,11 +15,13 @@ + - - + + +
diff --git a/eDos/Rems/RemsUnitTaskPersonVisits.aspx.cs b/eDos/Rems/RemsUnitTaskPersonVisits.aspx.cs index 06af5d9..d5d72da 100644 --- a/eDos/Rems/RemsUnitTaskPersonVisits.aspx.cs +++ b/eDos/Rems/RemsUnitTaskPersonVisits.aspx.cs @@ -1,26 +1,26 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace eDos2021.Rems -{ - public partial class RemsUnitTaskPersonVisits : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - Literal titelControl = Master.FindControl("PageTitle") as Literal; - titelControl.Text = "Bezoeken per taak"; - - DateTime dt2 = DateTime.Now.AddMonths(1).AddDays(-1); - RadDateInput1.SelectedDate = new DateTime(DateTime.Today.Year, DateTime.Now.Month, 1, 0, 0, 0); - RadDateInput2.SelectedDate = new DateTime(dt2.Year, dt2.Month, dt2.Day, 23, 59, 0); - RadGrid1.Rebind(); - } - } - } +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace eDos.Rems +{ + public partial class RemsUnitTaskPersonVisits : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + Literal titelControl = Master.FindControl("PageTitle") as Literal; + titelControl.Text = "Bezoeken per taak"; + + DateTime dt2 = DateTime.Now.AddMonths(1).AddDays(-1); + RadDateInput1.SelectedDate = new DateTime(DateTime.Today.Year, DateTime.Now.Month, 1, 0, 0, 0); + RadDateInput2.SelectedDate = new DateTime(dt2.Year, dt2.Month, dt2.Day, 23, 59, 0); + RadGrid1.Rebind(); + } + } + } } \ No newline at end of file diff --git a/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs b/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs index 9d30b0e..e70dc2d 100644 --- a/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs +++ b/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace eDos2021.Rems +namespace eDos.Rems { @@ -23,15 +23,6 @@ namespace eDos2021.Rems /// protected global::Telerik.Web.UI.RadComboBox RadComboBox1; - /// - /// cmbTasks control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadComboBox cmbTasks; - /// /// RadDateInput1 control. /// @@ -50,6 +41,15 @@ namespace eDos2021.Rems /// protected global::Telerik.Web.UI.RadDateInput RadDateInput2; + /// + /// cmbTasks control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Telerik.Web.UI.RadComboBox cmbTasks; + /// /// RadGrid1 control. /// diff --git a/eDos/Reports/RemsByTaskPeriod.aspx b/eDos/Reports/RemsByTaskPeriod.aspx index 3bc34a9..5924682 100644 --- a/eDos/Reports/RemsByTaskPeriod.aspx +++ b/eDos/Reports/RemsByTaskPeriod.aspx @@ -1,115 +1,115 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsByTaskPeriod.aspx.cs" Inherits="Rems2018.Reports.RemsByTaskPeriod" %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsByTaskPeriod.aspx.cs" Inherits="eDos.Reports.RemsByTaskPeriod" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eDos/Reports/RemsByTaskPeriod.aspx.cs b/eDos/Reports/RemsByTaskPeriod.aspx.cs index aeb0da6..fd00913 100644 --- a/eDos/Reports/RemsByTaskPeriod.aspx.cs +++ b/eDos/Reports/RemsByTaskPeriod.aspx.cs @@ -1,25 +1,25 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace Rems2018.Reports -{ - public partial class RemsByTaskPeriod : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - Literal titelControl = Master.FindControl("PageTitle") as Literal; - titelControl.Text = "EPD per Task - Periode"; - - fromDate.DbSelectedDate = new DateTime(DateTime.Now.Year, 1, 1); - tillDate.DbSelectedDate = DateTime.Now; - } - - } - } +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace eDos.Reports +{ + public partial class RemsByTaskPeriod : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + Literal titelControl = Master.FindControl("PageTitle") as Literal; + titelControl.Text = "EPD per Task - Periode"; + + fromDate.DbSelectedDate = new DateTime(DateTime.Now.Year, 1, 1); + tillDate.DbSelectedDate = DateTime.Now; + } + + } + } } \ No newline at end of file diff --git a/eDos/Reports/RemsByTaskPeriod.aspx.designer.cs b/eDos/Reports/RemsByTaskPeriod.aspx.designer.cs index 7f71f79..b800395 100644 --- a/eDos/Reports/RemsByTaskPeriod.aspx.designer.cs +++ b/eDos/Reports/RemsByTaskPeriod.aspx.designer.cs @@ -1,69 +1,71 @@ -//------------------------------------------------------------------------------ -// -// 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 Rems2018.Reports { - - - public partial class RemsByTaskPeriod { - - /// - /// fromDate control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadDatePicker fromDate; - - /// - /// tillDate control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadDatePicker tillDate; - - /// - /// rg control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadGrid rg; - - /// - /// dsEDOS control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.SqlDataSource dsEDOS; - - /// - /// dsEDOSPerson control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.SqlDataSource dsEDOSPerson; - - /// - /// dsEDOSVisits control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.SqlDataSource dsEDOSVisits; - } -} +//------------------------------------------------------------------------------ +// +// 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 eDos.Reports +{ + + + public partial class RemsByTaskPeriod + { + + /// + /// fromDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Telerik.Web.UI.RadDatePicker fromDate; + + /// + /// tillDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Telerik.Web.UI.RadDatePicker tillDate; + + /// + /// rg control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Telerik.Web.UI.RadGrid rg; + + /// + /// dsEDOS control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.SqlDataSource dsEDOS; + + /// + /// dsEDOSPerson control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.SqlDataSource dsEDOSPerson; + + /// + /// dsEDOSVisits control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.SqlDataSource dsEDOSVisits; + } +} diff --git a/eDos/eDos.csproj b/eDos/eDos.csproj index c1b252a..c11ee18 100644 --- a/eDos/eDos.csproj +++ b/eDos/eDos.csproj @@ -64,29 +64,29 @@ - - ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2022.3.913\lib\net45\Telerik.Web.Design.dll + + ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2024.1.131\lib\net45\Telerik.Web.Design.dll - - ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2022.3.913\lib\net45\Telerik.Web.Device.Detection.dll + + ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2024.1.131\lib\net45\Telerik.Web.Device.Detection.dll - - ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2022.3.913\lib\net45\Telerik.Web.UI.dll + + ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2024.1.131\lib\net45\Telerik.Web.UI.dll - - ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2022.3.913\lib\net45\Telerik.Web.UI.Skins.dll + + ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2024.1.131\lib\net45\Telerik.Web.UI.Skins.dll - - ..\packages\Telerik.Windows.Documents.Core.2022.3.906\lib\net40\Telerik.Windows.Documents.Core.dll + + ..\packages\Telerik.Windows.Documents.Core.2024.4.1106\lib\net462\Telerik.Windows.Documents.Core.dll - - ..\packages\Telerik.Windows.Documents.Spreadsheet.2022.3.906\lib\net40\Telerik.Windows.Documents.Spreadsheet.dll + + ..\packages\Telerik.Windows.Documents.Spreadsheet.2024.4.1106\lib\net462\Telerik.Windows.Documents.Spreadsheet.dll - - ..\packages\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.2022.3.906\lib\net40\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.dll + + ..\packages\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.2024.4.1106\lib\net462\Telerik.Windows.Documents.Spreadsheet.FormatProviders.OpenXml.dll - - ..\packages\Telerik.Windows.Zip.2022.3.906\lib\net40\Telerik.Windows.Zip.dll + + ..\packages\Telerik.Windows.Zip.2024.4.1106\lib\net462\Telerik.Windows.Zip.dll @@ -372,7 +372,7 @@ False - + diff --git a/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 79b0238..7348085 100644 Binary files a/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache index fc8e60f..f2d9c0b 100644 --- a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache +++ b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a558f1358df8af9b3d9a8f76179ca27228e16265 +31160904902e3cf02fdc5c9b60a521d481e2f8368073c66a465966a6b28118d3 diff --git a/eDos/packages.config b/eDos/packages.config index a8f14c3..1e8f339 100644 --- a/eDos/packages.config +++ b/eDos/packages.config @@ -1,9 +1,9 @@  - - - - - + + + + + \ No newline at end of file