From f03df848fcdf7392406cd3ef60b4589e950eafdf Mon Sep 17 00:00:00 2001 From: Luc Vandenbroucke Date: Thu, 24 Jan 2019 11:17:20 +0100 Subject: [PATCH] isabell 1 --- .gitignore | 2 + Rems2018/Rems2018.csproj | 48 ++++--- Rems2018/Site.master | 2 +- Rems2018/Worker.aspx | 224 +++++++++++++++++++++++++----- Rems2018/Worker.aspx.cs | 39 +++++- Rems2018/Worker.aspx.designer.cs | 44 +++++- Rems2018/Worker2.aspx | 82 ----------- Rems2018/Worker2.aspx.cs | 21 --- Rems2018/Worker2.aspx.designer.cs | 42 ------ Rems2018/Worker3.aspx | 189 ------------------------- Rems2018/Worker3.aspx.cs | 39 ------ Rems2018/Worker3.aspx.designer.cs | 78 ----------- 12 files changed, 301 insertions(+), 509 deletions(-) delete mode 100644 Rems2018/Worker2.aspx delete mode 100644 Rems2018/Worker2.aspx.cs delete mode 100644 Rems2018/Worker2.aspx.designer.cs delete mode 100644 Rems2018/Worker3.aspx delete mode 100644 Rems2018/Worker3.aspx.cs delete mode 100644 Rems2018/Worker3.aspx.designer.cs diff --git a/.gitignore b/.gitignore index bd18d3c..f1bdd23 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /toegang_Backup_2017.11.23_02.13.31 /toegang_Report.htm /safety_Backup_2017.11.23_02.13.22 +/.vs +/Rems2018/obj/Debug diff --git a/Rems2018/Rems2018.csproj b/Rems2018/Rems2018.csproj index a0be49f..7e6b8f8 100644 --- a/Rems2018/Rems2018.csproj +++ b/Rems2018/Rems2018.csproj @@ -96,20 +96,27 @@ + + LimitPerson.aspx + ASPXCodeBehind + + + LimitPerson.aspx + - - Worker2.aspx + + AlarmEPD.aspx ASPXCodeBehind - - Worker2.aspx + + AlarmEPD.aspx - - Worker.aspx + + Task.aspx ASPXCodeBehind - - Worker.aspx + + Task.aspx Worker5.aspx @@ -125,15 +132,23 @@ Worker4.aspx - - Worker3.aspx + + Worker.aspx ASPXCodeBehind - - Worker3.aspx + + Worker.aspx + + + Worker99.aspx + ASPXCodeBehind + + + Worker99.aspx + @@ -170,11 +185,12 @@ - - + + - + + @@ -231,7 +247,7 @@ False - + \ No newline at end of file diff --git a/Rems2018/Site.master b/Rems2018/Site.master index c343be8..dfef1c2 100644 --- a/Rems2018/Site.master +++ b/Rems2018/Site.master @@ -44,7 +44,7 @@ - + diff --git a/Rems2018/Worker.aspx b/Rems2018/Worker.aspx index 2f43242..1d3669c 100644 --- a/Rems2018/Worker.aspx +++ b/Rems2018/Worker.aspx @@ -1,44 +1,200 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="Worker.aspx.cs" Inherits="Rems2018.Worker" %> + - - - + + + +
+ + +
+
+
+
+ + +
+ View + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ +
+ +
+ + +
+ Edit + + + + + +
+ + + +
+
+
+ + +
+
+ + +
+
+ There are no items to be displayed. +
+
+ + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/Rems2018/Worker.aspx.cs b/Rems2018/Worker.aspx.cs index 32d42d3..8d94da6 100644 --- a/Rems2018/Worker.aspx.cs +++ b/Rems2018/Worker.aspx.cs @@ -12,9 +12,42 @@ namespace Rems2018 protected void Page_Load(object sender, EventArgs e) { - //Zet titel op masterpage - Literal titelControl = Master.FindControl("PageTitle") as Literal; - titelControl.Text = "Workers"; + //Zet titel op masterpage + Literal titelControl = Master.FindControl("PageTitle") as Literal; + titelControl.Text = "Workers"; + + + } + + protected bool isChecked(object b) + { + if (b is bool) return (bool)b; else return false; + + } + + + protected void cmbPerson_SelectedIndexChanged(object sender, Telerik.Web.UI.RadComboBoxSelectedIndexChangedEventArgs e) + { + RadDataForm1.DataBind(); + } + + protected void cmbPerson_DataBound(object sender, EventArgs e) + { + RadDataForm1.DataBind(); + } + + protected void RadDataForm1_NeedDataSource(object sender, Telerik.Web.UI.RadDataFormNeedDataSourceEventArgs e) + { + + } + + protected void gridVisits_NeedDataSource(object sender, Telerik.Web.UI.GridNeedDataSourceEventArgs e) + { + + } + + protected void testds_Selecting(object sender, SqlDataSourceSelectingEventArgs e) + { } } diff --git a/Rems2018/Worker.aspx.designer.cs b/Rems2018/Worker.aspx.designer.cs index 67418b0..c00e08a 100644 --- a/Rems2018/Worker.aspx.designer.cs +++ b/Rems2018/Worker.aspx.designer.cs @@ -13,22 +13,40 @@ namespace Rems2018 { public partial class Worker { /// - /// RadGrid1 control. + /// cmbPerson control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::Telerik.Web.UI.RadGrid RadGrid1; + protected global::Telerik.Web.UI.RadComboBox cmbPerson; /// - /// SqlDataSource1 control. + /// RadDataForm1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.SqlDataSource SqlDataSource1; + protected global::Telerik.Web.UI.RadDataForm RadDataForm1; + + /// + /// testds control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.SqlDataSource testds; + + /// + /// gridVisits control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Telerik.Web.UI.RadGrid gridVisits; /// /// sqlDSPerson control. @@ -38,5 +56,23 @@ namespace Rems2018 { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.SqlDataSource sqlDSPerson; + + /// + /// sqlDsView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.SqlDataSource sqlDsView; + + /// + /// sqlDSVisitPersId control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.SqlDataSource sqlDSVisitPersId; } } diff --git a/Rems2018/Worker2.aspx b/Rems2018/Worker2.aspx deleted file mode 100644 index f3cb5fd..0000000 --- a/Rems2018/Worker2.aspx +++ /dev/null @@ -1,82 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="Worker2.aspx.cs" Inherits="Rems2018.Worker2" %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Rems2018/Worker2.aspx.cs b/Rems2018/Worker2.aspx.cs deleted file mode 100644 index e1faa79..0000000 --- a/Rems2018/Worker2.aspx.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace Rems2018 -{ - public partial class Worker2 : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - //Zet titel op masterpage - Literal titelControl = Master.FindControl("PageTitle") as Literal; - titelControl.Text = "EPD"; - - } - } -} \ No newline at end of file diff --git a/Rems2018/Worker2.aspx.designer.cs b/Rems2018/Worker2.aspx.designer.cs deleted file mode 100644 index 1ac5762..0000000 --- a/Rems2018/Worker2.aspx.designer.cs +++ /dev/null @@ -1,42 +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 Rems2018 { - - - public partial class Worker2 { - - /// - /// RadGrid1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadGrid RadGrid1; - - /// - /// SqlDataSource1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.SqlDataSource SqlDataSource1; - - /// - /// sqlDSPerson control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.SqlDataSource sqlDSPerson; - } -} diff --git a/Rems2018/Worker3.aspx b/Rems2018/Worker3.aspx deleted file mode 100644 index c99385d..0000000 --- a/Rems2018/Worker3.aspx +++ /dev/null @@ -1,189 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="Worker3.aspx.cs" Inherits="Rems2018.Worker3" %> - - - - - - - -
- - -
-
-
-
- - -
- View - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
-
-
- -
- -
- - -
- Edit - - - - - -
- - - -
-
-
- - -
-
- - -
-
- There are no items to be displayed. -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Rems2018/Worker3.aspx.cs b/Rems2018/Worker3.aspx.cs deleted file mode 100644 index c36c3c8..0000000 --- a/Rems2018/Worker3.aspx.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -namespace Rems2018 -{ - public partial class Worker3 : System.Web.UI.Page - { - protected void Page_Load(object sender, EventArgs e) - { - - //Zet titel op masterpage - Literal titelControl = Master.FindControl("PageTitle") as Literal; - titelControl.Text = "Workers"; - - - } - - protected bool isChecked(object b) - { - if (b is bool) return (bool)b; else return false; - - } - - - protected void cmbPerson_SelectedIndexChanged(object sender, Telerik.Web.UI.RadComboBoxSelectedIndexChangedEventArgs e) - { - RadDataForm1.DataBind(); - } - - protected void cmbPerson_DataBound(object sender, EventArgs e) - { - RadDataForm1.DataBind(); - } - } -} \ No newline at end of file diff --git a/Rems2018/Worker3.aspx.designer.cs b/Rems2018/Worker3.aspx.designer.cs deleted file mode 100644 index 52d6d8b..0000000 --- a/Rems2018/Worker3.aspx.designer.cs +++ /dev/null @@ -1,78 +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 Rems2018 { - - - public partial class Worker3 { - - /// - /// cmbPerson control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadComboBox cmbPerson; - - /// - /// RadDataForm1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadDataForm RadDataForm1; - - /// - /// testds control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.SqlDataSource testds; - - /// - /// gridVisits control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadGrid gridVisits; - - /// - /// sqlDSPerson control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.SqlDataSource sqlDSPerson; - - /// - /// sqlDsView control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.SqlDataSource sqlDsView; - - /// - /// sqlDSVisitPersId control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.SqlDataSource sqlDSVisitPersId; - } -}