@@ -107,21 +107,7 @@
-
- |
-
- |
-
-
-
-
-
-
-
-
-
- |
-
+
|
@@ -154,9 +140,9 @@
@@ -176,7 +162,6 @@
-
@@ -189,7 +174,7 @@
+ SelectCommand="SELECT [ID_AlarmEPD], [AlarmEPDName], [EPDRad] FROM [AlarmEPD] where epdrad='NG';">
diff --git a/eDos/TaskNG.aspx.cs b/eDos/TaskNG.aspx.cs
new file mode 100644
index 0000000..4c4a51b
--- /dev/null
+++ b/eDos/TaskNG.aspx.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using Telerik.Web.UI;
+
+namespace Rems2018
+{
+ public partial class TaskNG : 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 = "TaskNG";
+
+ }
+
+ protected void LoadAlarmComboBox(string EpdRad, RadComboBox cbAlarm)
+ {
+ SqlDSSelectAlarmLevel.SelectParameters["epdrad"].DefaultValue = EpdRad ?? "*";
+ var res = SqlDSSelectAlarmLevel.Select(DataSourceSelectArguments.Empty);
+ if (cbAlarm != null)
+ {
+ cbAlarm.Items.Clear();
+ foreach (var x in res)
+ {
+ var dv = (DataRowView)x;
+ var di2 = new RadComboBoxItem(dv[1].ToString(), dv[0].ToString());
+ cbAlarm.Items.Add(di2);
+ }
+ }
+
+ }
+
+ protected void RadComboBoxSelectEPDRad_SelectedIndexChanged(object sender, Telerik.Web.UI.RadComboBoxSelectedIndexChangedEventArgs e)
+ {
+ var s = sender as RadComboBox;
+ var c2 = s.Parent.FindControl("RadComboBoxSelectAlarmLevel") as RadComboBox;
+ SqlDSSelectAlarmLevel.SelectParameters["epdrad"].DefaultValue = s.SelectedValue;
+ LoadAlarmComboBox(s.SelectedValue, c2);
+ }
+
+
+ protected void RadComboBoxSelectAlarmLevel_Load(object sender, EventArgs e)
+ {
+ var c2 = sender as RadComboBox;
+ SqlDSSelectAlarmLevel.SelectParameters["epdrad"].DefaultValue = "*";
+ LoadAlarmComboBox("*", c2);
+ }
+
+ protected void RadGrid1_ItemDataBound(object sender, GridItemEventArgs e)
+ {
+ if (e.Item.IsInEditMode)
+ {
+ var di = e.Item.DataItem as DataRowView;
+ var EPDRad = di?.Row["EPDRad"] as string;
+ var c2 = e.Item.FindControl("RadComboBoxSelectAlarmLevel") as RadComboBox;
+ LoadAlarmComboBox(EPDRad, c2);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/eDos/TaskNG.aspx.designer.cs b/eDos/TaskNG.aspx.designer.cs
new file mode 100644
index 0000000..81be2be
--- /dev/null
+++ b/eDos/TaskNG.aspx.designer.cs
@@ -0,0 +1,240 @@
+//------------------------------------------------------------------------------
+//
+// 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 TaskNG {
+
+ ///
+ /// RadGrid1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Telerik.Web.UI.RadGrid RadGrid1;
+
+ ///
+ /// Label10 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label Label10;
+
+ ///
+ /// RadComboBox1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Telerik.Web.UI.RadComboBox RadComboBox1;
+
+ ///
+ /// Label11 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label Label11;
+
+ ///
+ /// Label12 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox Label12;
+
+ ///
+ /// Label14 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label Label14;
+
+ ///
+ /// TaskEnableCheckBox control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Telerik.Web.UI.RadCheckBox TaskEnableCheckBox;
+
+ ///
+ /// Label15 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label Label15;
+
+ ///
+ /// Label16 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox Label16;
+
+ ///
+ /// Label17 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label Label17;
+
+ ///
+ /// Label18 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox Label18;
+
+ ///
+ /// Label19 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label Label19;
+
+ ///
+ /// RadDatePicker1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Telerik.Web.UI.RadDatePicker RadDatePicker1;
+
+ ///
+ /// Label20 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label Label20;
+
+ ///
+ /// RadDatePicker2 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Telerik.Web.UI.RadDatePicker RadDatePicker2;
+
+ ///
+ /// Label22 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label Label22;
+
+ ///
+ /// RadComboBoxSelectAlarmLevel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Telerik.Web.UI.RadComboBox RadComboBoxSelectAlarmLevel;
+
+ ///
+ /// Label23 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label Label23;
+
+ ///
+ /// RadComboBox4 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Telerik.Web.UI.RadComboBox RadComboBox4;
+
+ ///
+ /// UpdateButton control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Telerik.Web.UI.RadButton UpdateButton;
+
+ ///
+ /// CancelButton control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::Telerik.Web.UI.RadButton CancelButton;
+
+ ///
+ /// sqlDSV_Task control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.SqlDataSource sqlDSV_Task;
+
+ ///
+ /// SqlDSSelectInst control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.SqlDataSource SqlDSSelectInst;
+
+ ///
+ /// SqlDSSelectAlarmLevel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.SqlDataSource SqlDSSelectAlarmLevel;
+
+ ///
+ /// SqlDSSelectGain control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.SqlDataSource SqlDSSelectGain;
+ }
+}
diff --git a/eDos/eDos.csproj b/eDos/eDos.csproj
index 157e813..05aa2ea 100644
--- a/eDos/eDos.csproj
+++ b/eDos/eDos.csproj
@@ -103,6 +103,13 @@
DocD.aspx
+
+ TaskBG.aspx
+ ASPXCodeBehind
+
+
+ TaskBG.aspx
+
TaskTypeStandard.aspx
ASPXCodeBehind
@@ -174,12 +181,12 @@
AlarmEPD.aspx
-
- Task.aspx
+
+ TaskNG.aspx
ASPXCodeBehind
-
- Task.aspx
+
+ TaskNG.aspx
Worker.aspx
@@ -194,6 +201,7 @@
+
@@ -204,7 +212,7 @@
-
+
@@ -260,7 +268,7 @@
False
-
+
\ No newline at end of file
diff --git a/eDos/eDos.csproj.user b/eDos/eDos.csproj.user
new file mode 100644
index 0000000..e6a8406
--- /dev/null
+++ b/eDos/eDos.csproj.user
@@ -0,0 +1,38 @@
+
+
+
+ Debug|Any CPU
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CurrentPage
+ True
+ False
+ False
+ False
+
+
+
+
+
+
+
+
+ True
+ True
+
+
+
+
+
\ No newline at end of file
diff --git a/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..f21bd5e
Binary files /dev/null and b/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/eDos/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/eDos/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
new file mode 100644
index 0000000..e69de29
diff --git a/eDos/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/eDos/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
new file mode 100644
index 0000000..e69de29
diff --git a/eDos/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/eDos/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
new file mode 100644
index 0000000..e69de29
diff --git a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..670ad33
--- /dev/null
+++ b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+e1bfaeb7312cc656fd6f3daa451ae27e760c3799
diff --git a/eDos/obj/Debug/eDos.csprojAssemblyReference.cache b/eDos/obj/Debug/eDos.csprojAssemblyReference.cache
new file mode 100644
index 0000000..bf5d591
Binary files /dev/null and b/eDos/obj/Debug/eDos.csprojAssemblyReference.cache differ
|