From 67a754ad1392abec88e9ca9a2535c31b1c76fdaf Mon Sep 17 00:00:00 2001 From: Isabelle Date: Mon, 10 Feb 2020 12:08:35 +0100 Subject: [PATCH] TASK Neutron en BG appart --- eDos/DocD.aspx | 2 +- eDos/DocD.aspx.cs | 2 +- eDos/DocD.aspx.designer.cs | 90 +++++++ eDos/Site.master | 10 +- eDos/Task.aspx.designer.cs | 60 ----- eDos/TaskBG.aspx | 175 +++++++++++++ eDos/{Task.aspx.cs => TaskBG.aspx.cs} | 4 +- eDos/TaskBG.aspx.designer.cs | 213 ++++++++++++++++ eDos/{Task.aspx => TaskNG.aspx} | 27 +- eDos/TaskNG.aspx.cs | 67 +++++ eDos/TaskNG.aspx.designer.cs | 240 ++++++++++++++++++ eDos/eDos.csproj | 20 +- eDos/eDos.csproj.user | 38 +++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 0 -> 9328 bytes ...le_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs | 0 ...le_5937a670-0e60-4077-877b-f7221da3dda1.cs | 0 ...le_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs | 0 .../Debug/eDos.csproj.CoreCompileInputs.cache | 1 + .../Debug/eDos.csprojAssemblyReference.cache | Bin 0 -> 22717 bytes 19 files changed, 854 insertions(+), 95 deletions(-) delete mode 100644 eDos/Task.aspx.designer.cs create mode 100644 eDos/TaskBG.aspx rename eDos/{Task.aspx.cs => TaskBG.aspx.cs} (95%) create mode 100644 eDos/TaskBG.aspx.designer.cs rename eDos/{Task.aspx => TaskNG.aspx} (89%) create mode 100644 eDos/TaskNG.aspx.cs create mode 100644 eDos/TaskNG.aspx.designer.cs create mode 100644 eDos/eDos.csproj.user create mode 100644 eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache create mode 100644 eDos/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs create mode 100644 eDos/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs create mode 100644 eDos/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs create mode 100644 eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache create mode 100644 eDos/obj/Debug/eDos.csprojAssemblyReference.cache diff --git a/eDos/DocD.aspx b/eDos/DocD.aspx index 644b8c7..80bb5a4 100644 --- a/eDos/DocD.aspx +++ b/eDos/DocD.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="Comment" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="DocD.aspx.cs" Inherits="Rems2018.Dose_DocD" %> +<%@ Page Title="Doc D" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="DocD.aspx.cs" Inherits="Rems2018.Dose_DocD" %> diff --git a/eDos/DocD.aspx.cs b/eDos/DocD.aspx.cs index c8c9f8c..1fb3380 100644 --- a/eDos/DocD.aspx.cs +++ b/eDos/DocD.aspx.cs @@ -14,7 +14,7 @@ namespace Rems2018 //Zet titel op masterpage Literal titelControl = Master.FindControl("PageTitle") as Literal; - titelControl.Text = "Comment to person"; + titelControl.Text = "Doc D"; } } diff --git a/eDos/DocD.aspx.designer.cs b/eDos/DocD.aspx.designer.cs index 737627e..51974c2 100644 --- a/eDos/DocD.aspx.designer.cs +++ b/eDos/DocD.aspx.designer.cs @@ -21,6 +21,96 @@ namespace Rems2018 { /// protected global::Telerik.Web.UI.RadGrid RadGrid1; + /// + /// Label3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label3; + + /// + /// RadComboBoxSelectPerson control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Telerik.Web.UI.RadComboBox RadComboBoxSelectPerson; + + /// + /// Label9 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label9; + + /// + /// Date_Dose control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Telerik.Web.UI.RadDatePicker Date_Dose; + + /// + /// Label5 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label5; + + /// + /// Dose_52W_microSv control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox Dose_52W_microSv; + + /// + /// Label7 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label Label7; + + /// + /// RadComboBoxSelectAgentSC control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Telerik.Web.UI.RadComboBox RadComboBoxSelectAgentSC; + + /// + /// 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_DoseDocD control. /// diff --git a/eDos/Site.master b/eDos/Site.master index 45331da..4bda677 100644 --- a/eDos/Site.master +++ b/eDos/Site.master @@ -56,13 +56,15 @@ - + - + + + - + @@ -88,7 +90,7 @@ - + diff --git a/eDos/Task.aspx.designer.cs b/eDos/Task.aspx.designer.cs deleted file mode 100644 index 3213557..0000000 --- a/eDos/Task.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 Rems2018 { - - - public partial class Task { - - /// - /// RadGrid1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Telerik.Web.UI.RadGrid RadGrid1; - - /// - /// 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/TaskBG.aspx b/eDos/TaskBG.aspx new file mode 100644 index 0000000..2dcb4eb --- /dev/null +++ b/eDos/TaskBG.aspx @@ -0,0 +1,175 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="TaskBG.aspx.cs" Inherits="Rems2018.TaskBG" MaintainScrollPositionOnPostback="true" %> + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eDos/Task.aspx.cs b/eDos/TaskBG.aspx.cs similarity index 95% rename from eDos/Task.aspx.cs rename to eDos/TaskBG.aspx.cs index 269a94e..0ab23aa 100644 --- a/eDos/Task.aspx.cs +++ b/eDos/TaskBG.aspx.cs @@ -9,14 +9,14 @@ using Telerik.Web.UI; namespace Rems2018 { - public partial class Task : System.Web.UI.Page + public partial class TaskBG : 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 = "Task"; + titelControl.Text = "TaskBG"; } diff --git a/eDos/TaskBG.aspx.designer.cs b/eDos/TaskBG.aspx.designer.cs new file mode 100644 index 0000000..2a30ba8 --- /dev/null +++ b/eDos/TaskBG.aspx.designer.cs @@ -0,0 +1,213 @@ +//------------------------------------------------------------------------------ +// +// 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 TaskBG { + + /// + /// 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; + + /// + /// 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; + } +} diff --git a/eDos/Task.aspx b/eDos/TaskNG.aspx similarity index 89% rename from eDos/Task.aspx rename to eDos/TaskNG.aspx index 3c4c8ed..1870224 100644 --- a/eDos/Task.aspx +++ b/eDos/TaskNG.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="Task.aspx.cs" Inherits="Rems2018.Task" MaintainScrollPositionOnPostback="true" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="TaskNG.aspx.cs" Inherits="Rems2018.TaskNG" MaintainScrollPositionOnPostback="true" %> @@ -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 0000000000000000000000000000000000000000..f21bd5e11e0d2812a5af61cdb4158aab04b6b076 GIT binary patch literal 9328 zcmeHNds7=X5Vv_;FnKgi)4bC2T4 zEd2zXe#G{tJKH=$(%g)%lRs>R^`X=5Z+EqlRx1+8L?ZDIKKfgKF7$xd%ghp7@~Sf5 zFzFMgsC=7obB?<%_ZD;WLzy>JNXEUHk#Tca{|sg3d`J0$&Un;Uf;dB&Rlnje>lJO3 z_zv}ED#N4I@#~2~w|9VHSv3^y0q=J4&+J%B2eYjI7 zF6?@poh{<-JMG80G7jvN>Xe!}Ca9&jU{qeN+lq)HCBoWTC2C7vuAOQ)Ul+Uz4{58e z2wG!OiN+B_3Wh1FU3d$EjyvNR%C%Fkmbu4vsJM4_bB@WnLmC?JG-ET+ZikGkf?HHd zF0#;`DcFRNYqC(g;CqU>w8?T>Qs^al!IaEsAn^cqGY z(F@v>OePKdf+l+Y>@PN?qAtP{<7+7$aOO+uQNb*83C?;uvcCR-E|?K-h~v{$!o=Ih z?XE>7m{%LhxYFXnVU?pfHulj|Y;ux}TjLWW)1zZ_cxrlM=tFvZqN>K>hmFp<^%EDD zOm;&wjwou+rZ|Lu;xX0X3DgbHIAW+9pq<({HS?%QVO38m$E1WnS4X=V-;RflB0>CFDZ| zD!H@UPJWM)AJZb%7EOJob-oO8=cHP#96wagNTbJ9-6PZ1JQFBxT+srWy*|ftpDUST zT*cEMT8GWi;n9)l)ED?WF__jq)xX9yP0T&!xwdf~&wZxtIL3|OiSE<1cKZ*ykIwa< zMR7vbwwIX8)WYh5No0NBxCIH%qez$~c8#uZmFK=^hca$QmC@27Tce%|W!!;`@hE!a zxRnc8?}BwQ3TuhTo!OTm^Os=GMrAHF>a?hEbRweZg0CQECW@H+%1gq$Y(PUzGEqe= z6AuT_0!5@-3u9njpdKI4h3m{FN=5Os-XZX?!=pTPVyiq>^v?T{LU&7tbU5U?Ia08Zwp`Y2Q_ z%0V?rZlOh&CS*C>B%6Plb-%LjI>rb9B25JC*I>JBsrVQYBJC7fLV;p#V=gq!9EA)5 zGof4!<)uteZOS~@pPG1BZg0Ms=5DWTJIV{%JL|~|p&V|m z^F_Go>CJf@kaoO~f(FJ-0BJW)q#RMi)TBt&QQwKg%hfsq| z1EdxwNKO!BakapAPXH$31e@0d;ksaw7OB8mjMYUO`4qT&apEGwHna6QD%!zxI060) z;8xt=+R7OK@wkC<4Uf3YY6t0afNsYPieY7{5e((e!1H3qYu^B*oz%T6(l^KNz1E5&?mIpB9j=_OZww5ia#;0RpR_JY z>brDf9^`c_D{orYJOhk89{TdQ2T$tyXHXP9u1r!FMBiym>k6suW54+&Gv! z^J4zcSj5{a2Mf$o`YKl6(Jo^092&o%{nkP0>|5u?q45guJ5zXFf~1QF1+u3PZ~9*P z&{#&(Fx>mmwb%;t%4uC()wN_}1tgx)F@A;UjaUXgPb^~NgqjYDw}3epjJ6I1{ptOy TyLkQAzrA!9ulBzqY@GiWE^J@J literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bf5d591c18080053c0fc3f8c3b190f7528a2d761 GIT binary patch literal 22717 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 SCVp8drf^j%=5sk|vws5zcl2EV literal 0 HcmV?d00001