From e702cd109a9f45d6b1e7196ff5f47b327824b96b Mon Sep 17 00:00:00 2001 From: Luc Vandenbroucke Date: Wed, 20 May 2020 16:23:07 +0200 Subject: [PATCH] eerste rapport task-person-visits --- eDos/Properties/licenses.licx | 2 + eDos/Reports/RemsByTaskPeriod.aspx | 160 ++++++++++++++++++ eDos/Reports/RemsByTaskPeriod.aspx.cs | 22 +++ .../Reports/RemsByTaskPeriod.aspx.designer.cs | 69 ++++++++ eDos/Site.master | 8 +- eDos/eDos.csproj | 10 +- eDos/eDos.csproj.user | 4 +- .../Debug/eDos.csproj.CoreCompileInputs.cache | 2 +- eDos/web.config | 2 +- eDos/web.config.Debug.template | 2 +- 10 files changed, 269 insertions(+), 12 deletions(-) create mode 100644 eDos/Reports/RemsByTaskPeriod.aspx create mode 100644 eDos/Reports/RemsByTaskPeriod.aspx.cs create mode 100644 eDos/Reports/RemsByTaskPeriod.aspx.designer.cs diff --git a/eDos/Properties/licenses.licx b/eDos/Properties/licenses.licx index 6de6275..fa139bb 100644 --- a/eDos/Properties/licenses.licx +++ b/eDos/Properties/licenses.licx @@ -1,3 +1,5 @@ +Telerik.Web.UI.RadFormDecorator, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4 +Telerik.Web.UI.RadDatePicker, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4 Telerik.Web.UI.RadWindowManager, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4 Telerik.Web.UI.RadMultiPage, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4 Telerik.Web.UI.RadTabStrip, Telerik.Web.UI, Version=2020.1.114.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4 diff --git a/eDos/Reports/RemsByTaskPeriod.aspx b/eDos/Reports/RemsByTaskPeriod.aspx new file mode 100644 index 0000000..524a56b --- /dev/null +++ b/eDos/Reports/RemsByTaskPeriod.aspx @@ -0,0 +1,160 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsByTaskPeriod.aspx.cs" Inherits="Rems2018.Reports.RemsByTaskPeriod" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eDos/Reports/RemsByTaskPeriod.aspx.cs b/eDos/Reports/RemsByTaskPeriod.aspx.cs new file mode 100644 index 0000000..7bd205a --- /dev/null +++ b/eDos/Reports/RemsByTaskPeriod.aspx.cs @@ -0,0 +1,22 @@ +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) + { + 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 new file mode 100644 index 0000000..7f71f79 --- /dev/null +++ b/eDos/Reports/RemsByTaskPeriod.aspx.designer.cs @@ -0,0 +1,69 @@ +//------------------------------------------------------------------------------ +// +// 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; + } +} diff --git a/eDos/Site.master b/eDos/Site.master index a129a20..10f131e 100644 --- a/eDos/Site.master +++ b/eDos/Site.master @@ -78,7 +78,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -113,10 +113,7 @@ - - -
@@ -124,7 +121,6 @@ -
diff --git a/eDos/eDos.csproj b/eDos/eDos.csproj index 1feca52..2bc4124 100644 --- a/eDos/eDos.csproj +++ b/eDos/eDos.csproj @@ -140,6 +140,13 @@ RemsUnitTaskPersonVisits.aspx + + RemsByTaskPeriod.aspx + ASPXCodeBehind + + + RemsByTaskPeriod.aspx + TaskBG.aspx ASPXCodeBehind @@ -250,6 +257,7 @@ + @@ -334,7 +342,7 @@ False - + diff --git a/eDos/eDos.csproj.user b/eDos/eDos.csproj.user index 8c62f8b..daf4018 100644 --- a/eDos/eDos.csproj.user +++ b/eDos/eDos.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true @@ -15,7 +15,7 @@ - TaskBG.aspx + Reports/RemsByTaskPeriod.aspx SpecificPage True False diff --git a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache index 2bb42bf..259d09b 100644 --- a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache +++ b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -835e60cbd3cb1477bf5843d79c00835b10f7b9e5 +ceeb3230c6cf7df4233a9169e6fe1b4857764386 diff --git a/eDos/web.config b/eDos/web.config index c95c6ca..89483a0 100644 --- a/eDos/web.config +++ b/eDos/web.config @@ -2,7 +2,7 @@ - + diff --git a/eDos/web.config.Debug.template b/eDos/web.config.Debug.template index b098b3c..280205b 100644 --- a/eDos/web.config.Debug.template +++ b/eDos/web.config.Debug.template @@ -3,7 +3,7 @@