diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.Designer.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.Designer.vb index c2353987..24c61a55 100644 --- 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 diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.vb index bb3a0ae3..f31d457f 100644 --- 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 \ No newline at end of file diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb index ea0aafbb..682bebc4 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb +++ b/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) diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index a88ba3cb..ee7d2f58 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -1070,6 +1070,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -1100,6 +1110,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 2324694f..29559b2d 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -121,9 +121,6 @@ ..\Resources\save8.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -145,8 +142,8 @@ ..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -154,9 +151,6 @@ ..\Resources\servermode.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -175,8 +169,8 @@ ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\gear_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -196,8 +190,8 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -214,9 +208,15 @@ ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -277,8 +277,8 @@ ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\nextview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -319,8 +319,8 @@ ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,8 +340,14 @@ ..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -391,12 +397,12 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\actions_check6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\Hamburger_icon.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -406,8 +412,8 @@ ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -427,8 +433,11 @@ ..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -466,9 +475,6 @@ ..\Resources\text1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -493,8 +499,8 @@ ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_addcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -505,8 +511,8 @@ ..\Resources\windows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -514,13 +520,13 @@ ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bo_validation1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\previousview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/nextview.svg b/GUIs.ZooFlow/Resources/nextview.svg new file mode 100644 index 00000000..22bd23db --- /dev/null +++ b/GUIs.ZooFlow/Resources/nextview.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/previousview.svg b/GUIs.ZooFlow/Resources/previousview.svg new file mode 100644 index 00000000..c1a97e06 --- /dev/null +++ b/GUIs.ZooFlow/Resources/previousview.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 8fa13c19..4019d3b4 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -247,10 +247,10 @@ Form - + frmWaitForm.vb - + Form @@ -488,7 +488,7 @@ frmAdmin_UserGroupRelations.vb - + frmWaitForm.vb @@ -1066,6 +1066,8 @@ + + diff --git a/GUIs.ZooFlow/Administration/Users/frmWaitForm.Designer.vb b/GUIs.ZooFlow/frmWaitForm.Designer.vb similarity index 100% rename from GUIs.ZooFlow/Administration/Users/frmWaitForm.Designer.vb rename to GUIs.ZooFlow/frmWaitForm.Designer.vb diff --git a/GUIs.ZooFlow/Administration/Users/frmWaitForm.resx b/GUIs.ZooFlow/frmWaitForm.resx similarity index 100% rename from GUIs.ZooFlow/Administration/Users/frmWaitForm.resx rename to GUIs.ZooFlow/frmWaitForm.resx diff --git a/GUIs.ZooFlow/Administration/Users/frmWaitForm.vb b/GUIs.ZooFlow/frmWaitForm.vb similarity index 100% rename from GUIs.ZooFlow/Administration/Users/frmWaitForm.vb rename to GUIs.ZooFlow/frmWaitForm.vb diff --git a/Modules.EDMIAPI/Client.vb b/Modules.EDMIAPI/Client.vb index 6b02d018..6ece987d 100644 --- a/Modules.EDMIAPI/Client.vb +++ b/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) diff --git a/Service.EDMIService/GlobalState.vb b/Service.EDMIService/GlobalState.vb index be2b2404..bb73e113 100644 --- a/Service.EDMIService/GlobalState.vb +++ b/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"), - .IsArchive = oRow.Item("OS_IS_ARCHIVE"), - .Path = oRow.Item("IDB_PRAEFIX"), - .Title = oRow.Item("OS_TITLE") + .Id = oRow.Item("GUID"), + .IsArchive = oRow.Item("Archive"), + .Path = oRow.Item("REL_PATH"), + .Title = oRow.Item("Objectstore") } _Logger.Info("New Object Store [{0}]", oStore.Title) oObjectStores.Add(oStore)