From 64355c82e550ec8105c1110f708cc813244712eb Mon Sep 17 00:00:00 2001
From: Luc Vandenbroucke <lvandenb@sckcen.be>
Date: Thu, 20 Feb 2020 15:21:50 +0100
Subject: [PATCH] No password

---
 RegisterBAdge/App.config                      |    2 +-
 RegisterBAdge/Properties/Settings.Designer.cs |    3 +-
 RegisterBAdge/Properties/Settings.settings    |    4 +-
 eDosStation/App.config                        |    6 +-
 eDosStation/AskPwd.xaml                       |   14 +
 eDosStation/AskPwd.xaml.cs                    |   37 +
 eDosStation/Config.cs                         |   47 +
 eDosStation/DataSet1.Designer.cs              | 1542 ++++++++---------
 eDosStation/DataSet1.cs                       |   11 -
 eDosStation/DataSet1.xsd                      |  130 +-
 eDosStation/DataSet1.xss                      |    8 +-
 eDosStation/EntryBadge.xaml.cs                |    2 +-
 eDosStation/EpdExit.xaml.cs                   |    2 +-
 eDosStation/MainWindow.xaml                   |    5 +-
 eDosStation/MainWindow.xaml.cs                |   95 +-
 eDosStation/Properties/Settings.Designer.cs   |   31 +-
 eDosStation/Properties/Settings.settings      |   24 +-
 eDosStation/Settings.cs                       |   28 +
 eDosStation/Station.cs                        |    4 +-
 eDosStation/User.cs                           |    2 +-
 eDosStation/eDosStation.csproj                |   13 +-
 21 files changed, 1086 insertions(+), 924 deletions(-)
 create mode 100644 eDosStation/AskPwd.xaml
 create mode 100644 eDosStation/AskPwd.xaml.cs
 create mode 100644 eDosStation/Config.cs
 delete mode 100644 eDosStation/DataSet1.cs
 create mode 100644 eDosStation/Settings.cs

diff --git a/RegisterBAdge/App.config b/RegisterBAdge/App.config
index f2a54fb..d695843 100644
--- a/RegisterBAdge/App.config
+++ b/RegisterBAdge/App.config
@@ -7,7 +7,7 @@
             connectionString="Data Source=sqlprdidpbw;Initial Catalog=idpbw;Integrated Security=True"
             providerName="System.Data.SqlClient" />
         <add name="RegisterBAdge.Properties.Settings.RemsConnection"
-            connectionString="Data Source=sqlsrv3;Initial Catalog=HPH_REMS_new;Integrated Security=True"
+            connectionString="Data Source=sqlsrv3;Initial Catalog=eDos;Integrated Security=True"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <startup> 
diff --git a/RegisterBAdge/Properties/Settings.Designer.cs b/RegisterBAdge/Properties/Settings.Designer.cs
index 4cfc227..d3b317f 100644
--- a/RegisterBAdge/Properties/Settings.Designer.cs
+++ b/RegisterBAdge/Properties/Settings.Designer.cs
@@ -36,7 +36,8 @@ namespace RegisterBAdge.Properties {
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=sqlsrv3;Initial Catalog=HPH_REMS_new;Integrated Security=True")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=tcp:10.2.12.200\\hph,54037;Initial Catalog=eDos;Persist Security Info=" +
+            "True;User ID=eDosStation;Password=Infopla+8")]
         public string RemsConnection {
             get {
                 return ((string)(this["RemsConnection"]));
diff --git a/RegisterBAdge/Properties/Settings.settings b/RegisterBAdge/Properties/Settings.settings
index 99207a2..cc992cc 100644
--- a/RegisterBAdge/Properties/Settings.settings
+++ b/RegisterBAdge/Properties/Settings.settings
@@ -13,10 +13,10 @@
     <Setting Name="RemsConnection" Type="(Connection string)" Scope="Application">
       <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=sqlsrv3;Initial Catalog=HPH_REMS_new;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=Data Source=tcp:10.2.12.200\hph,54037;Initial Catalog=eDos;Persist Security Info=True;User ID=eDosStation;Password=Infopla+8&lt;/ConnectionString&gt;
   &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=sqlsrv3;Initial Catalog=HPH_REMS_new;Integrated Security=True</Value>
+      <Value Profile="(Default)">Data Source=tcp:10.2.12.200\hph,54037;Initial Catalog=eDos;Persist Security Info=True;User ID=eDosStation;Password=Infopla+8</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/eDosStation/App.config b/eDosStation/App.config
index dedbe63..3d31f44 100644
--- a/eDosStation/App.config
+++ b/eDosStation/App.config
@@ -6,7 +6,11 @@
         </sectionGroup>
     </configSections>
     <connectionStrings>
-        <add name="eDosStation.Properties.Settings.RemoteSQL" connectionString="Data Source=tcp:10.2.12.200\sag,54037;Initial Catalog=eDos;Integrated Security=True"
+        <add name="eDosStation.Properties.Settings.masterConnectionString"
+            connectionString="Data Source=scksrv23;Initial Catalog=master;Integrated Security=True"
+            providerName="System.Data.SqlClient" />
+        <add name="eDosStation.Properties.Settings.eDosConnectionString"
+            connectionString="Data Source=tcp:10.2.12.200\hph,54037;Initial Catalog=eDos;User ID=eDosStation"
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <startup> 
diff --git a/eDosStation/AskPwd.xaml b/eDosStation/AskPwd.xaml
new file mode 100644
index 0000000..bd3dbfd
--- /dev/null
+++ b/eDosStation/AskPwd.xaml
@@ -0,0 +1,14 @@
+<Window x:Class="eDosStation.AskPwd"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:eDosStation"
+        mc:Ignorable="d"
+        Title="First setup" Height="300" Width="600" BorderThickness="1" ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" WindowStartupLocation="CenterScreen"  >
+    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+        <TextBlock Text="Sql Login Paswoord" Padding="10,10,10,10" Foreground="Red" FontWeight="Bold" FontSize="14" />
+        <PasswordBox  x:Name="ResponseTextBox" BorderBrush="Black" Margin="10,10,10,10"  />
+        <Button Content="OK" Click="OKButton_Click" />
+    </StackPanel>
+</Window>
diff --git a/eDosStation/AskPwd.xaml.cs b/eDosStation/AskPwd.xaml.cs
new file mode 100644
index 0000000..3e44213
--- /dev/null
+++ b/eDosStation/AskPwd.xaml.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace eDosStation
+{
+    /// <summary>
+    /// Interaction logic for AskPwd.xaml
+    /// </summary>
+    public partial class AskPwd : Window
+    {
+        public AskPwd()
+        {
+            InitializeComponent();
+        }
+        public string ResponseText
+        {
+            get { return ResponseTextBox.Password; }
+            set { ResponseTextBox.Password = value; }
+        }
+
+        private void OKButton_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            DialogResult = true;
+        }
+    }
+}
diff --git a/eDosStation/Config.cs b/eDosStation/Config.cs
new file mode 100644
index 0000000..41792b2
--- /dev/null
+++ b/eDosStation/Config.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace eDosStation
+{
+    static class Config
+    {
+        public static void ToggleConfigEncryption(string exeConfigName, string pwd)
+        {
+            // Takes the executable file name without the
+            // .config extension.
+            try
+            {
+                var config = ConfigurationManager.OpenExeConfiguration(exeConfigName);
+                ConnectionStringsSection section = config.GetSection("connectionStrings") as ConnectionStringsSection;
+                
+                if (section.SectionInformation.IsProtected)
+                {
+                    // Remove encryption.
+                    //section.SectionInformation.UnprotectSection();
+                }
+                else
+                {
+                    var x = section.ConnectionStrings["eDosStation.Properties.Settings.eDosConnectionString"].ConnectionString;
+                    var cb = new System.Data.SqlClient.SqlConnectionStringBuilder(x);
+                    
+                    cb.Password = pwd;
+                    section.ConnectionStrings["eDosStation.Properties.Settings.eDosConnectionString"].ConnectionString = cb.ConnectionString;
+                    // Encrypt the section.
+                    section.SectionInformation.ProtectSection("DataProtectionConfigurationProvider");
+                }
+                // Save the current configuration.
+                config.Save();
+
+                Console.WriteLine("Protected={0}",section.SectionInformation.IsProtected);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message);
+            }
+        }
+    }
+}
diff --git a/eDosStation/DataSet1.Designer.cs b/eDosStation/DataSet1.Designer.cs
index 0a05aad..3fc26c2 100644
--- a/eDosStation/DataSet1.Designer.cs
+++ b/eDosStation/DataSet1.Designer.cs
@@ -24,10 +24,10 @@ namespace eDosStation {
     [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.DataSet")]
     public partial class DataSet1 : global::System.Data.DataSet {
         
-        private GetTaskListDataTable tableGetTaskList;
-        
         private GetTaskInfoDataTable tableGetTaskInfo;
         
+        private GetTaskListDataTable tableGetTaskList;
+        
         private CommentOnEventDataTable tableCommentOnEvent;
         
         private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
@@ -58,12 +58,12 @@ namespace eDosStation {
             if ((this.DetermineSchemaSerializationMode(info, context) == global::System.Data.SchemaSerializationMode.IncludeSchema)) {
                 global::System.Data.DataSet ds = new global::System.Data.DataSet();
                 ds.ReadXmlSchema(new global::System.Xml.XmlTextReader(new global::System.IO.StringReader(strSchema)));
-                if ((ds.Tables["GetTaskList"] != null)) {
-                    base.Tables.Add(new GetTaskListDataTable(ds.Tables["GetTaskList"]));
-                }
                 if ((ds.Tables["GetTaskInfo"] != null)) {
                     base.Tables.Add(new GetTaskInfoDataTable(ds.Tables["GetTaskInfo"]));
                 }
+                if ((ds.Tables["GetTaskList"] != null)) {
+                    base.Tables.Add(new GetTaskListDataTable(ds.Tables["GetTaskList"]));
+                }
                 if ((ds.Tables["CommentOnEvent"] != null)) {
                     base.Tables.Add(new CommentOnEventDataTable(ds.Tables["CommentOnEvent"]));
                 }
@@ -89,9 +89,9 @@ namespace eDosStation {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         [global::System.ComponentModel.Browsable(false)]
         [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
-        public GetTaskListDataTable GetTaskList {
+        public GetTaskInfoDataTable GetTaskInfo {
             get {
-                return this.tableGetTaskList;
+                return this.tableGetTaskInfo;
             }
         }
         
@@ -99,9 +99,9 @@ namespace eDosStation {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         [global::System.ComponentModel.Browsable(false)]
         [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
-        public GetTaskInfoDataTable GetTaskInfo {
+        public GetTaskListDataTable GetTaskList {
             get {
-                return this.tableGetTaskInfo;
+                return this.tableGetTaskList;
             }
         }
         
@@ -182,12 +182,12 @@ namespace eDosStation {
                 this.Reset();
                 global::System.Data.DataSet ds = new global::System.Data.DataSet();
                 ds.ReadXml(reader);
-                if ((ds.Tables["GetTaskList"] != null)) {
-                    base.Tables.Add(new GetTaskListDataTable(ds.Tables["GetTaskList"]));
-                }
                 if ((ds.Tables["GetTaskInfo"] != null)) {
                     base.Tables.Add(new GetTaskInfoDataTable(ds.Tables["GetTaskInfo"]));
                 }
+                if ((ds.Tables["GetTaskList"] != null)) {
+                    base.Tables.Add(new GetTaskListDataTable(ds.Tables["GetTaskList"]));
+                }
                 if ((ds.Tables["CommentOnEvent"] != null)) {
                     base.Tables.Add(new CommentOnEventDataTable(ds.Tables["CommentOnEvent"]));
                 }
@@ -224,18 +224,18 @@ namespace eDosStation {
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         internal void InitVars(bool initTable) {
-            this.tableGetTaskList = ((GetTaskListDataTable)(base.Tables["GetTaskList"]));
-            if ((initTable == true)) {
-                if ((this.tableGetTaskList != null)) {
-                    this.tableGetTaskList.InitVars();
-                }
-            }
             this.tableGetTaskInfo = ((GetTaskInfoDataTable)(base.Tables["GetTaskInfo"]));
             if ((initTable == true)) {
                 if ((this.tableGetTaskInfo != null)) {
                     this.tableGetTaskInfo.InitVars();
                 }
             }
+            this.tableGetTaskList = ((GetTaskListDataTable)(base.Tables["GetTaskList"]));
+            if ((initTable == true)) {
+                if ((this.tableGetTaskList != null)) {
+                    this.tableGetTaskList.InitVars();
+                }
+            }
             this.tableCommentOnEvent = ((CommentOnEventDataTable)(base.Tables["CommentOnEvent"]));
             if ((initTable == true)) {
                 if ((this.tableCommentOnEvent != null)) {
@@ -252,23 +252,23 @@ namespace eDosStation {
             this.Namespace = "http://tempuri.org/DataSet1.xsd";
             this.EnforceConstraints = true;
             this.SchemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
-            this.tableGetTaskList = new GetTaskListDataTable();
-            base.Tables.Add(this.tableGetTaskList);
             this.tableGetTaskInfo = new GetTaskInfoDataTable();
             base.Tables.Add(this.tableGetTaskInfo);
+            this.tableGetTaskList = new GetTaskListDataTable();
+            base.Tables.Add(this.tableGetTaskList);
             this.tableCommentOnEvent = new CommentOnEventDataTable();
             base.Tables.Add(this.tableCommentOnEvent);
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        private bool ShouldSerializeGetTaskList() {
+        private bool ShouldSerializeGetTaskInfo() {
             return false;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        private bool ShouldSerializeGetTaskInfo() {
+        private bool ShouldSerializeGetTaskList() {
             return false;
         }
         
@@ -334,10 +334,10 @@ namespace eDosStation {
         }
         
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        public delegate void GetTaskListRowChangeEventHandler(object sender, GetTaskListRowChangeEvent e);
+        public delegate void GetTaskInfoRowChangeEventHandler(object sender, GetTaskInfoRowChangeEvent e);
         
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        public delegate void GetTaskInfoRowChangeEventHandler(object sender, GetTaskInfoRowChangeEvent e);
+        public delegate void GetTaskListRowChangeEventHandler(object sender, GetTaskListRowChangeEvent e);
         
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         public delegate void CommentOnEventRowChangeEventHandler(object sender, CommentOnEventRowChangeEvent e);
@@ -347,347 +347,14 @@ namespace eDosStation {
         ///</summary>
         [global::System.Serializable()]
         [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
-        public partial class GetTaskListDataTable : global::System.Data.TypedTableBase<GetTaskListRow> {
+        public partial class GetTaskInfoDataTable : global::System.Data.TypedTableBase<GetTaskInfoRow> {
             
             private global::System.Data.DataColumn columnID_Task;
             
-            private global::System.Data.DataColumn columnTask_Name;
-            
-            private global::System.Data.DataColumn columnTaskDescription;
-            
-            private global::System.Data.DataColumn columnEPDRad;
-            
             private global::System.Data.DataColumn columnInst_CODE;
             
             private global::System.Data.DataColumn columnTaskType_CODE;
             
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public GetTaskListDataTable() {
-                this.TableName = "GetTaskList";
-                this.BeginInit();
-                this.InitClass();
-                this.EndInit();
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            internal GetTaskListDataTable(global::System.Data.DataTable table) {
-                this.TableName = table.TableName;
-                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
-                    this.CaseSensitive = table.CaseSensitive;
-                }
-                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
-                    this.Locale = table.Locale;
-                }
-                if ((table.Namespace != table.DataSet.Namespace)) {
-                    this.Namespace = table.Namespace;
-                }
-                this.Prefix = table.Prefix;
-                this.MinimumCapacity = table.MinimumCapacity;
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            protected GetTaskListDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
-                    base(info, context) {
-                this.InitVars();
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn ID_TaskColumn {
-                get {
-                    return this.columnID_Task;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn Task_NameColumn {
-                get {
-                    return this.columnTask_Name;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn TaskDescriptionColumn {
-                get {
-                    return this.columnTaskDescription;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn EPDRadColumn {
-                get {
-                    return this.columnEPDRad;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn Inst_CODEColumn {
-                get {
-                    return this.columnInst_CODE;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn TaskType_CODEColumn {
-                get {
-                    return this.columnTaskType_CODE;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            [global::System.ComponentModel.Browsable(false)]
-            public int Count {
-                get {
-                    return this.Rows.Count;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public GetTaskListRow this[int index] {
-                get {
-                    return ((GetTaskListRow)(this.Rows[index]));
-                }
-            }
-            
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public event GetTaskListRowChangeEventHandler GetTaskListRowChanging;
-            
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public event GetTaskListRowChangeEventHandler GetTaskListRowChanged;
-            
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public event GetTaskListRowChangeEventHandler GetTaskListRowDeleting;
-            
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public event GetTaskListRowChangeEventHandler GetTaskListRowDeleted;
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public void AddGetTaskListRow(GetTaskListRow row) {
-                this.Rows.Add(row);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public GetTaskListRow AddGetTaskListRow(string Task_Name, string TaskDescription, string EPDRad, int Inst_CODE, int TaskType_CODE) {
-                GetTaskListRow rowGetTaskListRow = ((GetTaskListRow)(this.NewRow()));
-                object[] columnValuesArray = new object[] {
-                        null,
-                        Task_Name,
-                        TaskDescription,
-                        EPDRad,
-                        Inst_CODE,
-                        TaskType_CODE};
-                rowGetTaskListRow.ItemArray = columnValuesArray;
-                this.Rows.Add(rowGetTaskListRow);
-                return rowGetTaskListRow;
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public GetTaskListRow FindByID_Task(int ID_Task) {
-                return ((GetTaskListRow)(this.Rows.Find(new object[] {
-                            ID_Task})));
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public override global::System.Data.DataTable Clone() {
-                GetTaskListDataTable cln = ((GetTaskListDataTable)(base.Clone()));
-                cln.InitVars();
-                return cln;
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            protected override global::System.Data.DataTable CreateInstance() {
-                return new GetTaskListDataTable();
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            internal void InitVars() {
-                this.columnID_Task = base.Columns["ID_Task"];
-                this.columnTask_Name = base.Columns["Task_Name"];
-                this.columnTaskDescription = base.Columns["TaskDescription"];
-                this.columnEPDRad = base.Columns["EPDRad"];
-                this.columnInst_CODE = base.Columns["Inst_CODE"];
-                this.columnTaskType_CODE = base.Columns["TaskType_CODE"];
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            private void InitClass() {
-                this.columnID_Task = new global::System.Data.DataColumn("ID_Task", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnID_Task);
-                this.columnTask_Name = new global::System.Data.DataColumn("Task_Name", typeof(string), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnTask_Name);
-                this.columnTaskDescription = new global::System.Data.DataColumn("TaskDescription", typeof(string), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnTaskDescription);
-                this.columnEPDRad = new global::System.Data.DataColumn("EPDRad", typeof(string), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnEPDRad);
-                this.columnInst_CODE = new global::System.Data.DataColumn("Inst_CODE", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnInst_CODE);
-                this.columnTaskType_CODE = new global::System.Data.DataColumn("TaskType_CODE", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnTaskType_CODE);
-                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
-                                this.columnID_Task}, true));
-                this.columnID_Task.AutoIncrement = true;
-                this.columnID_Task.AutoIncrementSeed = -1;
-                this.columnID_Task.AutoIncrementStep = -1;
-                this.columnID_Task.AllowDBNull = false;
-                this.columnID_Task.ReadOnly = true;
-                this.columnID_Task.Unique = true;
-                this.columnTask_Name.MaxLength = 2147483647;
-                this.columnTaskDescription.ReadOnly = true;
-                this.columnTaskDescription.MaxLength = 50;
-                this.columnEPDRad.AllowDBNull = false;
-                this.columnEPDRad.MaxLength = 2;
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public GetTaskListRow NewGetTaskListRow() {
-                return ((GetTaskListRow)(this.NewRow()));
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
-                return new GetTaskListRow(builder);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            protected override global::System.Type GetRowType() {
-                return typeof(GetTaskListRow);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
-                base.OnRowChanged(e);
-                if ((this.GetTaskListRowChanged != null)) {
-                    this.GetTaskListRowChanged(this, new GetTaskListRowChangeEvent(((GetTaskListRow)(e.Row)), e.Action));
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
-                base.OnRowChanging(e);
-                if ((this.GetTaskListRowChanging != null)) {
-                    this.GetTaskListRowChanging(this, new GetTaskListRowChangeEvent(((GetTaskListRow)(e.Row)), e.Action));
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
-                base.OnRowDeleted(e);
-                if ((this.GetTaskListRowDeleted != null)) {
-                    this.GetTaskListRowDeleted(this, new GetTaskListRowChangeEvent(((GetTaskListRow)(e.Row)), e.Action));
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
-                base.OnRowDeleting(e);
-                if ((this.GetTaskListRowDeleting != null)) {
-                    this.GetTaskListRowDeleting(this, new GetTaskListRowChangeEvent(((GetTaskListRow)(e.Row)), e.Action));
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public void RemoveGetTaskListRow(GetTaskListRow row) {
-                this.Rows.Remove(row);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
-                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
-                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
-                DataSet1 ds = new DataSet1();
-                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
-                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
-                any1.MinOccurs = new decimal(0);
-                any1.MaxOccurs = decimal.MaxValue;
-                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
-                sequence.Items.Add(any1);
-                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
-                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
-                any2.MinOccurs = new decimal(1);
-                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
-                sequence.Items.Add(any2);
-                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
-                attribute1.Name = "namespace";
-                attribute1.FixedValue = ds.Namespace;
-                type.Attributes.Add(attribute1);
-                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
-                attribute2.Name = "tableTypeName";
-                attribute2.FixedValue = "GetTaskListDataTable";
-                type.Attributes.Add(attribute2);
-                type.Particle = sequence;
-                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
-                if (xs.Contains(dsSchema.TargetNamespace)) {
-                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
-                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
-                    try {
-                        global::System.Xml.Schema.XmlSchema schema = null;
-                        dsSchema.Write(s1);
-                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
-                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
-                            s2.SetLength(0);
-                            schema.Write(s2);
-                            if ((s1.Length == s2.Length)) {
-                                s1.Position = 0;
-                                s2.Position = 0;
-                                for (; ((s1.Position != s1.Length) 
-                                            && (s1.ReadByte() == s2.ReadByte())); ) {
-                                    ;
-                                }
-                                if ((s1.Position == s1.Length)) {
-                                    return type;
-                                }
-                            }
-                        }
-                    }
-                    finally {
-                        if ((s1 != null)) {
-                            s1.Close();
-                        }
-                        if ((s2 != null)) {
-                            s2.Close();
-                        }
-                    }
-                }
-                xs.Add(dsSchema);
-                return type;
-            }
-        }
-        
-        /// <summary>
-        ///Represents the strongly named DataTable class.
-        ///</summary>
-        [global::System.Serializable()]
-        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
-        public partial class GetTaskInfoDataTable : global::System.Data.TypedTableBase<GetTaskInfoRow> {
-            
-            private global::System.Data.DataColumn columnID_Task;
-            
             private global::System.Data.DataColumn columnTask_Name;
             
             private global::System.Data.DataColumn columnTaskDescription;
@@ -728,16 +395,12 @@ namespace eDosStation {
             
             private global::System.Data.DataColumn columnDescription;
             
-            private global::System.Data.DataColumn columnInst_CODE;
+            private global::System.Data.DataColumn columnInst_CODE1;
             
             private global::System.Data.DataColumn columnMinWorkerDosisMargin;
             
             private global::System.Data.DataColumn columnMarginExceeded;
             
-            private global::System.Data.DataColumn columnTaskType_CODE;
-            
-            private global::System.Data.DataColumn columnInst_CODE1;
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public GetTaskInfoDataTable() {
@@ -779,6 +442,22 @@ namespace eDosStation {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn Inst_CODEColumn {
+                get {
+                    return this.columnInst_CODE;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn TaskType_CODEColumn {
+                get {
+                    return this.columnTaskType_CODE;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public global::System.Data.DataColumn Task_NameColumn {
@@ -941,9 +620,9 @@ namespace eDosStation {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn Inst_CODEColumn {
+            public global::System.Data.DataColumn Inst_CODE1Column {
                 get {
-                    return this.columnInst_CODE;
+                    return this.columnInst_CODE1;
                 }
             }
             
@@ -963,22 +642,6 @@ namespace eDosStation {
                 }
             }
             
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn TaskType_CODEColumn {
-                get {
-                    return this.columnTaskType_CODE;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public global::System.Data.DataColumn Inst_CODE1Column {
-                get {
-                    return this.columnInst_CODE1;
-                }
-            }
-            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -1017,6 +680,8 @@ namespace eDosStation {
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public GetTaskInfoRow AddGetTaskInfoRow(
+                        int Inst_CODE, 
+                        int TaskType_CODE, 
                         string Task_Name, 
                         string TaskDescription, 
                         string EPDRad, 
@@ -1037,14 +702,14 @@ namespace eDosStation {
                         double FNGain_ANGainValue, 
                         string InstallationActivity, 
                         string Description, 
-                        int Inst_CODE, 
+                        int Inst_CODE1, 
                         double MinWorkerDosisMargin, 
-                        bool MarginExceeded, 
-                        int TaskType_CODE, 
-                        int Inst_CODE1) {
+                        bool MarginExceeded) {
                 GetTaskInfoRow rowGetTaskInfoRow = ((GetTaskInfoRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
+                        Inst_CODE,
+                        TaskType_CODE,
                         Task_Name,
                         TaskDescription,
                         EPDRad,
@@ -1065,11 +730,9 @@ namespace eDosStation {
                         FNGain_ANGainValue,
                         InstallationActivity,
                         Description,
-                        Inst_CODE,
+                        Inst_CODE1,
                         MinWorkerDosisMargin,
-                        MarginExceeded,
-                        TaskType_CODE,
-                        Inst_CODE1};
+                        MarginExceeded};
                 rowGetTaskInfoRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowGetTaskInfoRow);
                 return rowGetTaskInfoRow;
@@ -1100,6 +763,8 @@ namespace eDosStation {
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             internal void InitVars() {
                 this.columnID_Task = base.Columns["ID_Task"];
+                this.columnInst_CODE = base.Columns["Inst_CODE"];
+                this.columnTaskType_CODE = base.Columns["TaskType_CODE"];
                 this.columnTask_Name = base.Columns["Task_Name"];
                 this.columnTaskDescription = base.Columns["TaskDescription"];
                 this.columnEPDRad = base.Columns["EPDRad"];
@@ -1120,11 +785,9 @@ namespace eDosStation {
                 this.columnFNGain_ANGainValue = base.Columns["FNGain_ANGainValue"];
                 this.columnInstallationActivity = base.Columns["InstallationActivity"];
                 this.columnDescription = base.Columns["Description"];
-                this.columnInst_CODE = base.Columns["Inst_CODE"];
+                this.columnInst_CODE1 = base.Columns["Inst_CODE1"];
                 this.columnMinWorkerDosisMargin = base.Columns["MinWorkerDosisMargin"];
                 this.columnMarginExceeded = base.Columns["MarginExceeded"];
-                this.columnTaskType_CODE = base.Columns["TaskType_CODE"];
-                this.columnInst_CODE1 = base.Columns["Inst_CODE1"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1132,6 +795,10 @@ namespace eDosStation {
             private void InitClass() {
                 this.columnID_Task = new global::System.Data.DataColumn("ID_Task", typeof(int), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnID_Task);
+                this.columnInst_CODE = new global::System.Data.DataColumn("Inst_CODE", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnInst_CODE);
+                this.columnTaskType_CODE = new global::System.Data.DataColumn("TaskType_CODE", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnTaskType_CODE);
                 this.columnTask_Name = new global::System.Data.DataColumn("Task_Name", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnTask_Name);
                 this.columnTaskDescription = new global::System.Data.DataColumn("TaskDescription", typeof(string), null, global::System.Data.MappingType.Element);
@@ -1172,16 +839,12 @@ namespace eDosStation {
                 base.Columns.Add(this.columnInstallationActivity);
                 this.columnDescription = new global::System.Data.DataColumn("Description", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnDescription);
-                this.columnInst_CODE = new global::System.Data.DataColumn("Inst_CODE", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnInst_CODE);
+                this.columnInst_CODE1 = new global::System.Data.DataColumn("Inst_CODE1", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnInst_CODE1);
                 this.columnMinWorkerDosisMargin = new global::System.Data.DataColumn("MinWorkerDosisMargin", typeof(double), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnMinWorkerDosisMargin);
                 this.columnMarginExceeded = new global::System.Data.DataColumn("MarginExceeded", typeof(bool), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnMarginExceeded);
-                this.columnTaskType_CODE = new global::System.Data.DataColumn("TaskType_CODE", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnTaskType_CODE);
-                this.columnInst_CODE1 = new global::System.Data.DataColumn("Inst_CODE1", typeof(int), null, global::System.Data.MappingType.Element);
-                base.Columns.Add(this.columnInst_CODE1);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnID_Task}, true));
                 this.columnID_Task.AutoIncrement = true;
@@ -1324,6 +987,343 @@ namespace eDosStation {
             }
         }
         
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class GetTaskListDataTable : global::System.Data.TypedTableBase<GetTaskListRow> {
+            
+            private global::System.Data.DataColumn columnID_Task;
+            
+            private global::System.Data.DataColumn columnInst_CODE;
+            
+            private global::System.Data.DataColumn columnTaskType_CODE;
+            
+            private global::System.Data.DataColumn columnTask_Name;
+            
+            private global::System.Data.DataColumn columnTaskDescription;
+            
+            private global::System.Data.DataColumn columnEPDRad;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public GetTaskListDataTable() {
+                this.TableName = "GetTaskList";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            internal GetTaskListDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            protected GetTaskListDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn ID_TaskColumn {
+                get {
+                    return this.columnID_Task;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn Inst_CODEColumn {
+                get {
+                    return this.columnInst_CODE;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn TaskType_CODEColumn {
+                get {
+                    return this.columnTaskType_CODE;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn Task_NameColumn {
+                get {
+                    return this.columnTask_Name;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn TaskDescriptionColumn {
+                get {
+                    return this.columnTaskDescription;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn EPDRadColumn {
+                get {
+                    return this.columnEPDRad;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public GetTaskListRow this[int index] {
+                get {
+                    return ((GetTaskListRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public event GetTaskListRowChangeEventHandler GetTaskListRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public event GetTaskListRowChangeEventHandler GetTaskListRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public event GetTaskListRowChangeEventHandler GetTaskListRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public event GetTaskListRowChangeEventHandler GetTaskListRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void AddGetTaskListRow(GetTaskListRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public GetTaskListRow AddGetTaskListRow(int Inst_CODE, int TaskType_CODE, string Task_Name, string TaskDescription, string EPDRad) {
+                GetTaskListRow rowGetTaskListRow = ((GetTaskListRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        null,
+                        Inst_CODE,
+                        TaskType_CODE,
+                        Task_Name,
+                        TaskDescription,
+                        EPDRad};
+                rowGetTaskListRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowGetTaskListRow);
+                return rowGetTaskListRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public GetTaskListRow FindByID_Task(int ID_Task) {
+                return ((GetTaskListRow)(this.Rows.Find(new object[] {
+                            ID_Task})));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                GetTaskListDataTable cln = ((GetTaskListDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new GetTaskListDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            internal void InitVars() {
+                this.columnID_Task = base.Columns["ID_Task"];
+                this.columnInst_CODE = base.Columns["Inst_CODE"];
+                this.columnTaskType_CODE = base.Columns["TaskType_CODE"];
+                this.columnTask_Name = base.Columns["Task_Name"];
+                this.columnTaskDescription = base.Columns["TaskDescription"];
+                this.columnEPDRad = base.Columns["EPDRad"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            private void InitClass() {
+                this.columnID_Task = new global::System.Data.DataColumn("ID_Task", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnID_Task);
+                this.columnInst_CODE = new global::System.Data.DataColumn("Inst_CODE", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnInst_CODE);
+                this.columnTaskType_CODE = new global::System.Data.DataColumn("TaskType_CODE", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnTaskType_CODE);
+                this.columnTask_Name = new global::System.Data.DataColumn("Task_Name", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnTask_Name);
+                this.columnTaskDescription = new global::System.Data.DataColumn("TaskDescription", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnTaskDescription);
+                this.columnEPDRad = new global::System.Data.DataColumn("EPDRad", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnEPDRad);
+                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+                                this.columnID_Task}, true));
+                this.columnID_Task.AutoIncrement = true;
+                this.columnID_Task.AutoIncrementSeed = -1;
+                this.columnID_Task.AutoIncrementStep = -1;
+                this.columnID_Task.AllowDBNull = false;
+                this.columnID_Task.ReadOnly = true;
+                this.columnID_Task.Unique = true;
+                this.columnTask_Name.MaxLength = 2147483647;
+                this.columnTaskDescription.ReadOnly = true;
+                this.columnTaskDescription.MaxLength = 50;
+                this.columnEPDRad.AllowDBNull = false;
+                this.columnEPDRad.MaxLength = 2;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public GetTaskListRow NewGetTaskListRow() {
+                return ((GetTaskListRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new GetTaskListRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            protected override global::System.Type GetRowType() {
+                return typeof(GetTaskListRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.GetTaskListRowChanged != null)) {
+                    this.GetTaskListRowChanged(this, new GetTaskListRowChangeEvent(((GetTaskListRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.GetTaskListRowChanging != null)) {
+                    this.GetTaskListRowChanging(this, new GetTaskListRowChangeEvent(((GetTaskListRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.GetTaskListRowDeleted != null)) {
+                    this.GetTaskListRowDeleted(this, new GetTaskListRowChangeEvent(((GetTaskListRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.GetTaskListRowDeleting != null)) {
+                    this.GetTaskListRowDeleting(this, new GetTaskListRowChangeEvent(((GetTaskListRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void RemoveGetTaskListRow(GetTaskListRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                DataSet1 ds = new DataSet1();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "GetTaskListDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
         /// <summary>
         ///Represents the strongly named DataTable class.
         ///</summary>
@@ -1675,155 +1675,6 @@ namespace eDosStation {
             }
         }
         
-        /// <summary>
-        ///Represents strongly named DataRow class.
-        ///</summary>
-        public partial class GetTaskListRow : global::System.Data.DataRow {
-            
-            private GetTaskListDataTable tableGetTaskList;
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            internal GetTaskListRow(global::System.Data.DataRowBuilder rb) : 
-                    base(rb) {
-                this.tableGetTaskList = ((GetTaskListDataTable)(this.Table));
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public int ID_Task {
-                get {
-                    return ((int)(this[this.tableGetTaskList.ID_TaskColumn]));
-                }
-                set {
-                    this[this.tableGetTaskList.ID_TaskColumn] = value;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public string Task_Name {
-                get {
-                    try {
-                        return ((string)(this[this.tableGetTaskList.Task_NameColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'Task_Name\' in table \'GetTaskList\' is DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableGetTaskList.Task_NameColumn] = value;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public string TaskDescription {
-                get {
-                    try {
-                        return ((string)(this[this.tableGetTaskList.TaskDescriptionColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'TaskDescription\' in table \'GetTaskList\' is DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableGetTaskList.TaskDescriptionColumn] = value;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public string EPDRad {
-                get {
-                    return ((string)(this[this.tableGetTaskList.EPDRadColumn]));
-                }
-                set {
-                    this[this.tableGetTaskList.EPDRadColumn] = value;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public int Inst_CODE {
-                get {
-                    try {
-                        return ((int)(this[this.tableGetTaskList.Inst_CODEColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'Inst_CODE\' in table \'GetTaskList\' is DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableGetTaskList.Inst_CODEColumn] = value;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public int TaskType_CODE {
-                get {
-                    try {
-                        return ((int)(this[this.tableGetTaskList.TaskType_CODEColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'TaskType_CODE\' in table \'GetTaskList\' is DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableGetTaskList.TaskType_CODEColumn] = value;
-                }
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public bool IsTask_NameNull() {
-                return this.IsNull(this.tableGetTaskList.Task_NameColumn);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public void SetTask_NameNull() {
-                this[this.tableGetTaskList.Task_NameColumn] = global::System.Convert.DBNull;
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public bool IsTaskDescriptionNull() {
-                return this.IsNull(this.tableGetTaskList.TaskDescriptionColumn);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public void SetTaskDescriptionNull() {
-                this[this.tableGetTaskList.TaskDescriptionColumn] = global::System.Convert.DBNull;
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public bool IsInst_CODENull() {
-                return this.IsNull(this.tableGetTaskList.Inst_CODEColumn);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public void SetInst_CODENull() {
-                this[this.tableGetTaskList.Inst_CODEColumn] = global::System.Convert.DBNull;
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public bool IsTaskType_CODENull() {
-                return this.IsNull(this.tableGetTaskList.TaskType_CODEColumn);
-            }
-            
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public void SetTaskType_CODENull() {
-                this[this.tableGetTaskList.TaskType_CODEColumn] = global::System.Convert.DBNull;
-            }
-        }
-        
         /// <summary>
         ///Represents strongly named DataRow class.
         ///</summary>
@@ -1849,6 +1700,38 @@ namespace eDosStation {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int Inst_CODE {
+                get {
+                    try {
+                        return ((int)(this[this.tableGetTaskInfo.Inst_CODEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'Inst_CODE\' in table \'GetTaskInfo\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableGetTaskInfo.Inst_CODEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int TaskType_CODE {
+                get {
+                    try {
+                        return ((int)(this[this.tableGetTaskInfo.TaskType_CODEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'TaskType_CODE\' in table \'GetTaskInfo\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableGetTaskInfo.TaskType_CODEColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public string Task_Name {
@@ -2166,17 +2049,17 @@ namespace eDosStation {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public int Inst_CODE {
+            public int Inst_CODE1 {
                 get {
                     try {
-                        return ((int)(this[this.tableGetTaskInfo.Inst_CODEColumn]));
+                        return ((int)(this[this.tableGetTaskInfo.Inst_CODE1Column]));
                     }
                     catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'Inst_CODE\' in table \'GetTaskInfo\' is DBNull.", e);
+                        throw new global::System.Data.StrongTypingException("The value for column \'Inst_CODE1\' in table \'GetTaskInfo\' is DBNull.", e);
                     }
                 }
                 set {
-                    this[this.tableGetTaskInfo.Inst_CODEColumn] = value;
+                    this[this.tableGetTaskInfo.Inst_CODE1Column] = value;
                 }
             }
             
@@ -2214,34 +2097,26 @@ namespace eDosStation {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public int TaskType_CODE {
-                get {
-                    try {
-                        return ((int)(this[this.tableGetTaskInfo.TaskType_CODEColumn]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'TaskType_CODE\' in table \'GetTaskInfo\' is DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableGetTaskInfo.TaskType_CODEColumn] = value;
-                }
+            public bool IsInst_CODENull() {
+                return this.IsNull(this.tableGetTaskInfo.Inst_CODEColumn);
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public int Inst_CODE1 {
-                get {
-                    try {
-                        return ((int)(this[this.tableGetTaskInfo.Inst_CODE1Column]));
-                    }
-                    catch (global::System.InvalidCastException e) {
-                        throw new global::System.Data.StrongTypingException("The value for column \'Inst_CODE1\' in table \'GetTaskInfo\' is DBNull.", e);
-                    }
-                }
-                set {
-                    this[this.tableGetTaskInfo.Inst_CODE1Column] = value;
-                }
+            public void SetInst_CODENull() {
+                this[this.tableGetTaskInfo.Inst_CODEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool IsTaskType_CODENull() {
+                return this.IsNull(this.tableGetTaskInfo.TaskType_CODEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void SetTaskType_CODENull() {
+                this[this.tableGetTaskInfo.TaskType_CODEColumn] = global::System.Convert.DBNull;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2474,14 +2349,14 @@ namespace eDosStation {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public bool IsInst_CODENull() {
-                return this.IsNull(this.tableGetTaskInfo.Inst_CODEColumn);
+            public bool IsInst_CODE1Null() {
+                return this.IsNull(this.tableGetTaskInfo.Inst_CODE1Column);
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public void SetInst_CODENull() {
-                this[this.tableGetTaskInfo.Inst_CODEColumn] = global::System.Convert.DBNull;
+            public void SetInst_CODE1Null() {
+                this[this.tableGetTaskInfo.Inst_CODE1Column] = global::System.Convert.DBNull;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2507,29 +2382,154 @@ namespace eDosStation {
             public void SetMarginExceededNull() {
                 this[this.tableGetTaskInfo.MarginExceededColumn] = global::System.Convert.DBNull;
             }
+        }
+        
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class GetTaskListRow : global::System.Data.DataRow {
+            
+            private GetTaskListDataTable tableGetTaskList;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            internal GetTaskListRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableGetTaskList = ((GetTaskListDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int ID_Task {
+                get {
+                    return ((int)(this[this.tableGetTaskList.ID_TaskColumn]));
+                }
+                set {
+                    this[this.tableGetTaskList.ID_TaskColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int Inst_CODE {
+                get {
+                    try {
+                        return ((int)(this[this.tableGetTaskList.Inst_CODEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'Inst_CODE\' in table \'GetTaskList\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableGetTaskList.Inst_CODEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int TaskType_CODE {
+                get {
+                    try {
+                        return ((int)(this[this.tableGetTaskList.TaskType_CODEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'TaskType_CODE\' in table \'GetTaskList\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableGetTaskList.TaskType_CODEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public string Task_Name {
+                get {
+                    try {
+                        return ((string)(this[this.tableGetTaskList.Task_NameColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'Task_Name\' in table \'GetTaskList\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableGetTaskList.Task_NameColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public string TaskDescription {
+                get {
+                    try {
+                        return ((string)(this[this.tableGetTaskList.TaskDescriptionColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'TaskDescription\' in table \'GetTaskList\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableGetTaskList.TaskDescriptionColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public string EPDRad {
+                get {
+                    return ((string)(this[this.tableGetTaskList.EPDRadColumn]));
+                }
+                set {
+                    this[this.tableGetTaskList.EPDRadColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool IsInst_CODENull() {
+                return this.IsNull(this.tableGetTaskList.Inst_CODEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void SetInst_CODENull() {
+                this[this.tableGetTaskList.Inst_CODEColumn] = global::System.Convert.DBNull;
+            }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public bool IsTaskType_CODENull() {
-                return this.IsNull(this.tableGetTaskInfo.TaskType_CODEColumn);
+                return this.IsNull(this.tableGetTaskList.TaskType_CODEColumn);
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public void SetTaskType_CODENull() {
-                this[this.tableGetTaskInfo.TaskType_CODEColumn] = global::System.Convert.DBNull;
+                this[this.tableGetTaskList.TaskType_CODEColumn] = global::System.Convert.DBNull;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public bool IsInst_CODE1Null() {
-                return this.IsNull(this.tableGetTaskInfo.Inst_CODE1Column);
+            public bool IsTask_NameNull() {
+                return this.IsNull(this.tableGetTaskList.Task_NameColumn);
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public void SetInst_CODE1Null() {
-                this[this.tableGetTaskInfo.Inst_CODE1Column] = global::System.Convert.DBNull;
+            public void SetTask_NameNull() {
+                this[this.tableGetTaskList.Task_NameColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool IsTaskDescriptionNull() {
+                return this.IsNull(this.tableGetTaskList.TaskDescriptionColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void SetTaskDescriptionNull() {
+                this[this.tableGetTaskList.TaskDescriptionColumn] = global::System.Convert.DBNull;
             }
         }
         
@@ -2731,22 +2731,22 @@ namespace eDosStation {
         ///Row event argument class
         ///</summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        public class GetTaskListRowChangeEvent : global::System.EventArgs {
+        public class GetTaskInfoRowChangeEvent : global::System.EventArgs {
             
-            private GetTaskListRow eventRow;
+            private GetTaskInfoRow eventRow;
             
             private global::System.Data.DataRowAction eventAction;
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public GetTaskListRowChangeEvent(GetTaskListRow row, global::System.Data.DataRowAction action) {
+            public GetTaskInfoRowChangeEvent(GetTaskInfoRow row, global::System.Data.DataRowAction action) {
                 this.eventRow = row;
                 this.eventAction = action;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public GetTaskListRow Row {
+            public GetTaskInfoRow Row {
                 get {
                     return this.eventRow;
                 }
@@ -2765,22 +2765,22 @@ namespace eDosStation {
         ///Row event argument class
         ///</summary>
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        public class GetTaskInfoRowChangeEvent : global::System.EventArgs {
+        public class GetTaskListRowChangeEvent : global::System.EventArgs {
             
-            private GetTaskInfoRow eventRow;
+            private GetTaskListRow eventRow;
             
             private global::System.Data.DataRowAction eventAction;
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public GetTaskInfoRowChangeEvent(GetTaskInfoRow row, global::System.Data.DataRowAction action) {
+            public GetTaskListRowChangeEvent(GetTaskListRow row, global::System.Data.DataRowAction action) {
                 this.eventRow = row;
                 this.eventAction = action;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public GetTaskInfoRow Row {
+            public GetTaskListRow Row {
                 get {
                     return this.eventRow;
                 }
@@ -2833,179 +2833,6 @@ namespace eDosStation {
 namespace eDosStation.DataSet1TableAdapters {
     
     
-    /// <summary>
-    ///Represents the connection and commands used to retrieve and save data.
-    ///</summary>
-    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
-    [global::System.ComponentModel.ToolboxItem(true)]
-    [global::System.ComponentModel.DataObjectAttribute(true)]
-    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
-        ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
-    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-    public partial class GetTaskListTableAdapter : global::System.ComponentModel.Component {
-        
-        private global::System.Data.SqlClient.SqlDataAdapter _adapter;
-        
-        private global::System.Data.SqlClient.SqlConnection _connection;
-        
-        private global::System.Data.SqlClient.SqlTransaction _transaction;
-        
-        private global::System.Data.SqlClient.SqlCommand[] _commandCollection;
-        
-        private bool _clearBeforeFill;
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        public GetTaskListTableAdapter() {
-            this.ClearBeforeFill = true;
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter {
-            get {
-                if ((this._adapter == null)) {
-                    this.InitAdapter();
-                }
-                return this._adapter;
-            }
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        internal global::System.Data.SqlClient.SqlConnection Connection {
-            get {
-                if ((this._connection == null)) {
-                    this.InitConnection();
-                }
-                return this._connection;
-            }
-            set {
-                this._connection = value;
-                if ((this.Adapter.InsertCommand != null)) {
-                    this.Adapter.InsertCommand.Connection = value;
-                }
-                if ((this.Adapter.DeleteCommand != null)) {
-                    this.Adapter.DeleteCommand.Connection = value;
-                }
-                if ((this.Adapter.UpdateCommand != null)) {
-                    this.Adapter.UpdateCommand.Connection = value;
-                }
-                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
-                    if ((this.CommandCollection[i] != null)) {
-                        ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value;
-                    }
-                }
-            }
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        internal global::System.Data.SqlClient.SqlTransaction Transaction {
-            get {
-                return this._transaction;
-            }
-            set {
-                this._transaction = value;
-                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
-                    this.CommandCollection[i].Transaction = this._transaction;
-                }
-                if (((this.Adapter != null) 
-                            && (this.Adapter.DeleteCommand != null))) {
-                    this.Adapter.DeleteCommand.Transaction = this._transaction;
-                }
-                if (((this.Adapter != null) 
-                            && (this.Adapter.InsertCommand != null))) {
-                    this.Adapter.InsertCommand.Transaction = this._transaction;
-                }
-                if (((this.Adapter != null) 
-                            && (this.Adapter.UpdateCommand != null))) {
-                    this.Adapter.UpdateCommand.Transaction = this._transaction;
-                }
-            }
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        protected global::System.Data.SqlClient.SqlCommand[] CommandCollection {
-            get {
-                if ((this._commandCollection == null)) {
-                    this.InitCommandCollection();
-                }
-                return this._commandCollection;
-            }
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        public bool ClearBeforeFill {
-            get {
-                return this._clearBeforeFill;
-            }
-            set {
-                this._clearBeforeFill = value;
-            }
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        private void InitAdapter() {
-            this._adapter = new global::System.Data.SqlClient.SqlDataAdapter();
-            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
-            tableMapping.SourceTable = "Table";
-            tableMapping.DataSetTable = "GetTaskList";
-            tableMapping.ColumnMappings.Add("ID_Task", "ID_Task");
-            tableMapping.ColumnMappings.Add("Task_Name", "Task_Name");
-            tableMapping.ColumnMappings.Add("TaskDescription", "TaskDescription");
-            tableMapping.ColumnMappings.Add("EPDRad", "EPDRad");
-            tableMapping.ColumnMappings.Add("Inst_CODE", "Inst_CODE");
-            tableMapping.ColumnMappings.Add("TaskType_CODE", "TaskType_CODE");
-            this._adapter.TableMappings.Add(tableMapping);
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        private void InitConnection() {
-            this._connection = new global::System.Data.SqlClient.SqlConnection();
-            this._connection.ConnectionString = global::eDosStation.Properties.Settings.Default.RemoteSQL;
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        private void InitCommandCollection() {
-            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
-            this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
-            this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = "dbo.GetTaskList";
-            this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure;
-            this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
-        public virtual int Fill(DataSet1.GetTaskListDataTable dataTable) {
-            this.Adapter.SelectCommand = this.CommandCollection[0];
-            if ((this.ClearBeforeFill == true)) {
-                dataTable.Clear();
-            }
-            int returnValue = this.Adapter.Fill(dataTable);
-            return returnValue;
-        }
-        
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
-        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
-        public virtual DataSet1.GetTaskListDataTable GetData() {
-            this.Adapter.SelectCommand = this.CommandCollection[0];
-            DataSet1.GetTaskListDataTable dataTable = new DataSet1.GetTaskListDataTable();
-            this.Adapter.Fill(dataTable);
-            return dataTable;
-        }
-    }
-    
     /// <summary>
     ///Represents the connection and commands used to retrieve and save data.
     ///</summary>
@@ -3128,6 +2955,8 @@ namespace eDosStation.DataSet1TableAdapters {
             tableMapping.SourceTable = "Table";
             tableMapping.DataSetTable = "GetTaskInfo";
             tableMapping.ColumnMappings.Add("ID_Task", "ID_Task");
+            tableMapping.ColumnMappings.Add("Inst_CODE", "Inst_CODE");
+            tableMapping.ColumnMappings.Add("TaskType_CODE", "TaskType_CODE");
             tableMapping.ColumnMappings.Add("Task_Name", "Task_Name");
             tableMapping.ColumnMappings.Add("TaskDescription", "TaskDescription");
             tableMapping.ColumnMappings.Add("EPDRad", "EPDRad");
@@ -3148,11 +2977,9 @@ namespace eDosStation.DataSet1TableAdapters {
             tableMapping.ColumnMappings.Add("FNGain_ANGainValue", "FNGain_ANGainValue");
             tableMapping.ColumnMappings.Add("InstallationActivity", "InstallationActivity");
             tableMapping.ColumnMappings.Add("Description", "Description");
-            tableMapping.ColumnMappings.Add("Inst_CODE", "Inst_CODE");
+            tableMapping.ColumnMappings.Add("Inst_CODE1", "Inst_CODE1");
             tableMapping.ColumnMappings.Add("MinWorkerDosisMargin", "MinWorkerDosisMargin");
             tableMapping.ColumnMappings.Add("MarginExceeded", "MarginExceeded");
-            tableMapping.ColumnMappings.Add("TaskType_CODE", "TaskType_CODE");
-            tableMapping.ColumnMappings.Add("Inst_CODE1", "Inst_CODE1");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
@@ -3160,7 +2987,7 @@ namespace eDosStation.DataSet1TableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.SqlClient.SqlConnection();
-            this._connection.ConnectionString = global::eDosStation.Properties.Settings.Default.RemoteSQL;
+            this._connection.ConnectionString = global::eDosStation.Properties.Settings.Default.eDosConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3225,6 +3052,179 @@ namespace eDosStation.DataSet1TableAdapters {
         }
     }
     
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class GetTaskListTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.SqlClient.SqlDataAdapter _adapter;
+        
+        private global::System.Data.SqlClient.SqlConnection _connection;
+        
+        private global::System.Data.SqlClient.SqlTransaction _transaction;
+        
+        private global::System.Data.SqlClient.SqlCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        public GetTaskListTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        internal global::System.Data.SqlClient.SqlConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        internal global::System.Data.SqlClient.SqlTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        protected global::System.Data.SqlClient.SqlCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.SqlClient.SqlDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "GetTaskList";
+            tableMapping.ColumnMappings.Add("ID_Task", "ID_Task");
+            tableMapping.ColumnMappings.Add("Inst_CODE", "Inst_CODE");
+            tableMapping.ColumnMappings.Add("TaskType_CODE", "TaskType_CODE");
+            tableMapping.ColumnMappings.Add("Task_Name", "Task_Name");
+            tableMapping.ColumnMappings.Add("TaskDescription", "TaskDescription");
+            tableMapping.ColumnMappings.Add("EPDRad", "EPDRad");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        private void InitConnection() {
+            this._connection = new global::System.Data.SqlClient.SqlConnection();
+            this._connection.ConnectionString = global::eDosStation.Properties.Settings.Default.eDosConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
+            this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "dbo.GetTaskList";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure;
+            this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
+        public virtual int Fill(DataSet1.GetTaskListDataTable dataTable) {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            if ((this.ClearBeforeFill == true)) {
+                dataTable.Clear();
+            }
+            int returnValue = this.Adapter.Fill(dataTable);
+            return returnValue;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual DataSet1.GetTaskListDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            DataSet1.GetTaskListDataTable dataTable = new DataSet1.GetTaskListDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
     /// <summary>
     ///Represents the connection and commands used to retrieve and save data.
     ///</summary>
@@ -3360,7 +3360,7 @@ namespace eDosStation.DataSet1TableAdapters {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
         private void InitConnection() {
             this._connection = new global::System.Data.SqlClient.SqlConnection();
-            this._connection.ConnectionString = global::eDosStation.Properties.Settings.Default.RemoteSQL;
+            this._connection.ConnectionString = global::eDosStation.Properties.Settings.Default.eDosConnectionString;
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
diff --git a/eDosStation/DataSet1.cs b/eDosStation/DataSet1.cs
deleted file mode 100644
index a2f310b..0000000
--- a/eDosStation/DataSet1.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace eDosStation
-{
-
-
-    partial class DataSet1
-    {
-        partial class GetTaskListDataTable
-        {
-        }
-    }
-}
diff --git a/eDosStation/DataSet1.xsd b/eDosStation/DataSet1.xsd
index 4419845..c588db9 100644
--- a/eDosStation/DataSet1.xsd
+++ b/eDosStation/DataSet1.xsd
@@ -4,35 +4,12 @@
     <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
       <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
         <Connections>
-          <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="RemoteSQL" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="RemoteSQL (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.eDosStation.Properties.Settings.GlobalReference.Default.RemoteSQL" Provider="System.Data.SqlClient" />
+          <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="eDosConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="eDosConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.eDosStation.Properties.Settings.GlobalReference.Default.eDosConnectionString" Provider="System.Data.SqlClient" />
         </Connections>
         <Tables>
-          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="GetTaskListTableAdapter" GeneratorDataComponentClassName="GetTaskListTableAdapter" Name="GetTaskList" UserDataComponentName="GetTaskListTableAdapter">
-            <MainSource>
-              <DbSource ConnectionRef="RemoteSQL (Settings)" DbObjectName="HPH_REMS_new.dbo.GetTaskList" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
-                <SelectCommand>
-                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
-                    <CommandText>dbo.GetTaskList</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
-                    </Parameters>
-                  </DbCommand>
-                </SelectCommand>
-              </DbSource>
-            </MainSource>
-            <Mappings>
-              <Mapping SourceColumn="ID_Task" DataSetColumn="ID_Task" />
-              <Mapping SourceColumn="Task_Name" DataSetColumn="Task_Name" />
-              <Mapping SourceColumn="TaskDescription" DataSetColumn="TaskDescription" />
-              <Mapping SourceColumn="EPDRad" DataSetColumn="EPDRad" />
-              <Mapping SourceColumn="Inst_CODE" DataSetColumn="Inst_CODE" />
-              <Mapping SourceColumn="TaskType_CODE" DataSetColumn="TaskType_CODE" />
-            </Mappings>
-            <Sources />
-          </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="GetTaskInfoTableAdapter" GeneratorDataComponentClassName="GetTaskInfoTableAdapter" Name="GetTaskInfo" UserDataComponentName="GetTaskInfoTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="RemoteSQL (Settings)" DbObjectName="HPH_REMS_new.dbo.GetTaskInfo" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="eDosConnectionString (Settings)" DbObjectName="eDos.dbo.GetTaskInfo" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.GetTaskInfo</CommandText>
@@ -47,6 +24,8 @@
             </MainSource>
             <Mappings>
               <Mapping SourceColumn="ID_Task" DataSetColumn="ID_Task" />
+              <Mapping SourceColumn="Inst_CODE" DataSetColumn="Inst_CODE" />
+              <Mapping SourceColumn="TaskType_CODE" DataSetColumn="TaskType_CODE" />
               <Mapping SourceColumn="Task_Name" DataSetColumn="Task_Name" />
               <Mapping SourceColumn="TaskDescription" DataSetColumn="TaskDescription" />
               <Mapping SourceColumn="EPDRad" DataSetColumn="EPDRad" />
@@ -67,17 +46,38 @@
               <Mapping SourceColumn="FNGain_ANGainValue" DataSetColumn="FNGain_ANGainValue" />
               <Mapping SourceColumn="InstallationActivity" DataSetColumn="InstallationActivity" />
               <Mapping SourceColumn="Description" DataSetColumn="Description" />
-              <Mapping SourceColumn="Inst_CODE" DataSetColumn="Inst_CODE" />
+              <Mapping SourceColumn="Inst_CODE1" DataSetColumn="Inst_CODE1" />
               <Mapping SourceColumn="MinWorkerDosisMargin" DataSetColumn="MinWorkerDosisMargin" />
               <Mapping SourceColumn="MarginExceeded" DataSetColumn="MarginExceeded" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="GetTaskListTableAdapter" GeneratorDataComponentClassName="GetTaskListTableAdapter" Name="GetTaskList" UserDataComponentName="GetTaskListTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="eDosConnectionString (Settings)" DbObjectName="eDos.dbo.GetTaskList" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
+                <SelectCommand>
+                  <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
+                    <CommandText>dbo.GetTaskList</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="ID_Task" DataSetColumn="ID_Task" />
+              <Mapping SourceColumn="Inst_CODE" DataSetColumn="Inst_CODE" />
               <Mapping SourceColumn="TaskType_CODE" DataSetColumn="TaskType_CODE" />
-              <Mapping SourceColumn="Inst_CODE1" DataSetColumn="Inst_CODE1" />
+              <Mapping SourceColumn="Task_Name" DataSetColumn="Task_Name" />
+              <Mapping SourceColumn="TaskDescription" DataSetColumn="TaskDescription" />
+              <Mapping SourceColumn="EPDRad" DataSetColumn="EPDRad" />
             </Mappings>
             <Sources />
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="CommentOnEventTableAdapter" GeneratorDataComponentClassName="CommentOnEventTableAdapter" Name="CommentOnEvent" UserDataComponentName="CommentOnEventTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="RemoteSQL (Settings)" DbObjectName="HPH_REMS_new.dbo.CommentOnEventSelect" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="eDosConnectionString (Settings)" DbObjectName="eDos.dbo.CommentOnEventSelect" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
                   <DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
                     <CommandText>dbo.CommentOnEventSelect</CommandText>
@@ -107,40 +107,12 @@
   <xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="GetTaskList" msprop:Generator_TableClassName="GetTaskListDataTable" msprop:Generator_TableVarName="tableGetTaskList" msprop:Generator_RowChangedName="GetTaskListRowChanged" msprop:Generator_TablePropName="GetTaskList" msprop:Generator_RowDeletingName="GetTaskListRowDeleting" msprop:Generator_RowChangingName="GetTaskListRowChanging" msprop:Generator_RowEvHandlerName="GetTaskListRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskListRowDeleted" msprop:Generator_RowClassName="GetTaskListRow" msprop:Generator_UserTableName="GetTaskList" msprop:Generator_RowEvArgName="GetTaskListRowChangeEvent">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="ID_Task" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_Task" msprop:Generator_ColumnPropNameInRow="ID_Task" msprop:Generator_ColumnPropNameInTable="ID_TaskColumn" msprop:Generator_UserColumnName="ID_Task" type="xs:int" />
-              <xs:element name="Task_Name" msprop:Generator_ColumnVarNameInTable="columnTask_Name" msprop:Generator_ColumnPropNameInRow="Task_Name" msprop:Generator_ColumnPropNameInTable="Task_NameColumn" msprop:Generator_UserColumnName="Task_Name" minOccurs="0">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="2147483647" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="TaskDescription" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnTaskDescription" msprop:Generator_ColumnPropNameInRow="TaskDescription" msprop:Generator_ColumnPropNameInTable="TaskDescriptionColumn" msprop:Generator_UserColumnName="TaskDescription" minOccurs="0">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="50" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="EPDRad" msprop:Generator_ColumnVarNameInTable="columnEPDRad" msprop:Generator_ColumnPropNameInRow="EPDRad" msprop:Generator_ColumnPropNameInTable="EPDRadColumn" msprop:Generator_UserColumnName="EPDRad">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="2" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="Inst_CODE" msprop:Generator_ColumnVarNameInTable="columnInst_CODE" msprop:Generator_ColumnPropNameInRow="Inst_CODE" msprop:Generator_ColumnPropNameInTable="Inst_CODEColumn" msprop:Generator_UserColumnName="Inst_CODE" type="xs:int" minOccurs="0" />
-              <xs:element name="TaskType_CODE" msprop:Generator_ColumnVarNameInTable="columnTaskType_CODE" msprop:Generator_ColumnPropNameInRow="TaskType_CODE" msprop:Generator_ColumnPropNameInTable="TaskType_CODEColumn" msprop:Generator_UserColumnName="TaskType_CODE" type="xs:int" minOccurs="0" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
         <xs:element name="GetTaskInfo" msprop:Generator_TableClassName="GetTaskInfoDataTable" msprop:Generator_TableVarName="tableGetTaskInfo" msprop:Generator_TablePropName="GetTaskInfo" msprop:Generator_RowDeletingName="GetTaskInfoRowDeleting" msprop:Generator_RowChangingName="GetTaskInfoRowChanging" msprop:Generator_RowEvHandlerName="GetTaskInfoRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskInfoRowDeleted" msprop:Generator_UserTableName="GetTaskInfo" msprop:Generator_RowChangedName="GetTaskInfoRowChanged" msprop:Generator_RowEvArgName="GetTaskInfoRowChangeEvent" msprop:Generator_RowClassName="GetTaskInfoRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ID_Task" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_Task" msprop:Generator_ColumnPropNameInRow="ID_Task" msprop:Generator_ColumnPropNameInTable="ID_TaskColumn" msprop:Generator_UserColumnName="ID_Task" type="xs:int" />
+              <xs:element name="Inst_CODE" msprop:Generator_ColumnVarNameInTable="columnInst_CODE" msprop:Generator_ColumnPropNameInRow="Inst_CODE" msprop:Generator_ColumnPropNameInTable="Inst_CODEColumn" msprop:Generator_UserColumnName="Inst_CODE" type="xs:int" minOccurs="0" />
+              <xs:element name="TaskType_CODE" msprop:Generator_ColumnVarNameInTable="columnTaskType_CODE" msprop:Generator_ColumnPropNameInRow="TaskType_CODE" msprop:Generator_ColumnPropNameInTable="TaskType_CODEColumn" msprop:Generator_UserColumnName="TaskType_CODE" type="xs:int" minOccurs="0" />
               <xs:element name="Task_Name" msprop:Generator_ColumnVarNameInTable="columnTask_Name" msprop:Generator_ColumnPropNameInRow="Task_Name" msprop:Generator_ColumnPropNameInTable="Task_NameColumn" msprop:Generator_UserColumnName="Task_Name" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
@@ -191,15 +163,43 @@
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Inst_CODE" msprop:Generator_ColumnVarNameInTable="columnInst_CODE" msprop:Generator_ColumnPropNameInRow="Inst_CODE" msprop:Generator_ColumnPropNameInTable="Inst_CODEColumn" msprop:Generator_UserColumnName="Inst_CODE" type="xs:int" minOccurs="0" />
+              <xs:element name="Inst_CODE1" msprop:Generator_ColumnVarNameInTable="columnInst_CODE1" msprop:Generator_ColumnPropNameInRow="Inst_CODE1" msprop:Generator_ColumnPropNameInTable="Inst_CODE1Column" msprop:Generator_UserColumnName="Inst_CODE1" type="xs:int" minOccurs="0" />
               <xs:element name="MinWorkerDosisMargin" msprop:Generator_ColumnVarNameInTable="columnMinWorkerDosisMargin" msprop:Generator_ColumnPropNameInRow="MinWorkerDosisMargin" msprop:Generator_ColumnPropNameInTable="MinWorkerDosisMarginColumn" msprop:Generator_UserColumnName="MinWorkerDosisMargin" type="xs:double" minOccurs="0" />
               <xs:element name="MarginExceeded" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnMarginExceeded" msprop:Generator_ColumnPropNameInRow="MarginExceeded" msprop:Generator_ColumnPropNameInTable="MarginExceededColumn" msprop:Generator_UserColumnName="MarginExceeded" type="xs:boolean" minOccurs="0" />
-              <xs:element name="TaskType_CODE" msprop:Generator_ColumnVarNameInTable="columnTaskType_CODE" msprop:Generator_ColumnPropNameInRow="TaskType_CODE" msprop:Generator_ColumnPropNameInTable="TaskType_CODEColumn" msprop:Generator_UserColumnName="TaskType_CODE" type="xs:int" minOccurs="0" />
-              <xs:element name="Inst_CODE1" msprop:Generator_ColumnVarNameInTable="columnInst_CODE1" msprop:Generator_ColumnPropNameInRow="Inst_CODE1" msprop:Generator_ColumnPropNameInTable="Inst_CODE1Column" msprop:Generator_UserColumnName="Inst_CODE1" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="CommentOnEvent" msprop:Generator_TableClassName="CommentOnEventDataTable" msprop:Generator_TableVarName="tableCommentOnEvent" msprop:Generator_RowChangedName="CommentOnEventRowChanged" msprop:Generator_TablePropName="CommentOnEvent" msprop:Generator_RowDeletingName="CommentOnEventRowDeleting" msprop:Generator_RowChangingName="CommentOnEventRowChanging" msprop:Generator_RowEvHandlerName="CommentOnEventRowChangeEventHandler" msprop:Generator_RowDeletedName="CommentOnEventRowDeleted" msprop:Generator_RowClassName="CommentOnEventRow" msprop:Generator_UserTableName="CommentOnEvent" msprop:Generator_RowEvArgName="CommentOnEventRowChangeEvent">
+        <xs:element name="GetTaskList" msprop:Generator_TableClassName="GetTaskListDataTable" msprop:Generator_TableVarName="tableGetTaskList" msprop:Generator_TablePropName="GetTaskList" msprop:Generator_RowDeletingName="GetTaskListRowDeleting" msprop:Generator_RowChangingName="GetTaskListRowChanging" msprop:Generator_RowEvHandlerName="GetTaskListRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskListRowDeleted" msprop:Generator_UserTableName="GetTaskList" msprop:Generator_RowChangedName="GetTaskListRowChanged" msprop:Generator_RowEvArgName="GetTaskListRowChangeEvent" msprop:Generator_RowClassName="GetTaskListRow">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID_Task" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_Task" msprop:Generator_ColumnPropNameInRow="ID_Task" msprop:Generator_ColumnPropNameInTable="ID_TaskColumn" msprop:Generator_UserColumnName="ID_Task" type="xs:int" />
+              <xs:element name="Inst_CODE" msprop:Generator_ColumnVarNameInTable="columnInst_CODE" msprop:Generator_ColumnPropNameInRow="Inst_CODE" msprop:Generator_ColumnPropNameInTable="Inst_CODEColumn" msprop:Generator_UserColumnName="Inst_CODE" type="xs:int" minOccurs="0" />
+              <xs:element name="TaskType_CODE" msprop:Generator_ColumnVarNameInTable="columnTaskType_CODE" msprop:Generator_ColumnPropNameInRow="TaskType_CODE" msprop:Generator_ColumnPropNameInTable="TaskType_CODEColumn" msprop:Generator_UserColumnName="TaskType_CODE" type="xs:int" minOccurs="0" />
+              <xs:element name="Task_Name" msprop:Generator_ColumnVarNameInTable="columnTask_Name" msprop:Generator_ColumnPropNameInRow="Task_Name" msprop:Generator_ColumnPropNameInTable="Task_NameColumn" msprop:Generator_UserColumnName="Task_Name" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="TaskDescription" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnTaskDescription" msprop:Generator_ColumnPropNameInRow="TaskDescription" msprop:Generator_ColumnPropNameInTable="TaskDescriptionColumn" msprop:Generator_UserColumnName="TaskDescription" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="EPDRad" msprop:Generator_ColumnVarNameInTable="columnEPDRad" msprop:Generator_ColumnPropNameInRow="EPDRad" msprop:Generator_ColumnPropNameInTable="EPDRadColumn" msprop:Generator_UserColumnName="EPDRad">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="CommentOnEvent" msprop:Generator_TableClassName="CommentOnEventDataTable" msprop:Generator_TableVarName="tableCommentOnEvent" msprop:Generator_TablePropName="CommentOnEvent" msprop:Generator_RowDeletingName="CommentOnEventRowDeleting" msprop:Generator_RowChangingName="CommentOnEventRowChanging" msprop:Generator_RowEvHandlerName="CommentOnEventRowChangeEventHandler" msprop:Generator_RowDeletedName="CommentOnEventRowDeleted" msprop:Generator_UserTableName="CommentOnEvent" msprop:Generator_RowChangedName="CommentOnEventRowChanged" msprop:Generator_RowEvArgName="CommentOnEventRowChangeEvent" msprop:Generator_RowClassName="CommentOnEventRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ID_CommnentOnEvent" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_CommnentOnEvent" msprop:Generator_ColumnPropNameInRow="ID_CommnentOnEvent" msprop:Generator_ColumnPropNameInTable="ID_CommnentOnEventColumn" msprop:Generator_UserColumnName="ID_CommnentOnEvent" type="xs:int" />
@@ -245,11 +245,11 @@
       </xs:choice>
     </xs:complexType>
     <xs:unique name="Constraint1" msdata:PrimaryKey="true">
-      <xs:selector xpath=".//mstns:GetTaskList" />
+      <xs:selector xpath=".//mstns:GetTaskInfo" />
       <xs:field xpath="mstns:ID_Task" />
     </xs:unique>
-    <xs:unique name="GetTaskInfo_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
-      <xs:selector xpath=".//mstns:GetTaskInfo" />
+    <xs:unique name="GetTaskList_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:GetTaskList" />
       <xs:field xpath="mstns:ID_Task" />
     </xs:unique>
     <xs:unique name="CommentOnEvent_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
diff --git a/eDosStation/DataSet1.xss b/eDosStation/DataSet1.xss
index 370619c..5fc86b8 100644
--- a/eDosStation/DataSet1.xss
+++ b/eDosStation/DataSet1.xss
@@ -4,11 +4,11 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="18" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:GetTaskList" ZOrder="3" X="70" Y="70" Height="191" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:GetTaskInfo" ZOrder="2" X="441" Y="77" Height="305" Width="270" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:CommentOnEvent" ZOrder="1" X="57" Y="304" Height="210" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:GetTaskInfo" ZOrder="3" X="784" Y="129" Height="305" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:GetTaskList" ZOrder="2" X="407" Y="240" Height="191" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:CommentOnEvent" ZOrder="1" X="630" Y="497" Height="210" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
   </Shapes>
   <Connectors />
 </DiagramLayout>
\ No newline at end of file
diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 657a506..a630399 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -131,7 +131,7 @@ namespace eDosStation
             {
                 bool isBG = (ep.epdType != 3);  //3 = zwarte  0=grijs
                 int? StationVisitID = null;
-                using (var co = new System.Data.SqlClient.SqlConnection(Properties.Settings.Default.RemoteSQL))
+                using (var co = new System.Data.SqlClient.SqlConnection(Properties.Settings.Default.eDosConnectionString))
                 {
                     using (var cmd1 = new SqlCommand("VisitInit", co))
                     {
diff --git a/eDosStation/EpdExit.xaml.cs b/eDosStation/EpdExit.xaml.cs
index 10a0b12..cf236b5 100644
--- a/eDosStation/EpdExit.xaml.cs
+++ b/eDosStation/EpdExit.xaml.cs
@@ -120,7 +120,7 @@ namespace eDosStation
                 var l = new SqlLog();
                 try
                 {
-                    using (var co = new System.Data.SqlClient.SqlConnection(Properties.Settings.Default.RemoteSQL))
+                    using (var co = new System.Data.SqlClient.SqlConnection(Properties.Settings.Default.eDosConnectionString))
                     {
                         using (var cmd1 = new SqlCommand("VisitExit", co))
                         {
diff --git a/eDosStation/MainWindow.xaml b/eDosStation/MainWindow.xaml
index bfd99a5..6c65778 100644
--- a/eDosStation/MainWindow.xaml
+++ b/eDosStation/MainWindow.xaml
@@ -10,10 +10,9 @@
     <DockPanel>
         <Menu DockPanel.Dock="Top">
             <MenuItem Header="Settings" Click="MenuItem_Click" >
-
-
             </MenuItem>
-
+            <MenuItem Header="Enc" Name="mEnc" Click="MEnc_Click" >
+            </MenuItem>
         </Menu>
         <StatusBar DockPanel.Dock="Bottom" >
             <StatusBarItem Name="Status"  Content="Offline"/>
diff --git a/eDosStation/MainWindow.xaml.cs b/eDosStation/MainWindow.xaml.cs
index 47cd9fe..d119096 100644
--- a/eDosStation/MainWindow.xaml.cs
+++ b/eDosStation/MainWindow.xaml.cs
@@ -20,7 +20,7 @@ namespace eDosStation
     /// </summary>
     public partial class MainWindow : Window
     {
-        public Station thisStation = new Station("");
+        public Station thisStation ;
         public EpdBaseClr.Epd2 ep=null;
 
         public MainWindow()
@@ -56,54 +56,73 @@ namespace eDosStation
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            bool ok = true;
-            try
+            var cb = new System.Data.SqlClient.SqlConnectionStringBuilder(Properties.Settings.Default.eDosConnectionString);
+            if (string.IsNullOrEmpty(cb.Password))
             {
-                thisStation = new Station(string.Empty);
-            } catch (System.Exception ex)
-            {
-                MessageBox.Show($"Startup error {ex.Message} ");
-                ok = false;
+                var f = new AskPwd();
+                f.ShowDialog();
+                string pwd = f.ResponseText;
+                string cfg = System.IO.Path.Combine(Environment.CurrentDirectory, System.AppDomain.CurrentDomain.FriendlyName);
+                Config.ToggleConfigEncryption(cfg, pwd);
+                Close();
             }
-            if (ok && thisStation.Error>0)
+            else
             {
-                MessageBox.Show($"Startup error {thisStation.ErrorMessage} ");
-                ok = false;
-            }
-
-            if (ok) try {
-                    //var sp = new System.IO.Ports.SerialPort($"com{thisStation.ComPort}");
-                    //sp.BaudRate = 9600;
-                    //sp.Parity = System.IO.Ports.Parity.None;
-                    //sp.StopBits = System.IO.Ports.StopBits.One;
-                    //sp.Open();
-                    //sp.DiscardInBuffer();
-                    //sp.Close();
-
-
-                    ep = new EpdBaseClr.Epd2(thisStation.ComPort);
-                    
+                bool ok = true;
+                try
+                {
+                    thisStation = new Station(string.Empty);
                 }
                 catch (System.Exception ex)
                 {
-                    MessageBox.Show($"Edp software error {ex.Message}");
+                    MessageBox.Show($"Startup error {ex.Message} ");
                     ok = false;
                 }
-            if (ok)
-            {
-                
-
-                if (thisStation.insComments.Length > 2)
+                if (ok && thisStation.Error > 0)
                 {
-                    InstMessage w = new InstMessage(thisStation.tbComments);
-                    w.ShowDialog();
-                    ibComment.Child = thisStation.tbComments;
-                    //itComment = thisStation.tbComments;
-                    ibComment.Visibility = Visibility.Visible;
+                    MessageBox.Show($"Startup error {thisStation.ErrorMessage} ");
+                    ok = false;
+                }
+
+                if (ok) try
+                    {
+                        //var sp = new System.IO.Ports.SerialPort($"com{thisStation.ComPort}");
+                        //sp.BaudRate = 9600;
+                        //sp.Parity = System.IO.Ports.Parity.None;
+                        //sp.StopBits = System.IO.Ports.StopBits.One;
+                        //sp.Open();
+                        //sp.DiscardInBuffer();
+                        //sp.Close();
+
+
+                        ep = new EpdBaseClr.Epd2(thisStation.ComPort);
+
+                    }
+                    catch (System.Exception ex)
+                    {
+                        MessageBox.Show($"Edp software error {ex.Message}");
+                        ok = false;
+                    }
+                if (ok)
+                {
+                    if (thisStation.insComments.Length > 2)
+                    {
+                        InstMessage w = new InstMessage(thisStation.tbComments);
+                        w.ShowDialog();
+                        ibComment.Child = thisStation.tbComments;
+                        //itComment = thisStation.tbComments;
+                        ibComment.Visibility = Visibility.Visible;
+                    }
+                    else
+                        ibComment.Visibility = Visibility.Hidden;
                 }
-                else
-                    ibComment.Visibility = Visibility.Hidden;
             }
         }
+
+        private void MEnc_Click(object sender, RoutedEventArgs e)
+        {
+            //string cfg = System.IO.Path.Combine(Environment.CurrentDirectory, System.AppDomain.CurrentDomain.FriendlyName );
+            //Config.ToggleConfigEncryption(cfg);
+        }
     }
 }
diff --git a/eDosStation/Properties/Settings.Designer.cs b/eDosStation/Properties/Settings.Designer.cs
index e4fe948..92f1b97 100644
--- a/eDosStation/Properties/Settings.Designer.cs
+++ b/eDosStation/Properties/Settings.Designer.cs
@@ -35,17 +35,6 @@ namespace eDosStation.Properties {
             }
         }
         
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
-        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=tcp:10.2.12.200\\sag,54037;Initial Catalog=eDos;Integrated Security=Tr" +
-            "ue")]
-        public string RemoteSQL {
-            get {
-                return ((string)(this["RemoteSQL"]));
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("1")]
@@ -117,5 +106,25 @@ namespace eDosStation.Properties {
                 this["useTestButtons"] = value;
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=scksrv23;Initial Catalog=master;Integrated Security=True")]
+        public string masterConnectionString {
+            get {
+                return ((string)(this["masterConnectionString"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=tcp:10.2.12.200\\hph,54037;Initial Catalog=eDos;User ID=eDosStation")]
+        public string eDosConnectionString {
+            get {
+                return ((string)(this["eDosConnectionString"]));
+            }
+        }
     }
 }
diff --git a/eDosStation/Properties/Settings.settings b/eDosStation/Properties/Settings.settings
index 5e3c1b9..d899045 100644
--- a/eDosStation/Properties/Settings.settings
+++ b/eDosStation/Properties/Settings.settings
@@ -5,14 +5,6 @@
     <Setting Name="ComPort" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">3</Value>
     </Setting>
-    <Setting Name="RemoteSQL" Type="(Connection string)" Scope="Application">
-      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=tcp:10.2.12.200\sag,54037;Initial Catalog=eDos;Integrated Security=True&lt;/ConnectionString&gt;
-  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
-&lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=tcp:10.2.12.200\sag,54037;Initial Catalog=eDos;Integrated Security=True</Value>
-    </Setting>
     <Setting Name="Inst_CODE1" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">1</Value>
     </Setting>
@@ -31,5 +23,21 @@
     <Setting Name="useTestButtons" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="masterConnectionString" Type="(Connection string)" Scope="Application">
+      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+  &lt;ConnectionString&gt;Data Source=scksrv23;Initial Catalog=master;Integrated Security=True&lt;/ConnectionString&gt;
+  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+      <Value Profile="(Default)">Data Source=scksrv23;Initial Catalog=master;Integrated Security=True</Value>
+    </Setting>
+    <Setting Name="eDosConnectionString" Type="(Connection string)" Scope="Application">
+      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+  &lt;ConnectionString&gt;Data Source=tcp:10.2.12.200\hph,54037;Initial Catalog=eDos;User ID=eDosStation&lt;/ConnectionString&gt;
+  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+      <Value Profile="(Default)">Data Source=tcp:10.2.12.200\hph,54037;Initial Catalog=eDos;User ID=eDosStation</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/eDosStation/Settings.cs b/eDosStation/Settings.cs
new file mode 100644
index 0000000..fc37602
--- /dev/null
+++ b/eDosStation/Settings.cs
@@ -0,0 +1,28 @@
+namespace eDosStation.Properties {
+    
+    
+    // This class allows you to handle specific events on the settings class:
+    //  The SettingChanging event is raised before a setting's value is changed.
+    //  The PropertyChanged event is raised after a setting's value is changed.
+    //  The SettingsLoaded event is raised after the setting values are loaded.
+    //  The SettingsSaving event is raised before the setting values are saved.
+    internal sealed partial class Settings {
+        
+        public Settings() {
+            // // To add event handlers for saving and changing settings, uncomment the lines below:
+            //
+            // this.SettingChanging += this.SettingChangingEventHandler;
+            //
+            // this.SettingsSaving += this.SettingsSavingEventHandler;
+            //
+        }
+        
+        private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
+            // Add code to handle the SettingChangingEvent event here.
+        }
+        
+        private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
+            // Add code to handle the SettingsSaving event here.
+        }
+    }
+}
diff --git a/eDosStation/Station.cs b/eDosStation/Station.cs
index 052bb39..3e41847 100644
--- a/eDosStation/Station.cs
+++ b/eDosStation/Station.cs
@@ -41,7 +41,7 @@ namespace eDosStation
             tbComments.HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch;
             tbComments.TextAlignment = System.Windows.TextAlignment.Center;
 
-            using (var co = new SqlConnection(Properties.Settings.Default.RemoteSQL))
+            using (var co = new SqlConnection(Properties.Settings.Default.eDosConnectionString))
             {
                 co.Open();
                 using (var cmd = new SqlCommand("StationSettingsSelect", co))
@@ -118,7 +118,7 @@ namespace eDosStation
 
         public void Update()
         {
-            using (var co = new SqlConnection(Properties.Settings.Default.RemoteSQL))
+            using (var co = new SqlConnection(Properties.Settings.Default.eDosConnectionString))
             {
                 using (var cmd = new SqlCommand("StationSettingsUpdate", co))
                 {
diff --git a/eDosStation/User.cs b/eDosStation/User.cs
index b6337b3..7c695b1 100644
--- a/eDosStation/User.cs
+++ b/eDosStation/User.cs
@@ -29,7 +29,7 @@ namespace eDosStation
         {
             LastName = FirstName = conCode = Language = string.Empty;
             AccessAllow = null; ;
-            using (var co = new SqlConnection(Properties.Settings.Default.RemoteSQL))
+            using (var co = new SqlConnection(Properties.Settings.Default.eDosConnectionString))
             {
                 using (var cmd = new SqlCommand("GetPersonInfo", co))
                 {
diff --git a/eDosStation/eDosStation.csproj b/eDosStation/eDosStation.csproj
index 9763b52..3e9359f 100644
--- a/eDosStation/eDosStation.csproj
+++ b/eDosStation/eDosStation.csproj
@@ -83,6 +83,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -126,10 +127,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="Converters.cs" />
-    <Compile Include="DataSet1.cs">
-      <DependentUpon>DataSet1.xsd</DependentUpon>
+    <Compile Include="AskPwd.xaml.cs">
+      <DependentUpon>AskPwd.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Config.cs" />
+    <Compile Include="Converters.cs" />
     <Compile Include="DataSet1.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -145,6 +147,7 @@
     <Compile Include="InstMessage.xaml.cs">
       <DependentUpon>InstMessage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Settings.cs" />
     <Compile Include="Settings.xaml.cs">
       <DependentUpon>Settings.xaml</DependentUpon>
     </Compile>
@@ -155,6 +158,10 @@
     <Compile Include="Station.cs" />
     <Compile Include="TouchEnabledTextBox.cs" />
     <Compile Include="User.cs" />
+    <Page Include="AskPwd.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="eDosDict.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>