From eb567c76537ea56ff4ba62478a198cecfeb44de6 Mon Sep 17 00:00:00 2001 From: Luc Vandenbroucke Date: Fri, 10 Jan 2025 13:46:56 +0100 Subject: [PATCH] Pantera --- eDos/Rems/RemsUnitTaskPersonVisits.aspx | 8 +- eDos/Rems/RemsUnitTaskPersonVisits.aspx.cs | 50 ++-- .../RemsUnitTaskPersonVisits.aspx.designer.cs | 20 +- eDos/Reports/RemsByTaskPeriod.aspx | 230 +++++++++--------- eDos/Reports/RemsByTaskPeriod.aspx.cs | 48 ++-- .../Reports/RemsByTaskPeriod.aspx.designer.cs | 140 +++++------ eDos/eDos.csproj | 34 +-- ...gnTimeResolveAssemblyReferencesInput.cache | Bin 13025 -> 6004 bytes .../Debug/eDos.csproj.CoreCompileInputs.cache | 2 +- eDos/packages.config | 10 +- 10 files changed, 273 insertions(+), 269 deletions(-) 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 79b0238653700f8483404fb997a09a5729e80ddb..7348085d277e2e8f6cc5ae4ff410429aa67114ad 100644 GIT binary patch literal 6004 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 J*1vDv_#gfbLGJ(n 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