From 65cf7b4448e0684201c430cd809047622000f495 Mon Sep 17 00:00:00 2001 From: Luc Vandenbroucke Date: Mon, 14 Mar 2022 15:58:12 +0100 Subject: [PATCH] rapport visits vbr3 --- eDos/Rems/RemsUnitTaskPerson.aspx | 93 ------------------ eDos/Rems/RemsUnitTaskPerson.aspx.cs | 25 ----- eDos/Rems/RemsUnitTaskPerson.aspx.designer.cs | 60 ----------- eDos/Rems/RemsUnitTaskPersonVisits.aspx | 28 +++--- eDos/Rems/RemsUnitTaskPersonVisits.aspx.cs | 15 ++- .../RemsUnitTaskPersonVisits.aspx.designer.cs | 20 ++-- eDos/Site.master | 11 +-- eDos/eDos.csproj | 27 ++--- eDos/eDos.csproj.user | 2 +- ...gnTimeResolveAssemblyReferencesInput.cache | Bin 10078 -> 10014 bytes .../Debug/eDos.csproj.CoreCompileInputs.cache | 2 +- eDos/packages.config | 2 +- 12 files changed, 48 insertions(+), 237 deletions(-) delete mode 100644 eDos/Rems/RemsUnitTaskPerson.aspx delete mode 100644 eDos/Rems/RemsUnitTaskPerson.aspx.cs delete mode 100644 eDos/Rems/RemsUnitTaskPerson.aspx.designer.cs 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 6df45c8ae179d5e0c02ed26b9ebdba41fee7fd14..ccaf8029db32af8e1537ae2da1fa8b5373d46402 100644 GIT binary patch delta 888 zcmYk4+fEZv6o%QPdl1`cXQrj4Ck|~<5SdU8LPeyM(gI?wg;)d%Zgs%IOiS89FqIf@ z<;G-%TNB?v!$X*O!yA}Bfx&BUTr*H)l08}f_y23{mC5|de93(KWFxWDW7`RV7xo10 zZfa_p0LFL04|{-w;JX+Smsxc;k(OC??~n_lKa73{j5^#T0v{bAC^;n3gVhMR1$8lG zpUoyO!nZLzZiX#_pY%ePFb17M1Zskd+=0)+FzJUuK4jIEs(#UN7ybx?a4v)$(<-ZI zSCeF85zbg7lZHjHkIR=UyGjLWVjsW7-WFe#OESK=C@#=Xhw$EB^Ilo9l3}A4)+HMm zF{@+AMn^Fby-eJ+%DSTMsZ3Y6dvGQV(J^%AOgG}}C*zQH=4cGrSfc~ZoC3KIb>|eB zfG$^(K0r6ta6NKPQ59BI{?DC6e-oH@3I4ix`ViGFs#Vx-ljszxmxi*>lq-t-T2;9? zBHawc-F`aV2teFTTMa*fq+s}_nn9%)N=#PRL9w)L&PXENGiRK8JaiV-KB^7aX>X?~ zRLoFje;So$dW&9x%t67c(RpMlvQ3bEcCrAIK8-#?wqxdaKTj7gXRJcqZ!zaQMzV#z zL3omZ-~NS`Avr2XqcMmEJwj5c7Pm|0a!)XNh~LW#9|8l{L+~@uMzT;3TyO0lPazw; zBBx)2KI+Ngh{hvwSP?wj5^O~BBVtQKFJoaz?W-!effdEmdcBdfUQsB7JIFJ59}afr z5lXeWVoA?3{Y|P;*5>gKIpS83`)bP&Z+2VW9dXYgZ%w;a5%RShJ4h8(CBro3h+Bh! b$RJtARaR&L?KS);OJMJjNba<|XR`SpKZDtR delta 905 zcmYk3O-$2Z7{_^WZ(*`_Z3i1;AIP={18o=}Ujz9n8y`C7h8coDYOFYD8Ez$D2xk*K zknqH-S>oMbIC}M}@or);@hXW2k0w6t7@g3QthELx(-V%84 zYK3ns1(_4;B&D>y$FxC!o2H?fnwmH$>NN&P}vyZexSqO2{X}J>Z!04bA{p|FChmXKDzL9jo88*eS>Vh=iOKw3o8?qT{ z$$;;C)S1if=yIW?Rz^thkq^~RXi8DXu@D!cjJZrI2^&I`%@vB9YO#`x;ieMl!40}- zFMhbg`tZ5XK>ExxfM0ZwJ61I>I%q#8Vi$?)4U(bi+nQpi%m5sTJ#-M=8O!}8c99|A zT^TxzY@pf!M=qYkq3jwXBXH)D=_tBGRo5eBR83Xz43~57qQ3@h-Yk4-Wa${HO;k(J z-Xzj-R8LLCO%;l&^i0#32}Fj8j@>>wS@nYqWSTb{$qlUWFObvlPkL$(IzUXIMeKVWD7%Tgrlu5KJz$=|?{GI+!BrOND%#6 - + \ No newline at end of file