Changeset 956

Timestamp:

12/10/08 16:36:44 (16 years ago)

Author:

aleitner

Message:

Added new Form for Add Job or Add User - Tests with new interfaces in Server (#380)

Location:

trunk/sources/HeuristicLab.Hive.Server.Console

Files:

• AddNewForm.Designer.cs (added)
• AddNewForm.cs (added)
• AddNewForm.resx (added)
• HeuristicLab.Hive.Server.Console.csproj (modified) (2 diffs)
• HiveServerConsole.Designer.cs (modified) (3 diffs)
• HiveServerConsole.cs (modified) (3 diffs)
• HiveServerManagementConsole.Designer.cs (modified) (7 diffs)
• HiveServerManagementConsole.cs (modified) (4 diffs)
• HiveServerManagementConsole.resx (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Server.Console/HeuristicLab.Hive.Server.Console.csproj

@@ -72 +72 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AddNewForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="AddNewForm.Designer.cs">
+      <DependentUpon>AddNewForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="HiveServerConsole.cs">
       <SubType>Form</SubType>
@@ -90 +96 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="AddNewForm.resx">
+      <DependentUpon>AddNewForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="HiveServerConsole.resx">
       <DependentUpon>HiveServerConsole.cs</DependentUpon>

trunk/sources/HeuristicLab.Hive.Server.Console/HiveServerConsole.Designer.cs

@@ -54 +54 @@
       this.btnLogin = new System.Windows.Forms.Button();
       this.groupBox1 = new System.Windows.Forms.GroupBox();
+      this.tbUserName = new System.Windows.Forms.TextBox();
       this.lblPwd = new System.Windows.Forms.Label();
       this.lblUsername = new System.Windows.Forms.Label();
       this.tbPwd = new System.Windows.Forms.TextBox();
-      this.tbUserName = new System.Windows.Forms.TextBox();
       this.lblError = new System.Windows.Forms.Label();
       this.tbIp = new HeuristicLab.Hive.Server.Console.IPAddressTextBox();
@@ -151 +151 @@
       this.groupBox1.Text = "Manager";
       // 
+      // tbUserName
+      // 
+      this.tbUserName.Location = new System.Drawing.Point(77, 19);
+      this.tbUserName.Name = "tbUserName";
+      this.tbUserName.Size = new System.Drawing.Size(189, 20);
+      this.tbUserName.TabIndex = 4;
+      // 
       // lblPwd
       // 
@@ -175 +182 @@
       this.tbPwd.Size = new System.Drawing.Size(189, 20);
       this.tbPwd.TabIndex = 1;
-      // 
-      // tbUserName
-      // 
-      this.tbUserName.Location = new System.Drawing.Point(77, 19);
-      this.tbUserName.Name = "tbUserName";
-      this.tbUserName.Size = new System.Drawing.Size(189, 20);
-      this.tbUserName.TabIndex = 4;
+      this.tbPwd.UseSystemPasswordChar = true;
       // 
       // lblError

trunk/sources/HeuristicLab.Hive.Server.Console/HiveServerConsole.cs

@@ -31 +31 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts;
+using System.Security.Cryptography;
 
 namespace HeuristicLab.Hive.Server.Console {
@@ -40 +41 @@
     public HiveServerConsole() {
       InitializeComponent();
+      tbUserName.Text = "Anita";
+      tbPwd.Text = "Anita";
       tbIp.Text = "10.20.53.1";
       tbPort.Text = "9000";
@@ -103 +106 @@
       }
     }
+
+    string md5sum(byte[] FileOrText) { //Output: String<-> Input: Byte[]
+       return BitConverter.ToString(new
+          MD5CryptoServiceProvider().ComputeHash(FileOrText)).Replace("-", "").ToLower();
+    } 
+
   }
 }

trunk/sources/HeuristicLab.Hive.Server.Console/HiveServerManagementConsole.Designer.cs

@@ -32 +32 @@
       this.informationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.jobToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.jobToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+      this.groupToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+      this.userToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.userToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+      this.groupToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
       this.tcManagementConsole = new System.Windows.Forms.TabControl();
       this.tpClientControl = new System.Windows.Forms.TabPage();
@@ -45 +52 @@
       this.scUserControl = new System.Windows.Forms.SplitContainer();
       this.tvUserControl = new System.Windows.Forms.TreeView();
-      this.listView4 = new System.Windows.Forms.ListView();
+      this.lvUserControl = new System.Windows.Forms.ListView();
       this.treeView2 = new System.Windows.Forms.TreeView();
       this.listView2 = new System.Windows.Forms.ListView();
@@ -67 +74 @@
       // 
       this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.informationToolStripMenuItem});
+            this.informationToolStripMenuItem,
+            this.addToolStripMenuItem});
       this.menuStrip1.Location = new System.Drawing.Point(0, 0);
       this.menuStrip1.Name = "menuStrip1";
@@ -88 +96 @@
       this.closeToolStripMenuItem.Text = "Close";
       this.closeToolStripMenuItem.Click += new System.EventHandler(this.close_Click);
+      // 
+      // addToolStripMenuItem
+      // 
+      this.addToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.jobToolStripMenuItem,
+            this.userToolStripMenuItem});
+      this.addToolStripMenuItem.Name = "addToolStripMenuItem";
+      this.addToolStripMenuItem.Size = new System.Drawing.Size(38, 20);
+      this.addToolStripMenuItem.Text = "Add";
+      // 
+      // jobToolStripMenuItem
+      // 
+      this.jobToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.jobToolStripMenuItem1,
+            this.groupToolStripMenuItem1});
+      this.jobToolStripMenuItem.Name = "jobToolStripMenuItem";
+      this.jobToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+      this.jobToolStripMenuItem.Text = "Job";
+      // 
+      // jobToolStripMenuItem1
+      // 
+      this.jobToolStripMenuItem1.Name = "jobToolStripMenuItem1";
+      this.jobToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
+      this.jobToolStripMenuItem1.Text = "Job";
+      this.jobToolStripMenuItem1.Click += new System.EventHandler(this.jobToolStripMenuItem1_Click);
+      // 
+      // groupToolStripMenuItem1
+      // 
+      this.groupToolStripMenuItem1.Name = "groupToolStripMenuItem1";
+      this.groupToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
+      this.groupToolStripMenuItem1.Text = "Group";
+      // 
+      // userToolStripMenuItem
+      // 
+      this.userToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.userToolStripMenuItem1,
+            this.groupToolStripMenuItem2});
+      this.userToolStripMenuItem.Name = "userToolStripMenuItem";
+      this.userToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+      this.userToolStripMenuItem.Text = "User";
+      // 
+      // userToolStripMenuItem1
+      // 
+      this.userToolStripMenuItem1.Name = "userToolStripMenuItem1";
+      this.userToolStripMenuItem1.Size = new System.Drawing.Size(114, 22);
+      this.userToolStripMenuItem1.Text = "User";
+      // 
+      // groupToolStripMenuItem2
+      // 
+      this.groupToolStripMenuItem2.Name = "groupToolStripMenuItem2";
+      this.groupToolStripMenuItem2.Size = new System.Drawing.Size(114, 22);
+      this.groupToolStripMenuItem2.Text = "Group";
       // 
       // tcManagementConsole
@@ -227 +287 @@
       // scUserControl.Panel2
       // 
-      this.scUserControl.Panel2.Controls.Add(this.listView4);
+      this.scUserControl.Panel2.Controls.Add(this.lvUserControl);
       this.scUserControl.Size = new System.Drawing.Size(637, 346);
       this.scUserControl.SplitterDistance = 139;
@@ -240 +300 @@
       this.tvUserControl.TabIndex = 1;
       // 
-      // listView4
-      // 
-      this.listView4.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.listView4.Location = new System.Drawing.Point(0, 0);
-      this.listView4.Name = "listView4";
-      this.listView4.Size = new System.Drawing.Size(494, 346);
-      this.listView4.TabIndex = 1;
-      this.listView4.UseCompatibleStateImageBehavior = false;
+      // lvUserControl
+      // 
+      this.lvUserControl.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.lvUserControl.Location = new System.Drawing.Point(0, 0);
+      this.lvUserControl.Name = "lvUserControl";
+      this.lvUserControl.Size = new System.Drawing.Size(494, 346);
+      this.lvUserControl.TabIndex = 1;
+      this.lvUserControl.UseCompatibleStateImageBehavior = false;
       // 
       // treeView2
@@ -317 +377 @@
     private System.Windows.Forms.TreeView tvJobControl;
     private System.Windows.Forms.TreeView tvUserControl;
-    private System.Windows.Forms.ListView listView4;
+    private System.Windows.Forms.ListView lvUserControl;
     private System.Windows.Forms.ImageList imageList1;
+    private System.Windows.Forms.ToolStripMenuItem addToolStripMenuItem;
+    private System.Windows.Forms.ToolStripMenuItem jobToolStripMenuItem;
+    private System.Windows.Forms.ToolStripMenuItem userToolStripMenuItem;
+    private System.Windows.Forms.ToolStripMenuItem jobToolStripMenuItem1;
+    private System.Windows.Forms.ToolStripMenuItem groupToolStripMenuItem1;
+    private System.Windows.Forms.ToolStripMenuItem userToolStripMenuItem1;
+    private System.Windows.Forms.ToolStripMenuItem groupToolStripMenuItem2;
   }
 }

trunk/sources/HeuristicLab.Hive.Server.Console/HiveServerManagementConsole.cs

@@ -51 +51 @@
     private void addItems() {
       IClientManager clientManager =
-          ServiceLocator.GetClientManager();
+        ServiceLocator.GetClientManager();
 
       IJobManager jobManager =
@@ -59 +59 @@
         ServiceLocator.GetUserRoleManager();
 
-      clientManager.GetAllUpTimeStatistics();
+      //UserGroup usergr = new UserGroup { Name = "testusers" };
+      //User u = new User { Name = "Anita", Password = "Anita" };
+
+      //ResponseObject<User> respUser = userRoleManager.AddNewUser(u);
+      //ResponseObject<UserGroup> respUserGroup = userRoleManager.AddNewUserGroup(usergr);
+      //u = respUser.Obj;
+      //usergr = respUserGroup.Obj;
+      //userRoleManager.AddUserToGroup(usergr.PermissionOwnerId, u.PermissionOwnerId);
+
       clients = clientManager.GetAllClientGroups();
       jobs = jobManager.GetAllJobs();
       userGroups = userRoleManager.GetAllUserGroups();
+
+
+     // Response resp = userRoleManager.RemoveUserGroup(userGroups.List[userGroups.List.Count - 1].PermissionOwnerId);
+
+      userGroups = userRoleManager.GetAllUserGroups();
+      ResponseList<User> respList = userRoleManager.GetAllUsers();
       lvClientControl.Items.Clear();
       int count = 0;
@@ -75 +89 @@
         lvClientControl.Groups.Add(lvg);
       }
+
+
       foreach (Job job in jobs.List) {
         tvJobControl.Nodes.Add(job.JobId.ToString());
       }
       foreach (UserGroup ug in userGroups.List) {
-        tvUserControl.Nodes.Add(ug.PermissionOwnerId.ToString());
+        tvUserControl.Nodes.Add(ug.Name);
+        ListViewGroup lvg = new ListViewGroup(ug.Name, HorizontalAlignment.Left);
+
+        foreach (User users in ug.Members) {
+          tvUserControl.Nodes[tvUserControl.Nodes.Count - 1].Nodes.Add(users.Name);
+          lvUserControl.Items.Add(new ListViewItem(users.Name, count, lvg));
+        }
+        lvUserControl.Groups.Add(lvg);
       }
     }
@@ -106 +129 @@
 
     }
+
+    private void jobToolStripMenuItem1_Click(object sender, EventArgs e) {
+      AddNewForm newForm = new AddNewForm("Job", false);
+      newForm.Show();
+    }
+
   }
 }

trunk/sources/HeuristicLab.Hive.Server.Console/HiveServerManagementConsole.resx

@@ -128 +128 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADQ
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACo
         EwAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
@@ -158 +158 @@
         AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
         AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEACzUCVgGXA3gBlwNW
-        CjUBNAssAlMFdAFSAUwBTQssDEABRgFpBG8CRgxAIAAJNQJWAZgBBwG8A/ABvAHuAe8BeAJWBDUBNAM1
-        ATQJLAFNAVIBkwEHAbwD8AG8Ae4B7wF0AVIBTQksCkABaQGTAQcBvAPwAbwB7gHvAW8BRgpAIAAINQFW
-        AZgBvAHwBPEC8AHxAfACBwGYAVYFNAI1ATQILAFSAZMBvAHwBPEC8AHxAfACBwGTAUwCLAErBSwIQAFG
-        AZMBvAHwBPEC8AHxAfACBwGTAUYCQAEgBUAgAAc1AVYB7wO8AfAD8QPwBAcB9wFQAi4FNAcsAVIBmQO8
-        AfAD8QPwBAcB7wFuBCsDLAdAAUYBkwO8AfAD8QPwBAcB7wFoAukCIANAIAAGNQFWAZgDBwG8AfAC8QHw
-        A7wCBwHvAvcB7QFPAi4ENAYsAU0BkwMHAbwB8ALxAfADvAIHAe8C9wHtAUsDKwMsB0ABkwMHAbwB8ALx
-        AfADvAIHAe8C9wHtAukCIANAIAAGNQFWAZgEBwG8A/ABvAMHAe8B9wHtAZIB7QFPBjQGLAFTAZMEBwG8
-        A/ABvAMHAe8B9wHtAZIBHAFLAysDLAdAAZMEBwG8A/ABvAMHAe8B9wHtAZIB7QHpAyADQCAABzUBlwHv
-        BQcBvAIHAu8B7QLsAe0BkgFyAi4FNAcsAXQB7wUHAbwCBwLvAe0C7AHtAfcBcwErAUwCKwMsB0ABaQGT
-        BQcBvAIHAu8B7QLsAe0BkgFuAukFQCAACDUBVgEcAe8BBwPvAZIB7AH4Am0B6wHsAfcB7wH3Au8BcgQ0
-        CCwBTAEcAgcD7wGSAewB+AJtAesB7AH3Ae8BHALvAXQELAhAAUYBkwHvAQcD7wGSAewB+AJtAesB7AH3
-        Ae8BHALvAW8EQCAACTUBNAFQAXIC7QHsAvgC7AGSAu8BBwG8AfABvAHvAXMDNQE0CSwBKwFMAW4B7QGS
-        AewC+ALsAZIC7wEHAbwB8AG8AQcBdAQsCkABRQFuAewB7QHsAvgC7AGSAu8BBwG8AfABvAHvAW8EQCAA
-        CjUBNAFVAVAD7AHtAfcBBwO8AQcB7wH3AgcBcwM1ATQLLAJMA+wB7QH3AQcDvAEHAe8B9wIHARwELAxA
-        AUUB+ALsAe0B9wEHA7wBBwHvAfcCBwGNBEAgAAU1AjQCUAFyAe0BkgH3A+8CBwHvAe0BbQETARUBEQEV
-        AewBvAHtAVYCNQE0BSwBKwJMAUsBcwHtAvcD7wIHAe8B7QFtARMBFQERARUB7AG8ARwBTQMsB0ABRgFF
-        AW4B7QGSAfcD7wIHAe8B7QFtARMBFQERARUB7AG8Ae0EQCAAATUCVgFyAewB7QH3BQcB7wH3AewBbQEU
-        AkMCEQNDARQB7AG8Ae0BVgI1ATQBLAFNAUwBcwHsAe0B7wUHAe8B9wHsAW0BFAJDAhEDQwEUAewBvAEc
-        AVMDLAFAAkYCbgHtAfcFBwHvAfcB7AFtARQCQwIRA0MBFAHsAbwBkgFGA0AgAAE1AZcB7QLvAwcB9wHs
-        AeoBFQERAxABEQIVBRQBEwHsAbwBHAFWAjUBNAEsAXQB7QLvAwcB9wHsAeoBFQERAxABEQIVBRQBEwHs
-        AbwBHAFSAywBQAFpAe0C7wMHAfcB7AHqARUBEQMQARECFQUUARMB7AG8AZIBRgNAIAABNQF4AfcB7QHs
-        AW0BFQEQAw8DEAIRARUBFAITBRIB+AG8AfcBVgI1ATQBLAF0AfcB7QHsAW0BFQEQAw8DEAIRARUBFAIT
-        BRIB+AG8ARwBUgMsAUABbwH3Ae0B7AFtARUBEAMPAxACEQEVARQCEwUSAfgBvAH3AUYDQCAAATUBeAH3
-        AREIEAMRAUMBFAESAuoFbQH4AbwB7wFWAjUBNAEsAXUB9wERCBADEQFDARQBEgLqBW0B+AG8Ae8BUgMs
-        AUABbwH3AREIEAMRAUMBFAESAuoFbQH4AbwB7wFpA0AgAAE1AVYB7wEVAREBQwMRAhADEQJDARMEbQTr
-        AewBBwHvAZcCNQE0ASwBUwHvARUBEQFDAxECEAMRAkMBEwRtBOsB7AEHAe8BdAMsAUABFwHvARUBEQFD
-        AxECEAMRAkMBEwRtBOsB7AEHAe8BbwNAIAABNQFWAe8BEwFDARUCQwERARADEQJDARUB6gX4BOwCBwFz
-        AjUBNAEsAVMB7wETAUMBFQJDAREBEAMRAkMBFQHqBfgE7AIHAXQDLAFAAUYB7wETAUMBFQJDAREBEAMR
-        AkMBFQHqBfgE7AEHAe8BbwNAIAABNQFWAe8BbQEVAhQBFQQRA0MBFAFtBewD7QHsAgcBcwI1ATQBLAFT
-        Ae8BbQEVAhQBFQQRA0MBFAFtBewD7QHsAgcBHAMsAkAB7wFtARUCFAEVBBEDQwEUAW0F7APtAewCBwFu
-        A0AgAAI1Ae8B6wEVARMBEgEUAxEEQwETAfgGkgH3ApIB7wG8Ae0CNQE0AiwB7wHrARUBEwESARQDEQRD
-        ARMB+AaSAfcCkgHvAbwBHAMsAkABkwHrARUBEwESARQDEQRDARMB+AaSAfcCkgHvAbwB7QNAIAACNQGY
-        AewBFALqARUDEQNDARUBEgHsAe8C9wXvAfcB7wHwAe0CNQE0AiwBmQHsARQC6gEVAxEDQwEVARIB7AHv
-        AvcF7wH3Ae8B8AEcAU0CLAJAAZMB7AEUAuoBFQMRA0MBFQESAewB7wL3Be8B9wHvAfAB7QNAIAACNQGY
-        AfcBFAFtAeoBQwIRA0MCFQFtAZIF7wMHAu8B8AGSAVYBNQE0AiwBkwH3ARQBbQHqAUMCEQNDAhUBbQGS
-        Be8DBwLvAfABHAFSAiwCQAGTAfcBFAFtAeoBQwIRA0MCFQFtAZIF7wMHAu8B8AHtAUYCQCAAAjUBeAH3
-        ARMBbQESAhEDQwIVARQB+AHvBgcCvAIHAfABkgFWATUBNAIsAXQB7wETAW0BEgIRA0MCFQEUAfgB7wYH
-        ArwCBwHwARwBUgIsAkABbwH3ARMBbQESAhEDQwIVARQB+AHvBgcCvAIHAfABkgFGAkAgAAI1AXgB7wET
-        AW0BFQERAkMCFQIUARMB7AW8BPABvAEHAfAB9wGXATUBNAIsAXQB7wETAW0BFQERAkMCFQIUARMB7AW8
-        BPABvAEHAfABHAF0AiwCQAFvAfcBEwFtARUBEQJDAhUCFAETAewFvATwAbwBBwHwAfcBaQJAIAACNQFW
-        Ae8CEgFDARECQwIVAhQB6gH3BfAF8QEHAfAB7wGXATUBNAIsAVMB7wISAUMBEQJDAhUCFAHqAfcF8AXx
-        AQcB8AHvAXQCLAJAAUYB7wISAUMBEQJDAhUCFAHqAfcF8AXxAQcB8AHvAW8CQCAAAjUBVgHvARIBFQER
-        AkMCFQMUAW0BBwHyBPEF8gG8AfEB7wFyATUBNAIsAVMB7wESARUBEQJDAhUDFAFtAQcB8gTxBfIBvAHx
-        Ae8BdAIsAkABRgHvARIBFQERAkMCFQMUAW0BBwHyBPEF8gG8AfEB7wFvAkAgAAM1ARwBEgIRAkMCFQIU
-        ARMB7AHwBfIF8wLxAe4BcwE1ATQCLAFNAZMBEgIRAkMCFQIUARMB7AHwBfIF8wLxAe4BdAIsA0ABkwES
-        AhECQwIVAhQBEwHsAfAF8gXzAvEB7gFuAkAgAAM1AZgBbQIRAkMCFQIUARMBkgHyCPMB8gHxAQcC8AHt
-        ATUBNAMsAZMBbQIRAkMCFQIUARMBkgHyCPMB8gHxAQcC8AHtAU0BLANAAZMBbQIRAkMCFQIUARMBkgHy
-        CPMB8gHxAQcC8AHsAkAgAAM1AZgB+AFDARECQwIVAhQBEgHvAfIB8QHwA7wFBwG8AvEBHAE1ATQDLAEc
-        AfgBQwERAkMCFQIUARIB7wHyAfEB8AO8BQcBvALxARwBTQEsA0ABkwH4AUMBEQJDAhUCFAESAe8B8gHx
-        AfADvAUHAbwC8QHtAkAgAAM1AZgB7QEVAhECQwEVAhQB6gHtA+8CBwS8AQgCmQKYAVYBNQE0AywBkwHt
-        ARUCEQJDARUCFAHqAe0D7wIHBbwDmQGTAVMCLANAAY4B7QEVAhECQwEVAhQB6gHtA+8CBwO8Ae4BBwOT
-        AY4BRgJAIAADNQF4AfcCFAHqAW0B7AGSAe8BBwG8Ae4BBwIIAZkDmAN4BVYBNQE0AywBdAH3AhQB6gFt
-        AewBkgHvAQcBvALuAQcDmQKTAnQBdQVTAiwDQAFvAfcCFAHqAW0B7AGSAe8BBwG8Ae4CBwWTAY4CbwFp
-        BEYCQCAAAzUBeAHvAQcB7gEHAggBmQKYAngGVgo1ATQDLAF0AgcC7gEHA5kBkwF0AXUFUwFNCywDQAFv
-        Ae8BBwHuAwcDkwJvAWkDRg1AIAAENQFWAZcDVhY1ATQELAFTAXUDUxcsBEADaQJGF0AgAAFCAU0BPgcA
-        AT4DAAEoAwABgAMAASADAAEBAQABAQYAAQIWAAP//wD/AAMACw==
+        CjUBNAssAlMFdAFSAUwBTQssDEABRgFpBG8CRgxAIAAJNQJWAZgBBwG8A/ACvAHvAXgCVgQ1ATQDNQE0
+        CSwBTQFSAZMBBwG8A/ACvAHvAXQBUgFNCSwKQAFpAZMBBwG8A/ACvAHvAW8BRgpAIAAINQFWAZgBvAHw
+        BPEC8AHxAfACBwGYAVYFNAI1ATQILAFSAZMBvAHwBPEC8AHxAfACBwGTAUwCLAErBSwIQAFGAZMBvAHw
+        BPEC8AHxAfACBwGTAUYCQAEgBUAgAAc1AVYB7wO8AfAD8QPwBAcB9wFQAi4FNAcsAVIBmQO8AfAD8QPw
+        BAcB7wFuBCsDLAdAAUYBkwO8AfAD8QPwBAcB7wFoAukCIANAIAAGNQFWAZgDBwG8AfAC8QHwA7wCBwHv
+        AvcB7QFPAi4ENAYsAU0BkwMHAbwB8ALxAfADvAIHAe8C9wHtAUsDKwMsB0ABkwMHAbwB8ALxAfADvAIH
+        Ae8C9wHtAukCIANAIAAGNQFWAZgEBwG8A/ABvAMHAe8B9wHtAZIB7QFPBjQGLAFTAZMEBwG8A/ABvAMH
+        Ae8B9wHtAZIBHAFLAysDLAdAAZMEBwG8A/ABvAMHAe8B9wHtAZIB7QHpAyADQCAABzUBlwHvBQcBvAIH
+        Au8B7QLsAe0BkgFyAi4FNAcsAXQB7wUHAbwCBwLvAe0C7AHtAfcBcwErAUwCKwMsB0ABaQGTBQcBvAIH
+        Au8B7QLsAe0BkgFuAukFQCAACDUBVgEcAe8BBwPvAZIC7AJtAesB7AH3Ae8B9wLvAXIENAgsAUwBHAIH
+        A+8BkgLsAm0B6wHsAfcB7wEcAu8BdAQsCEABRgGTAe8BBwPvAZIC7AJtAesB7AH3Ae8BHALvAW8EQCAA
+        CTUBNAFQAXIC7QXsAZIC7wEHAbwB8AG8Ae8BcwM1ATQJLAErAUwBbgHtAZIF7AGSAu8BBwG8AfABvAEH
+        AXQELApAAUUBbgHsAe0F7AGSAu8BBwG8AfABvAHvAW8EQCAACjUBNAFVAVAD7AHtAfcBBwO8AQcB7wH3
+        AgcBcwM1ATQLLAJMA+wB7QH3AQcDvAEHAe8B9wIHARwELAxAAUUD7AHtAfcBBwO8AQcB7wH3AgcBjQRA
+        IAAFNQI0AlABcgHtAZIB9wPvAgcB7wHtAW0BEwEVAREBFQHsAbwB7QFWAjUBNAUsASsCTAFLAXMB7QL3
+        A+8CBwHvAe0BbQETARUBEQEVAewBvAEcAU0DLAdAAUYBRQFuAe0BkgH3A+8CBwHvAe0BbQETARUBEQEV
+        AewBvAHtBEAgAAE1AlYBcgHsAe0B9wUHAe8B9wHsAW0BFAJDAhEDQwEUAewBvAHtAVYCNQE0ASwBTQFM
+        AXMB7AHtAe8FBwHvAfcB7AFtARQCQwIRA0MBFAHsAbwBHAFTAywBQAJGAm4B7QH3BQcB7wH3AewBbQEU
+        AkMCEQNDARQB7AG8AZIBRgNAIAABNQGXAe0C7wMHAfcB7AHqARUBEQMQARECFQUUARMB7AG8ARwBVgI1
+        ATQBLAF0Ae0C7wMHAfcB7AHqARUBEQMQARECFQUUARMB7AG8ARwBUgMsAUABaQHtAu8DBwH3AewB6gEV
+        AREDEAERAhUFFAETAewBvAGSAUYDQCAAATUBeAH3Ae0B7AFtARUBEAMPAxACEQEVARQCEwUSAewBvAH3
+        AVYCNQE0ASwBdAH3Ae0B7AFtARUBEAMPAxACEQEVARQCEwUSAewBvAEcAVIDLAFAAW8B9wHtAewBbQEV
+        ARADDwMQAhEBFQEUAhMFEgHsAbwB9wFGA0AgAAE1AXgB9wERCBADEQFDARQBEgLqBW0B7AG8Ae8BVgI1
+        ATQBLAF1AfcBEQgQAxEBQwEUARIC6gVtAewBvAHvAVIDLAFAAW8B9wERCBADEQFDARQBEgLqBW0B7AG8
+        Ae8BaQNAIAABNQFWAe8BFQERAUMDEQIQAxECQwETBG0E6wHsAQcB7wGXAjUBNAEsAVMB7wEVAREBQwMR
+        AhADEQJDARMEbQTrAewBBwHvAXQDLAFAARcB7wEVAREBQwMRAhADEQJDARMEbQTrAewBBwHvAW8DQCAA
+        ATUBVgHvARMBQwEVAkMBEQEQAxECQwEVAeoJ7AIHAXMCNQE0ASwBUwHvARMBQwEVAkMBEQEQAxECQwEV
+        AeoJ7AIHAXQDLAFAAUYB7wETAUMBFQJDAREBEAMRAkMBFQHqCewBBwHvAW8DQCAAATUBVgHvAW0BFQIU
+        ARUEEQNDARQBbQXsA+0B7AIHAXMCNQE0ASwBUwHvAW0BFQIUARUEEQNDARQBbQXsA+0B7AIHARwDLAJA
+        Ae8BbQEVAhQBFQQRA0MBFAFtBewD7QHsAgcBbgNAIAACNQHvAesBFQETARIBFAMRBEMBEwHsBpIB9wKS
+        Ae8BvAHtAjUBNAIsAe8B6wEVARMBEgEUAxEEQwETAewGkgH3ApIB7wG8ARwDLAJAAZMB6wEVARMBEgEU
+        AxEEQwETAewGkgH3ApIB7wG8Ae0DQCAAAjUBmAHsARQC6gEVAxEDQwEVARIB7AHvAvcF7wH3Ae8B8AHt
+        AjUBNAIsAZkB7AEUAuoBFQMRA0MBFQESAewB7wL3Be8B9wHvAfABHAFNAiwCQAGTAewBFALqARUDEQND
+        ARUBEgHsAe8C9wXvAfcB7wHwAe0DQCAAAjUBmAH3ARQBbQHqAUMCEQNDAhUBbQGSBe8DBwLvAfABkgFW
+        ATUBNAIsAZMB9wEUAW0B6gFDAhEDQwIVAW0BkgXvAwcC7wHwARwBUgIsAkABkwH3ARQBbQHqAUMCEQND
+        AhUBbQGSBe8DBwLvAfAB7QFGAkAgAAI1AXgB9wETAW0BEgIRA0MCFQEUAewB7wYHArwCBwHwAZIBVgE1
+        ATQCLAF0Ae8BEwFtARICEQNDAhUBFAHsAe8GBwK8AgcB8AEcAVICLAJAAW8B9wETAW0BEgIRA0MCFQEU
+        AewB7wYHArwCBwHwAZIBRgJAIAACNQF4Ae8BEwFtARUBEQJDAhUCFAETAewFvATwAbwBBwHwAfcBlwE1
+        ATQCLAF0Ae8BEwFtARUBEQJDAhUCFAETAewFvATwAbwBBwHwARwBdAIsAkABbwH3ARMBbQEVARECQwIV
+        AhQBEwHsBbwE8AG8AQcB8AH3AWkCQCAAAjUBVgHvAhIBQwERAkMCFQIUAeoB9wXwBfEBBwHwAe8BlwE1
+        ATQCLAFTAe8CEgFDARECQwIVAhQB6gH3BfAF8QEHAfAB7wF0AiwCQAFGAe8CEgFDARECQwIVAhQB6gH3
+        BfAF8QEHAfAB7wFvAkAgAAI1AVYB7wESARUBEQJDAhUDFAFtAQcB8gTxBfIBvAHxAe8BcgE1ATQCLAFT
+        Ae8BEgEVARECQwIVAxQBbQEHAfIE8QXyAbwB8QHvAXQCLAJAAUYB7wESARUBEQJDAhUDFAFtAQcB8gTx
+        BfIBvAHxAe8BbwJAIAADNQEcARICEQJDAhUCFAETAewB8AXyBfMC8QG8AXMBNQE0AiwBTQGTARICEQJD
+        AhUCFAETAewB8AXyBfMC8QG8AXQCLANAAZMBEgIRAkMCFQIUARMB7AHwBfIF8wLxAbwBbgJAIAADNQGY
+        AW0CEQJDAhUCFAETAZIB8gjzAfIB8QEHAvAB7QE1ATQDLAGTAW0CEQJDAhUCFAETAZIB8gjzAfIB8QEH
+        AvAB7QFNASwDQAGTAW0CEQJDAhUCFAETAZIB8gjzAfIB8QEHAvAB7AJAIAADNQGYAewBQwERAkMCFQIU
+        ARIB7wHyAfEB8AO8BQcBvALxARwBNQE0AywBHAHsAUMBEQJDAhUCFAESAe8B8gHxAfADvAUHAbwC8QEc
+        AU0BLANAAZMB7AFDARECQwIVAhQBEgHvAfIB8QHwA7wFBwG8AvEB7QJAIAADNQGYAe0BFQIRAkMBFQIU
+        AeoB7QPvAgcEvAEIApkCmAFWATUBNAMsAZMB7QEVAhECQwEVAhQB6gHtA+8CBwW8A5kBkwFTAiwDQAGO
+        Ae0BFQIRAkMBFQIUAeoB7QPvAgcEvAEHA5MBjgFGAkAgAAM1AXgB9wIUAeoBbQHsAZIB7wEHArwBBwII
+        AZkDmAN4BVYBNQE0AywBdAH3AhQB6gFtAewBkgHvAQcDvAEHA5kCkwJ0AXUFUwIsA0ABbwH3AhQB6gFt
+        AewBkgHvAQcCvAIHBZMBjgJvAWkERgJAIAADNQF4Ae8BBwG8AQcCCAGZApgCeAZWCjUBNAMsAXQCBwK8
+        AQcDmQGTAXQBdQVTAU0LLANAAW8B7wEHAbwDBwOTAm8BaQNGDUAgAAQ1AVYBlwNWFjUBNAQsAVMBdQNT
+        FywEQANpAkYXQCAAAUIBTQE+BwABPgMAASgDAAGAAwABIAMAAQEBAAEBBgABAhYAA///AP8AAwAL
 </value>
   </data>