Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo

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.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.colSurname2 = New DevExpress.XtraGrid.Columns.GridColumn()
+        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.LayoutControlItem4.Control = Me.SimpleButton1
-        Me.colSurname.FieldName = "NAME"
+        Me.LayoutControlItem4.Location = New System.Drawing.Point(402, 433)
-        Me.colSurname.Name = "colSurname"
+        Me.LayoutControlItem4.Name = "LayoutControlItem4"
-        Me.colSurname.Visible = True
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(402, 40)
-        Me.colSurname.VisibleIndex = 0
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem4.TextVisible = False
         '
-        'colSurname2
+        'LayoutControlItem5
         '
-        Me.colSurname2.Caption = "Name"
+        Me.LayoutControlItem5.Control = Me.SimpleButton2
-        Me.colSurname2.FieldName = "NAME"
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(402, 393)
-        Me.colSurname2.Name = "colSurname2"
+        Me.LayoutControlItem5.Name = "LayoutControlItem5"
-        Me.colSurname2.Visible = True
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(402, 40)
-        Me.colSurname2.VisibleIndex = 1
+        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

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 = $"            
+            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
+                SELECT  GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
-                FROM    TBDD_USER AS T1 INNER JOIN
+                FROM    TBDD_USER
-                        TBDD_GROUPS_USER AS T2 ON T1.GUID = T2.USER_ID
+                WHERE   (GUID NOT IN
-                WHERE   (T2.GROUP_ID = {pGroupId})
+                        (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 = $"
+            Dim oSql As String = $"            
-                SELECT  GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
+                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
+                FROM    TBDD_USER AS T1 INNER JOIN
-                WHERE   (GUID NOT IN
+                        TBDD_GROUPS_USER AS T2 ON T1.GUID = T2.USER_ID
-                        (SELECT DISTINCT T.GUID
+                WHERE   (T2.GROUP_ID = {pGroupId})
-                        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
@@ -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

GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb

@@ -761,9 +761,8 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I
 
             Dim oFilePath As String = My.Application.Globix.CurrentWorkfile.FilePath
             Dim oObjectStore As String = SelectedDocType.ObjectStore
+            Dim oIDBDoctypeId As Long = SelectedDocType.IDB_DoctypeID
             Dim oObjectKind As String = "DOC"
-            Dim oBusinessEntity As String = "DEFAULT"
-            ' sd
             Dim oProfileId As Integer = SelectedDocType.Guid
             Dim oAttributes As List(Of UserAttributeValue) = oValues
             Dim oOptions As New Options.ImportFileOptions
@@ -771,14 +770,13 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I
             Logger.Debug("FilePath: [{0}]", oFilePath)
             Logger.Debug("ObjectStore: [{0}]", oObjectStore)
             Logger.Debug("ObjectKind: [{0}]", oObjectKind)
-            Logger.Debug("BusinessEntity: [{0}]", oBusinessEntity)
             Logger.Debug("ProfileId: [{0}]", oProfileId)
-            Logger.Debug("BusinessEntity: [{0}]", oBusinessEntity)
+            Logger.Debug("IDB DoctypeId: [{0}]", oIDBDoctypeId)
 
             Logger.Info("Running Import")
 
             Dim oResult = Await My.Application.Service.Client.Globix_ImportFileAsync(
-                oFilePath, oProfileId, oAttributes, oObjectStore, oObjectKind, oBusinessEntity, oOptions)
+                oFilePath, oProfileId, oAttributes, oObjectStore, oObjectKind, oIDBDoctypeId, oOptions)
 
             Logger.Info("Import result: [{0}]", oResult.OK)
             Logger.Info("Imported file got ObjectId [{0}]", oResult.ObjectId)

GUIs.ZooFlow/My Project/Resources.Designer.vb

@@ -1070,6 +1070,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property nextview() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("nextview", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -1100,6 +1110,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property previousview() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("previousview", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>

GUIs.ZooFlow/My Project/Resources.resx

@@ -121,9 +121,6 @@
   <data name="save8" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save8.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_addcircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="editnames" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -145,8 +142,8 @@
   <data name="doublenext2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="doublenext1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_addcircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -154,9 +151,6 @@
   <data name="servermode" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\servermode.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_send1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="definednameuseinformula3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -175,8 +169,8 @@
   <data name="definednameuseinformula" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_send1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="gear_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\gear_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -196,8 +190,8 @@
   <data name="about2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="2_ZOO_FLOW_Abo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -214,9 +208,15 @@
   <data name="editdatasource1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="refresh_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="actions_window" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ZOO_FLOW_ sysicon_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -277,8 +277,8 @@
   <data name="doublenext" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="2_LUPE_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="nextview" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\nextview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="del1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -319,8 +319,8 @@
   <data name="pagesetup1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="deletetable" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_deletecircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="2_LUPE_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -340,8 +340,14 @@
   <data name="ZooFlow_CW_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="refresh_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_deletecircled4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="doublenext1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="ZooFlow-25" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -391,12 +397,12 @@
   <data name="del3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="Compare_RefreshScriptPreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="actions_check5" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_check6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="Hamburger_icon.svg" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Hamburger_icon.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -406,8 +412,8 @@
   <data name="del4" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="Compare_RefreshScriptPreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="2_ZOO_FLOW_Abo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bo_validation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -427,8 +433,11 @@
   <data name="save6" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_deletecircled4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="deletetable" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="1_LOGO_ZOO_FLOW_DROP2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ZooFlow_G_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -466,9 +475,6 @@
   <data name="text1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\text1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="1_LOGO_ZOO_FLOW" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="actions_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
@@ -493,8 +499,8 @@
   <data name="renamedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_deletecircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="2_LUPE_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="actions_addcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_addcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -505,8 +511,8 @@
   <data name="windows" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\windows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="1_LOGO_ZOO_FLOW_DROP2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="crossdatasourcefiltering" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -514,13 +520,13 @@
   <data name="StatusAnnotations_Stop_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="1_LOGO_ZOO_FLOW" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bo_validation1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_validation1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="previousview" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>..\Resources\previousview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

GUIs.ZooFlow/Resources/nextview.svg

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.75;}
+</style>
+  <g id="NextView">
+    <path d="M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M16,24v-6H8v-4h8V8l8,8L16,24z" class="Blue" />
+  </g>
+</svg>

GUIs.ZooFlow/Resources/previousview.svg

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.75;}
+</style>
+  <g id="PreviousView">
+    <path d="M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M24,18h-8v6l-8-8l8-8v6h8V18z" class="Blue" />
+  </g>
+</svg>

GUIs.ZooFlow/ZooFlow.vbproj

@@ -247,10 +247,10 @@
     <Compile Include="Administration\Users\frmAdmin_UserGroupRelations.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Administration\Users\frmWaitForm.Designer.vb">
+    <Compile Include="frmWaitForm.Designer.vb">
       <DependentUpon>frmWaitForm.vb</DependentUpon>
     </Compile>
-    <Compile Include="Administration\Users\frmWaitForm.vb">
+    <Compile Include="frmWaitForm.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="ApplicationEvents.vb" />
@@ -488,7 +488,7 @@
     <EmbeddedResource Include="Administration\Users\frmAdmin_UserGroupRelations.resx">
       <DependentUpon>frmAdmin_UserGroupRelations.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Administration\Users\frmWaitForm.resx">
+    <EmbeddedResource Include="frmWaitForm.resx">
       <DependentUpon>frmWaitForm.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="frmConfigBasic.resx">
@@ -1066,6 +1066,8 @@
     <None Include="Resources\open2.svg" />
     <None Include="Resources\actions_send1.svg" />
     <None Include="Resources\actions_send2.svg" />
+    <None Include="Resources\nextview.svg" />
+    <None Include="Resources\previousview.svg" />
     <Content Include="Zooflow.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />

Modules.EDMIAPI/Client.vb

@@ -230,11 +230,11 @@ Public Class Client
         pAttributeValues As List(Of UserAttributeValue),
         pObjectStoreName As String,
         pObjectKind As String,
-        pBusinessEntity As String,
+        pIDBDoctypeId As String,
         Optional pImportOptions As Options.ImportFileOptions = Nothing) As Task(Of ImportFileResponse)
         Try
             Dim oImportFile As New Modules.Globix.ImportFile(LogConfig, Channel)
-            Return Await oImportFile.RunAsync(pFilePath, pProfileId, pAttributeValues, pObjectStoreName, pObjectKind, pBusinessEntity, pImportOptions)
+            Return Await oImportFile.RunAsync(pFilePath, pProfileId, pAttributeValues, pObjectStoreName, pObjectKind, pIDBDoctypeId, pImportOptions)
 
         Catch ex As Exception
             Logger.Error(ex)

Service.EDMIService/GlobalState.vb

@@ -96,7 +96,7 @@ Public Class GlobalState
     Public Sub LoadObjectStores()
         _Logger.Info("Loading Object Stores")
         Try
-            Dim oSQL As String = "SELECT * FROM VWIDB_OBJECTSTORE"
+            Dim oSQL As String = "SELECT * FROM VWIDB_OBJECT_STORE"
             Dim oTable As DataTable = _MSSQL_IDB.GetDatatable(oSQL)
 
             _Logger.Info("Found [{0}] Object Stores", oTable.Rows.Count)
@@ -105,10 +105,10 @@ Public Class GlobalState
 
             For Each oRow As DataRow In oTable.Rows
                 Dim oStore As New ObjectStore() With {
-                    .Id = oRow.Item("OST_ID"),
+                    .Id = oRow.Item("GUID"),
-                    .IsArchive = oRow.Item("OS_IS_ARCHIVE"),
+                    .IsArchive = oRow.Item("Archive"),
-                    .Path = oRow.Item("IDB_PRAEFIX"),
+                    .Path = oRow.Item("REL_PATH"),
-                    .Title = oRow.Item("OS_TITLE")
+                    .Title = oRow.Item("Objectstore")
                 }
                 _Logger.Info("New Object Store [{0}]", oStore.Title)
                 oObjectStores.Add(oStore)