Zooflow: First version of user group relations

2022-03-09 15:36:14 +01:00
parent f48912b996
commit 8ace2fe11f
10 changed files with 214 additions and 70 deletions
--- a/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.Designer.vb
+++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.Designer.vb
@@ -29,9 +29,12 @@ Partial Class frmAdmin_UserGroupRelations
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
+        Me.SimpleButton2 = New DevExpress.XtraEditors.SimpleButton()
+        Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton()
        Me.GridControl3 = New DevExpress.XtraGrid.GridControl()
        Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.colUsername2 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colSurname2 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridControl2 = New DevExpress.XtraGrid.GridControl()
        Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.colName = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -39,6 +42,7 @@ Partial Class frmAdmin_UserGroupRelations
        Me.colActive = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.colSurname = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.colUsername = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
        Me.SimpleLabelItem1 = New DevExpress.XtraLayout.SimpleLabelItem()
@@ -47,8 +51,8 @@ Partial Class frmAdmin_UserGroupRelations
        Me.SimpleLabelItem3 = New DevExpress.XtraLayout.SimpleLabelItem()
        Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.colSurname = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.colSurname2 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.LayoutControl1.SuspendLayout()
@@ -65,6 +69,8 @@ Partial Class frmAdmin_UserGroupRelations
        CType(Me.SimpleLabelItem3, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'RibbonControl1
@@ -108,6 +114,8 @@ Partial Class frmAdmin_UserGroupRelations
        '
        'LayoutControl1
        '
+        Me.LayoutControl1.Controls.Add(Me.SimpleButton2)
+        Me.LayoutControl1.Controls.Add(Me.SimpleButton1)
        Me.LayoutControl1.Controls.Add(Me.GridControl3)
        Me.LayoutControl1.Controls.Add(Me.GridControl2)
        Me.LayoutControl1.Controls.Add(Me.GridControl1)
@@ -119,6 +127,28 @@ Partial Class frmAdmin_UserGroupRelations
        Me.LayoutControl1.TabIndex = 2
        Me.LayoutControl1.Text = "LayoutControl1"
        '
+        'SimpleButton2
+        '
+        Me.SimpleButton2.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.RightCenter
+        Me.SimpleButton2.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.nextview
+        Me.SimpleButton2.Location = New System.Drawing.Point(414, 405)
+        Me.SimpleButton2.Name = "SimpleButton2"
+        Me.SimpleButton2.Size = New System.Drawing.Size(398, 36)
+        Me.SimpleButton2.StyleController = Me.LayoutControl1
+        Me.SimpleButton2.TabIndex = 8
+        Me.SimpleButton2.Text = "Benutzer zuordnen"
+        '
+        'SimpleButton1
+        '
+        Me.SimpleButton1.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter
+        Me.SimpleButton1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.previousview
+        Me.SimpleButton1.Location = New System.Drawing.Point(414, 445)
+        Me.SimpleButton1.Name = "SimpleButton1"
+        Me.SimpleButton1.Size = New System.Drawing.Size(398, 36)
+        Me.SimpleButton1.StyleController = Me.LayoutControl1
+        Me.SimpleButton1.TabIndex = 7
+        Me.SimpleButton1.Text = "Benutzer entfernen"
+        '
        'GridControl3
        '
        Me.GridControl3.AllowDrop = True
@@ -144,13 +174,21 @@ Partial Class frmAdmin_UserGroupRelations
        Me.colUsername2.Visible = True
        Me.colUsername2.VisibleIndex = 0
        '
+        'colSurname2
+        '
+        Me.colSurname2.Caption = "Name"
+        Me.colSurname2.FieldName = "NAME"
+        Me.colSurname2.Name = "colSurname2"
+        Me.colSurname2.Visible = True
+        Me.colSurname2.VisibleIndex = 1
+        '
        'GridControl2
        '
        Me.GridControl2.Location = New System.Drawing.Point(414, 45)
        Me.GridControl2.MainView = Me.GridView2
        Me.GridControl2.MenuManager = Me.RibbonControl1
        Me.GridControl2.Name = "GridControl2"
-        Me.GridControl2.Size = New System.Drawing.Size(398, 436)
+        Me.GridControl2.Size = New System.Drawing.Size(398, 356)
        Me.GridControl2.TabIndex = 5
        Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2})
        '
@@ -201,6 +239,14 @@ Partial Class frmAdmin_UserGroupRelations
        Me.GridView1.GridControl = Me.GridControl1
        Me.GridView1.Name = "GridView1"
        '
+        'colSurname
+        '
+        Me.colSurname.Caption = "Name"
+        Me.colSurname.FieldName = "NAME"
+        Me.colSurname.Name = "colSurname"
+        Me.colSurname.Visible = True
+        Me.colSurname.VisibleIndex = 0
+        '
        'colUsername
        '
        Me.colUsername.Caption = "Benutzername"
@@ -213,7 +259,7 @@ Partial Class frmAdmin_UserGroupRelations
        '
        Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
        Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.SimpleLabelItem1, Me.LayoutControlItem1, Me.SimpleLabelItem2, Me.SimpleLabelItem3, Me.LayoutControlItem2, Me.LayoutControlItem3})
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.SimpleLabelItem1, Me.LayoutControlItem1, Me.SimpleLabelItem2, Me.SimpleLabelItem3, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5})
        Me.Root.Name = "Root"
        Me.Root.Size = New System.Drawing.Size(1221, 493)
        Me.Root.TextVisible = False
@@ -262,7 +308,7 @@ Partial Class frmAdmin_UserGroupRelations
        Me.LayoutControlItem2.Control = Me.GridControl2
        Me.LayoutControlItem2.Location = New System.Drawing.Point(402, 33)
        Me.LayoutControlItem2.Name = "LayoutControlItem2"
-        Me.LayoutControlItem2.Size = New System.Drawing.Size(402, 440)
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(402, 360)
        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0)
        Me.LayoutControlItem2.TextVisible = False
        '
@@ -275,21 +321,23 @@ Partial Class frmAdmin_UserGroupRelations
        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(0, 0)
        Me.LayoutControlItem3.TextVisible = False
        '
-        'colSurname
+        'LayoutControlItem4
        '
-        Me.colSurname.Caption = "Name"
-        Me.colSurname.FieldName = "NAME"
-        Me.colSurname.Name = "colSurname"
-        Me.colSurname.Visible = True
-        Me.colSurname.VisibleIndex = 0
+        Me.LayoutControlItem4.Control = Me.SimpleButton1
+        Me.LayoutControlItem4.Location = New System.Drawing.Point(402, 433)
+        Me.LayoutControlItem4.Name = "LayoutControlItem4"
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(402, 40)
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem4.TextVisible = False
        '
-        'colSurname2
+        'LayoutControlItem5
        '
-        Me.colSurname2.Caption = "Name"
-        Me.colSurname2.FieldName = "NAME"
-        Me.colSurname2.Name = "colSurname2"
-        Me.colSurname2.Visible = True
-        Me.colSurname2.VisibleIndex = 1
+        Me.LayoutControlItem5.Control = Me.SimpleButton2
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(402, 393)
+        Me.LayoutControlItem5.Name = "LayoutControlItem5"
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(402, 40)
+        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem5.TextVisible = False
        '
        'frmAdmin_UserGroupRelations
        '
@@ -319,6 +367,8 @@ Partial Class frmAdmin_UserGroupRelations
        CType(Me.SimpleLabelItem3, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -351,4 +401,8 @@ Partial Class frmAdmin_UserGroupRelations
    Friend WithEvents colUsername As DevExpress.XtraGrid.Columns.GridColumn
    Friend WithEvents colSurname2 As DevExpress.XtraGrid.Columns.GridColumn
    Friend WithEvents colSurname As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents SimpleButton2 As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
 End Class
--- a/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.vb
+++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.vb
@@ -12,6 +12,8 @@ Public Class frmAdmin_UserGroupRelations
    Public Property IsInsert As Boolean Implements IAdminForm.IsInsert

    Private Property SelectedGroupId As Integer = Nothing
+    Private Property SelectedAvailableUser As Integer = Nothing
+    Private Property SelectedRelatedUser As Integer = Nothing

    Public Sub New(pPrimaryKey As Integer)
        ' Dieser Aufruf ist für den Designer erforderlich.
@@ -43,11 +45,13 @@ Public Class frmAdmin_UserGroupRelations

    Private Async Function GetAvailableUsersByGroupId(pGroupId As Integer) As Threading.Tasks.Task(Of DataTable)
        Try
-            Dim oSql As String = $"            
-                SELECT  T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.COMMENT, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN
-                FROM    TBDD_USER AS T1 INNER JOIN
-                        TBDD_GROUPS_USER AS T2 ON T1.GUID = T2.USER_ID
-                WHERE   (T2.GROUP_ID = {pGroupId})
+            Dim oSql As String = $"
+                SELECT  GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
+                FROM    TBDD_USER
+                WHERE   (GUID NOT IN
+                        (SELECT DISTINCT T.GUID
+                        FROM            TBDD_USER AS T INNER JOIN TBDD_GROUPS_USER AS T1 ON T.GUID = T1.USER_ID
+                        WHERE        (T1.GROUP_ID = {pGroupId})))
            "
            Dim oTable = Await My.DatabaseECM.GetDatatableAsync(oSql)
            Return oTable
@@ -59,13 +63,11 @@ Public Class frmAdmin_UserGroupRelations

    Private Async Function GetRelatedUsersByGroupId(pGroupId As Integer) As Threading.Tasks.Task(Of DataTable)
        Try
-            Dim oSql As String = $"
-                SELECT  GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
-                FROM    TBDD_USER
-                WHERE   (GUID NOT IN
-                        (SELECT DISTINCT T.GUID
-                        FROM            TBDD_USER AS T INNER JOIN TBDD_GROUPS_USER AS T1 ON T.GUID = T1.USER_ID
-                        WHERE        (T1.GROUP_ID = {pGroupId})))
+            Dim oSql As String = $"            
+                SELECT  T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.COMMENT, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN
+                FROM    TBDD_USER AS T1 INNER JOIN
+                        TBDD_GROUPS_USER AS T2 ON T1.GUID = T2.USER_ID
+                WHERE   (T2.GROUP_ID = {pGroupId})
            "
            Dim oTable = Await My.DatabaseECM.GetDatatableAsync(oSql)
            Return oTable
@@ -90,6 +92,22 @@ Public Class frmAdmin_UserGroupRelations
        End If
    End Sub

+    Private Sub GridView1_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles GridView1.FocusedRowChanged
+        Try
+            SelectedAvailableUser = GridView1.GetFocusedRowCellValue("GUID")
+        Catch ex As Exception
+            SelectedAvailableUser = 0
+        End Try
+    End Sub
+
+    Private Sub GridView3_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles GridView3.FocusedRowChanged
+        Try
+            SelectedRelatedUser = GridView3.GetFocusedRowCellValue("GUID")
+        Catch ex As Exception
+            SelectedRelatedUser = 0
+        End Try
+    End Sub
+
    Private Async Function UpdateUsers(pGroupId As Integer) As Threading.Tasks.Task
        Dim oAvailableTable = Await GetAvailableUsersByGroupId(SelectedGroupId)
        GridControl1.DataSource = oAvailableTable
@@ -102,7 +120,7 @@ Public Class frmAdmin_UserGroupRelations
        Dim oData As String = e.Data.GetData(DataFormats.Text)
        Dim oGuid As Integer = oData.Split("|").ToList.First()

-        If Await AddUserToGroup(oGuid, SelectedGroupId) Then
+        If Await RemoveUserFromGroup(oGuid, SelectedGroupId) Then
            Await UpdateUsers(SelectedGroupId)
        End If
    End Sub
@@ -111,7 +129,7 @@ Public Class frmAdmin_UserGroupRelations
        Dim oData As String = e.Data.GetData(DataFormats.Text)
        Dim oGuid As Integer = oData.Split("|").ToList.First()

-        If Await RemoveUserFromGroup(oGuid, SelectedGroupId) Then
+        If Await AddUserToGroup(oGuid, SelectedGroupId) Then
            Await UpdateUsers(SelectedGroupId)
        End If
    End Sub
@@ -152,4 +170,18 @@ Public Class frmAdmin_UserGroupRelations

        End Try
    End Function
+
+    Private Async Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles SimpleButton2.Click
+        If SelectedAvailableUser > 0 Then
+            Await AddUserToGroup(SelectedAvailableUser, SelectedGroupId)
+            Await UpdateUsers(SelectedGroupId)
+        End If
+    End Sub
+
+    Private Async Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click
+        If SelectedRelatedUser > 0 Then
+            Await RemoveUserFromGroup(SelectedRelatedUser, SelectedGroupId)
+            Await UpdateUsers(SelectedGroupId)
+        End If
+    End Sub
 End Class
--- a/GUIs.ZooFlow/Administration/Users/frmWaitForm.Designer.vb
+++ b/GUIs.ZooFlow/Administration/Users/frmWaitForm.Designer.vb
@@ -1,83 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmWaitForm
-    Inherits DevExpress.XtraWaitForm.WaitForm
-
-    'Form overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Required by the Windows Form Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Windows Form Designer
-    'It can be modified using the Windows Form Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.progressPanel1 = New DevExpress.XtraWaitForm.ProgressPanel()
-        Me.tableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
-        Me.tableLayoutPanel1.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'progressPanel1
-        '
-        Me.progressPanel1.Appearance.BackColor = System.Drawing.Color.Transparent
-        Me.progressPanel1.Appearance.Options.UseBackColor = True
-        Me.progressPanel1.AppearanceCaption.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.progressPanel1.AppearanceCaption.Options.UseFont = True
-        Me.progressPanel1.AppearanceDescription.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
-        Me.progressPanel1.AppearanceDescription.Options.UseFont = True
-        Me.progressPanel1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.progressPanel1.ImageHorzOffset = 20
-        Me.progressPanel1.Location = New System.Drawing.Point(0, 17)
-        Me.progressPanel1.Margin = New System.Windows.Forms.Padding(0, 3, 0, 3)
-        Me.progressPanel1.Name = "progressPanel1"
-        Me.progressPanel1.Size = New System.Drawing.Size(246, 39)
-        Me.progressPanel1.TabIndex = 0
-        Me.progressPanel1.Text = "progressPanel1"
-        ' 
-        'tableLayoutPanel1
-        '
-        Me.tableLayoutPanel1.AutoSize = True
-        Me.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.tableLayoutPanel1.BackColor = System.Drawing.Color.Transparent
-        Me.tableLayoutPanel1.ColumnCount = 1
-        Me.tableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-        Me.tableLayoutPanel1.Controls.Add(Me.progressPanel1, 0, 0)
-        Me.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.tableLayoutPanel1.Location = New System.Drawing.Point(0, 0)
-        Me.tableLayoutPanel1.Name = "tableLayoutPanel1"
-        Me.tableLayoutPanel1.Padding = New System.Windows.Forms.Padding(0, 14, 0, 14)
-        Me.tableLayoutPanel1.RowCount = 1
-        Me.tableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-        Me.tableLayoutPanel1.Size = New System.Drawing.Size(246, 73)
-        Me.tableLayoutPanel1.TabIndex = 1
-        '
-        'Form1
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.AutoSize = True
-        Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ClientSize = New System.Drawing.Size(246, 73)
-        Me.Controls.Add(Me.tableLayoutPanel1)
-        Me.DoubleBuffered = True
-        Me.Name = "Form1"
-        Me.StartPosition = FormStartPosition.Manual
-        Me.Text = "Form1"
-        Me.tableLayoutPanel1.ResumeLayout(false)
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-    End Sub
-
-    Private WithEvents progressPanel1 As DevExpress.XtraWaitForm.ProgressPanel
-    Private WithEvents tableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
-End Class
--- a/GUIs.ZooFlow/Administration/Users/frmWaitForm.resx
+++ b/GUIs.ZooFlow/Administration/Users/frmWaitForm.resx
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-	<!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:import namespace="http://www.w3.org/XML/1998/namespace"></xsd:import>
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="metadata">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0"></xsd:element>
-							</xsd:sequence>
-							<xsd:attribute name="name" use="required" type="xsd:string"></xsd:attribute>
-							<xsd:attribute name="type" type="xsd:string"></xsd:attribute>
-							<xsd:attribute name="mimetype" type="xsd:string"></xsd:attribute>
-							<xsd:attribute ref="xml:space"></xsd:attribute>
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="assembly">
-						<xsd:complexType>
-							<xsd:attribute name="alias" type="xsd:string"></xsd:attribute>
-							<xsd:attribute name="name" type="xsd:string"></xsd:attribute>
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"></xsd:element>
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"></xsd:element>
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"></xsd:attribute>
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"></xsd:attribute>
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"></xsd:attribute>
-							<xsd:attribute ref="xml:space"></xsd:attribute>
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"></xsd:element>
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>2.0</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-</root>
--- a/GUIs.ZooFlow/Administration/Users/frmWaitForm.vb
+++ b/GUIs.ZooFlow/Administration/Users/frmWaitForm.vb
@@ -1,24 +0,0 @@
-Public Class frmWaitForm
-    Sub New
-        InitializeComponent()
-        Me.progressPanel1.AutoHeight = True
-    End Sub
-
-    Public Overrides Sub SetCaption(ByVal caption As String)
-        MyBase.SetCaption(caption)
-        Me.progressPanel1.Caption = caption
-    End Sub
-
-    Public Overrides Sub SetDescription(ByVal description As String)
-        MyBase.SetDescription(description)
-        Me.progressPanel1.Description = description
-    End Sub
-
-    Public Overrides Sub ProcessCommand(ByVal cmd As System.Enum, ByVal arg As Object)
-        MyBase.ProcessCommand(cmd, arg)
-    End Sub
-
-    Public Enum WaitFormCommand
-        SomeCommandId
-    End Enum
-End Class