diff --git a/eDos/Rems/RemsUnitTaskPerson.aspx b/eDos/Rems/RemsUnitTaskPerson.aspx deleted file mode 100644 index b90894d..0000000 --- a/eDos/Rems/RemsUnitTaskPerson.aspx +++ /dev/null @@ -1,93 +0,0 @@ -<%@ Page Title="REMS Unit Task Person" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsUnitTaskPerson.aspx.cs" Inherits="safety.RemsUnitTaskPerson" EnableEventValidation="false" %> - - -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eDos/Rems/RemsUnitTaskPerson.aspx.cs b/eDos/Rems/RemsUnitTaskPerson.aspx.cs deleted file mode 100644 index fdbea96..0000000 --- a/eDos/Rems/RemsUnitTaskPerson.aspx.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace safety -{ - public partial class RemsUnitTaskPerson : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - Literal titelControl = Master.FindControl("PageTitle") as Literal; - titelControl.Text = "REMS Unit Task Person"; - - if (!Page.IsPostBack) - { - RadDateInput1.SelectedDate = new DateTime(2014, 1, 1, 0, 0, 0); - RadDateInput2.SelectedDate = new DateTime(2014, 1, 10, 23, 59, 0); - RadGrid1.Rebind(); - } - } - } -} \ No newline at end of file diff --git a/eDos/Rems/RemsUnitTaskPerson.aspx.designer.cs b/eDos/Rems/RemsUnitTaskPerson.aspx.designer.cs deleted file mode 100644 index e13625a..0000000 --- a/eDos/Rems/RemsUnitTaskPerson.aspx.designer.cs +++ /dev/null @@ -1,60 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 safety { - - - public partial class RemsUnitTaskPerson { - - /// - /// RadComboBox1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadComboBox RadComboBox1; - - /// - /// RadDateInput1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadDateInput RadDateInput1; - - /// - /// RadDateInput2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadDateInput RadDateInput2; - - /// - /// RadGrid1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadGrid RadGrid1; - - /// - /// SqlDSRems control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.SqlDataSource SqlDSRems; - } -} diff --git a/eDos/Rems/RemsUnitTaskPersonVisits.aspx b/eDos/Rems/RemsUnitTaskPersonVisits.aspx index 5054185..84bcee0 100644 --- a/eDos/Rems/RemsUnitTaskPersonVisits.aspx +++ b/eDos/Rems/RemsUnitTaskPersonVisits.aspx @@ -1,5 +1,4 @@ -<%@ Page Title="REMS Unit Task Person Visit" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsUnitTaskPersonVisits.aspx.cs" Inherits="Rems2018.Rems.RemsUnitTaskPersonVisits" EnableEventValidation="false" %> - +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsUnitTaskPersonVisits.aspx.cs" Inherits="eDos2021.Rems.RemsUnitTaskPersonVisits" %>
@@ -23,57 +22,57 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -82,7 +81,7 @@ - + @@ -90,3 +89,4 @@ + diff --git a/eDos/Rems/RemsUnitTaskPersonVisits.aspx.cs b/eDos/Rems/RemsUnitTaskPersonVisits.aspx.cs index 1f29d68..06af5d9 100644 --- a/eDos/Rems/RemsUnitTaskPersonVisits.aspx.cs +++ b/eDos/Rems/RemsUnitTaskPersonVisits.aspx.cs @@ -5,21 +5,20 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -namespace Rems2018.Rems +namespace eDos2021.Rems { public partial class RemsUnitTaskPersonVisits : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { - - Literal titelControl = Master.FindControl("PageTitle") as Literal; - titelControl.Text = "REMS Unit Task Person Visit"; - - if (!Page.IsPostBack) { - RadDateInput1.SelectedDate = new DateTime(2014, 1, 1, 0, 0, 0); - RadDateInput2.SelectedDate = new DateTime(2014, 1, 10, 23, 59, 0); + 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(); } } diff --git a/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs b/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs index 4f86fd7..e965d30 100644 --- a/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs +++ b/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace Rems2018.Rems { - - - public partial class RemsUnitTaskPersonVisits { - +namespace eDos2021.Rems +{ + + + public partial class RemsUnitTaskPersonVisits + { + /// /// RadComboBox1 control. /// @@ -20,7 +22,7 @@ namespace Rems2018.Rems { /// To modify move field declaration from designer file to code-behind file. /// protected global::Telerik.Web.UI.RadComboBox RadComboBox1; - + /// /// RadDateInput1 control. /// @@ -29,7 +31,7 @@ namespace Rems2018.Rems { /// To modify move field declaration from designer file to code-behind file. /// protected global::Telerik.Web.UI.RadDateInput RadDateInput1; - + /// /// RadDateInput2 control. /// @@ -38,7 +40,7 @@ namespace Rems2018.Rems { /// To modify move field declaration from designer file to code-behind file. /// protected global::Telerik.Web.UI.RadDateInput RadDateInput2; - + /// /// RadGrid1 control. /// @@ -47,7 +49,7 @@ namespace Rems2018.Rems { /// To modify move field declaration from designer file to code-behind file. /// protected global::Telerik.Web.UI.RadGrid RadGrid1; - + /// /// SqlDSRems control. /// diff --git a/eDos/Site.master b/eDos/Site.master index cdb6fe8..f5cec87 100644 --- a/eDos/Site.master +++ b/eDos/Site.master @@ -108,15 +108,14 @@ - - - - - + - + + + + diff --git a/eDos/eDos.csproj b/eDos/eDos.csproj index b818d32..c8abcaa 100644 --- a/eDos/eDos.csproj +++ b/eDos/eDos.csproj @@ -60,20 +60,17 @@ - - ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2021.2.616\lib\net45\Telerik.Web.Design.dll - True + + ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2022.1.119\lib\net45\Telerik.Web.Design.dll - - ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2021.2.616\lib\net45\Telerik.Web.Device.Detection.dll + + ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2022.1.119\lib\net45\Telerik.Web.Device.Detection.dll - - ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2021.2.616\lib\net45\Telerik.Web.UI.dll - True + + ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2022.1.119\lib\net45\Telerik.Web.UI.dll - - ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2021.2.616\lib\net45\Telerik.Web.UI.Skins.dll - True + + ..\packages\Telerik.UI.for.AspNet.Ajax.Net45.2022.1.119\lib\net45\Telerik.Web.UI.Skins.dll @@ -126,13 +123,6 @@ RemsNeutron.aspx - - RemsUnitTaskPerson.aspx - ASPXCodeBehind - - - RemsUnitTaskPerson.aspx - RemsUnitTaskPersonVisits.aspx ASPXCodeBehind @@ -255,7 +245,6 @@ - diff --git a/eDos/eDos.csproj.user b/eDos/eDos.csproj.user index c431290..fe2cc85 100644 --- a/eDos/eDos.csproj.user +++ b/eDos/eDos.csproj.user @@ -15,7 +15,7 @@ - Rems/RemsNeutron.aspx + Rems/RemsUnitTaskPersonVisits.aspx SpecificPage True False diff --git a/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6df45c8..ccaf802 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 1109ba2..e86c3f0 100644 --- a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache +++ b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -911a17afc7f60d10edd4b9fcc3920c69d84c9b41 +0cfa5a668b6bcaeaf11c1ca0ff0d7ea384f9e39b diff --git a/eDos/packages.config b/eDos/packages.config index fd007e1..3c4ec79 100644 --- a/eDos/packages.config +++ b/eDos/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file