diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb index f01d386a..cf91d165 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.Designer.vb @@ -304,7 +304,7 @@ Partial Class frmGlobix_Index Me.SimpleButton1.Name = "SimpleButton1" Me.SimpleButton1.Size = New System.Drawing.Size(522, 75) Me.SimpleButton1.TabIndex = 2 - Me.SimpleButton1.Text = "Ablage starten" + Me.SimpleButton1.Text = "Starte ZooFile (Ablage)" ' 'Panel1 ' diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 9655d72a..d75c3bc5 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -240,6 +240,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property action_add_16xMD() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("action_add_16xMD", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + 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 be2fb105..494db6d1 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -196,6 +196,9 @@ ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -313,8 +316,8 @@ ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\documentproperties.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 @@ -334,6 +337,9 @@ ..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -415,6 +421,9 @@ ..\Resources\del5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\ZooFlow_Sidebar_TOP_Drop.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -469,12 +478,6 @@ ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -511,8 +514,8 @@ ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\StatusAnnotations_Information_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 @@ -559,7 +562,7 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/action_add_16xMD.png b/GUIs.ZooFlow/Resources/action_add_16xMD.png new file mode 100644 index 00000000..d1ad5033 Binary files /dev/null and b/GUIs.ZooFlow/Resources/action_add_16xMD.png differ diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 5556e3a4..463b923b 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -1088,6 +1088,7 @@ + diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index e019d92a..e94c74db 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -36,6 +36,7 @@ Partial Class frmFlowForm Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.EinblendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox() @@ -52,6 +53,7 @@ Partial Class frmFlowForm Me.btnServiceConfig = New DevExpress.XtraBars.BarButtonItem() Me.btnDatabaseConfig = New DevExpress.XtraBars.BarButtonItem() Me.btnRestartZooflow = New DevExpress.XtraBars.BarButtonItem() + Me.bbtnitmAusblenden = New DevExpress.XtraBars.BarButtonItem() Me.btnExitZooflow = New DevExpress.XtraBars.BarButtonItem() Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() @@ -94,44 +96,52 @@ Partial Class frmFlowForm ' 'ContextMenuSystray ' - Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem}) + Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EinblendenToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem}) Me.ContextMenuSystray.Name = "ContextMenuSystray" - Me.ContextMenuSystray.Size = New System.Drawing.Size(170, 88) + Me.ContextMenuSystray.Size = New System.Drawing.Size(181, 132) ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6) ' 'VerwaltungToolStripMenuItem ' Me.VerwaltungToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.gear_32xLG Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem" - Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(169, 22) + Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.VerwaltungToolStripMenuItem.Text = "Verwaltung" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6) ' 'TestToolStripMenuItem ' Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem" - Me.TestToolStripMenuItem.Size = New System.Drawing.Size(169, 22) + Me.TestToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.TestToolStripMenuItem.Text = "Test" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6) ' 'ZooFlowBeendenToolStripMenuItem ' Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem" - Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) + Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' + 'EinblendenToolStripMenuItem + ' + Me.EinblendenToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.action_add_16xMD + Me.EinblendenToolStripMenuItem.Name = "EinblendenToolStripMenuItem" + Me.EinblendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.EinblendenToolStripMenuItem.Text = "Einblenden" + Me.EinblendenToolStripMenuItem.Visible = False + ' 'PictureBoxPM ' Me.PictureBoxPM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -214,8 +224,8 @@ Partial Class frmFlowForm Me.BarManager1.DockControls.Add(Me.barDockControlLeft) Me.BarManager1.DockControls.Add(Me.barDockControlRight) Me.BarManager1.Form = Me - Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.btnExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.btnRestartZooflow, Me.btnServiceConfig, Me.btnDatabaseConfig, Me.btnBasicConfig, Me.btnGlobixConfig}) - Me.BarManager1.MaxItemId = 11 + Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.btnExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.btnRestartZooflow, Me.btnServiceConfig, Me.btnDatabaseConfig, Me.btnBasicConfig, Me.btnGlobixConfig, Me.bbtnitmAusblenden}) + Me.BarManager1.MaxItemId = 12 Me.BarManager1.StatusBar = Me.Bar3 ' 'Bar3 @@ -237,7 +247,7 @@ Partial Class frmFlowForm Me.BarSubItem1.Caption = "Menu" Me.BarSubItem1.Id = 0 Me.BarSubItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarSubItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.btnBasicConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnGlobixConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnServiceConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnDatabaseConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnRestartZooflow), New DevExpress.XtraBars.LinkPersistInfo(Me.btnExitZooflow)}) + Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.btnBasicConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnGlobixConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnServiceConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnDatabaseConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnRestartZooflow), New DevExpress.XtraBars.LinkPersistInfo(Me.bbtnitmAusblenden), New DevExpress.XtraBars.LinkPersistInfo(Me.btnExitZooflow)}) Me.BarSubItem1.Name = "BarSubItem1" Me.BarSubItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' @@ -276,6 +286,13 @@ Partial Class frmFlowForm Me.btnRestartZooflow.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_refresh Me.btnRestartZooflow.Name = "btnRestartZooflow" ' + 'bbtnitmAusblenden + ' + Me.bbtnitmAusblenden.Caption = "Ausblenden" + Me.bbtnitmAusblenden.Id = 11 + Me.bbtnitmAusblenden.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmAusblenden.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitmAusblenden.Name = "bbtnitmAusblenden" + ' 'btnExitZooflow ' Me.btnExitZooflow.Caption = "Zooflow beenden" @@ -492,4 +509,6 @@ Partial Class frmFlowForm Friend WithEvents PictureEditQuicksearch1 As PictureEdit Friend WithEvents PictureEdit2 As PictureEdit Friend WithEvents Panel3 As Panel + Friend WithEvents bbtnitmAusblenden As DevExpress.XtraBars.BarButtonItem + Friend WithEvents EinblendenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 1e9efab3..1945daa6 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -2019,9 +2019,29 @@ LjYsMi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0x NiwyMGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4y LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAIDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD + MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls + bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iUGF5bWVudFVucGFpZCI+DQogICAgPHBhdGggZD0iTTE2LDJDOC4yLDIsMiw4LjIs + MiwxNnM2LjIsMTQsMTQsMTRzMTQtNi4yLDE0LTE0UzIzLjgsMiwxNiwyeiBNMTYsNmMyLDAsNCwwLjYs + NS42LDEuNkw3LjgsMjEuNCAgIEM2LjYsMjAsNiwxOCw2LDE2QzYsMTAuNCwxMC40LDYsMTYsNnogTTE2 + LDI2Yy0yLDAtNC0wLjYtNS42LTEuNmwxMy44LTEzLjhDMjUuNCwxMiwyNiwxNCwyNiwxNkMyNiwyMS42 + LDIxLjYsMjYsMTYsMjZ6IiBjbGFzcz0iUmVkIiAvPg0KICA8L2c+DQo8L3N2Zz4L - 990, 17 + 17, 56 \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index ddce3fe0..3a410b9c 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -1214,6 +1214,7 @@ Public Class frmFlowForm Finally RunningTask = Nothing SplashScreenManager.CloseOverlayForm(oHandle) + txtQuicksearch1.Text = "" End Try End If End Function @@ -1284,5 +1285,20 @@ Public Class frmFlowForm Private Async Sub PictureEditQuicksearch1_Click(sender As Object, e As EventArgs) Handles PictureEditQuicksearch1.Click Await CheckRunSearch1() End Sub + + Private Sub PictureEditQuicksearch1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEditQuicksearch1.EditValueChanged + + End Sub + + Private Sub bbtnitmAusblenden_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmAusblenden.ItemClick + UnregisterBar() + EinblendenToolStripMenuItem.Visible = True + Me.Visible = False + End Sub + + Private Sub EinblendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EinblendenToolStripMenuItem.Click + RegisterBar(ABEdge.ABE_RIGHT) + Me.Visible = True + End Sub End Class diff --git a/GUIs.ZooFlow/frmtest.Designer.vb b/GUIs.ZooFlow/frmtest.Designer.vb index cd97c4a8..cdfb0c7a 100644 --- a/GUIs.ZooFlow/frmtest.Designer.vb +++ b/GUIs.ZooFlow/frmtest.Designer.vb @@ -36,6 +36,8 @@ Partial Class frmtest Me.Label1 = New System.Windows.Forms.Label() Me.txtProfileId = New System.Windows.Forms.TextBox() Me.txtIDB_OBJ_ID = New System.Windows.Forms.TextBox() + Me.txtDoctypeID = New System.Windows.Forms.TextBox() + Me.Label3 = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'Label2 @@ -154,11 +156,29 @@ Partial Class frmtest Me.txtIDB_OBJ_ID.Size = New System.Drawing.Size(100, 20) Me.txtIDB_OBJ_ID.TabIndex = 9 ' + 'txtDoctypeID + ' + Me.txtDoctypeID.Location = New System.Drawing.Point(461, 67) + Me.txtDoctypeID.Name = "txtDoctypeID" + Me.txtDoctypeID.Size = New System.Drawing.Size(100, 20) + Me.txtDoctypeID.TabIndex = 22 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(397, 70) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(58, 13) + Me.Label3.TabIndex = 23 + Me.Label3.Text = "DoctypeID" + ' 'frmtest ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(865, 450) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.txtDoctypeID) Me.Controls.Add(Me.txtProfileId) Me.Controls.Add(Me.DateTimePicker1) Me.Controls.Add(Me.cmbObjectStoreType) @@ -192,4 +212,6 @@ Partial Class frmtest Friend WithEvents btnImportFile As Button Friend WithEvents Label1 As Label Friend WithEvents txtProfileId As TextBox + Friend WithEvents txtDoctypeID As TextBox + Friend WithEvents Label3 As Label End Class diff --git a/GUIs.ZooFlow/frmtest.vb b/GUIs.ZooFlow/frmtest.vb index 393feef3..8eac2c6a 100644 --- a/GUIs.ZooFlow/frmtest.vb +++ b/GUIs.ZooFlow/frmtest.vb @@ -37,12 +37,16 @@ Public Class frmtest New List(Of UserAttributeValue) From { New UserAttributeValue With { .Name = "Attribut String1", - .Values = New List(Of String) From {"SchreiberM"}.ToArray + .Values = New List(Of String) From {"Harry"}.ToArray + }, + New UserAttributeValue With { + .Name = "DisplayFileName", + .Values = New List(Of String) From {"DN Textdokument"}.ToArray } }, - "WORK", + "Work", "DOC", - "DEFAULT" + txtDoctypeID.Text ) If oResponse.OK Then diff --git a/Modules.EDMIAPI/Client.vb b/Modules.EDMIAPI/Client.vb index 3ea33c20..4ab2ba5b 100644 --- a/Modules.EDMIAPI/Client.vb +++ b/Modules.EDMIAPI/Client.vb @@ -254,6 +254,23 @@ Public Class Client End Try End Function + Public Async Function FileImporter_ImportFileAsync( + pFilePath As String, + pAttributeValues As List(Of UserAttributeValue), + pObjectStoreName As String, + pObjectKind 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, 9999, pAttributeValues, pObjectStoreName, pObjectKind, pIDBDoctypeId, pImportOptions) + + Catch ex As Exception + Logger.Error(ex) + Return Nothing + + End Try + End Function Public Function Zooflow_GetFileObject(pObjectId As Long, pLoadFileContents As Boolean) As FileObject Try