diff --git a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb index a5d46b7e..c5dafb4c 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb +++ b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb @@ -127,7 +127,7 @@ Partial Class Form1 Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarMdiChildrenListItem1) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemTextEdit3, Me.RepositoryItemTextEdit4}) - Me.RibbonControl1.Size = New System.Drawing.Size(1093, 157) + Me.RibbonControl1.Size = New System.Drawing.Size(1093, 159) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'ButtonSelectFiles @@ -175,6 +175,7 @@ Partial Class Form1 'ButtonLoadFile ' Me.ButtonLoadFile.Caption = "Load File" + Me.ButtonLoadFile.Enabled = False Me.ButtonLoadFile.Id = 6 Me.ButtonLoadFile.ImageOptions.SvgImage = CType(resources.GetObject("ButtonLoadFile.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.ButtonLoadFile.Name = "ButtonLoadFile" @@ -190,6 +191,7 @@ Partial Class Form1 'BarButtonItem2 ' Me.BarButtonItem2.Caption = "List Files" + Me.BarButtonItem2.Enabled = False Me.BarButtonItem2.Id = 9 Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem2.Name = "BarButtonItem2" @@ -383,11 +385,11 @@ Partial Class Form1 Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("12b5eead-07cc-48c6-93a4-85cd0b4b82ce") - Me.DockPanel1.Location = New System.Drawing.Point(0, 157) + Me.DockPanel1.Location = New System.Drawing.Point(0, 159) Me.DockPanel1.Name = "DockPanel1" Me.DockPanel1.Options.ShowCloseButton = False Me.DockPanel1.OriginalSize = New System.Drawing.Size(297, 200) - Me.DockPanel1.Size = New System.Drawing.Size(297, 458) + Me.DockPanel1.Size = New System.Drawing.Size(297, 456) Me.DockPanel1.Text = "Files to Upload" ' 'DockPanel1_Container @@ -395,31 +397,27 @@ Partial Class Form1 Me.DockPanel1_Container.Controls.Add(Me.listboxFiles) Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(290, 409) + Me.DockPanel1_Container.Size = New System.Drawing.Size(290, 407) Me.DockPanel1_Container.TabIndex = 0 ' 'listboxFiles ' - Me.listboxFiles.DataSource = Me.BindingSource1 Me.listboxFiles.Dock = System.Windows.Forms.DockStyle.Fill Me.listboxFiles.Location = New System.Drawing.Point(0, 0) Me.listboxFiles.Name = "listboxFiles" - Me.listboxFiles.Size = New System.Drawing.Size(290, 409) + Me.listboxFiles.Size = New System.Drawing.Size(290, 407) Me.listboxFiles.TabIndex = 1 ' - 'BindingSource1 - ' - ' 'DockPanel2 ' Me.DockPanel2.Controls.Add(Me.DockPanel2_Container) Me.DockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right Me.DockPanel2.ID = New System.Guid("e82850af-b594-49e9-ae83-36d4bf007da5") - Me.DockPanel2.Location = New System.Drawing.Point(893, 157) + Me.DockPanel2.Location = New System.Drawing.Point(893, 159) Me.DockPanel2.Name = "DockPanel2" Me.DockPanel2.Options.ShowCloseButton = False Me.DockPanel2.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel2.Size = New System.Drawing.Size(200, 458) + Me.DockPanel2.Size = New System.Drawing.Size(200, 456) Me.DockPanel2.Text = "Document Viewer" ' 'DockPanel2_Container @@ -427,7 +425,7 @@ Partial Class Form1 Me.DockPanel2_Container.Controls.Add(Me.DocumentViewer1) Me.DockPanel2_Container.Location = New System.Drawing.Point(4, 46) Me.DockPanel2_Container.Name = "DockPanel2_Container" - Me.DockPanel2_Container.Size = New System.Drawing.Size(193, 409) + Me.DockPanel2_Container.Size = New System.Drawing.Size(193, 407) Me.DockPanel2_Container.TabIndex = 0 ' 'DocumentViewer1 @@ -436,7 +434,7 @@ Partial Class Form1 Me.DocumentViewer1.FileLoaded = False Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Name = "DocumentViewer1" - Me.DocumentViewer1.Size = New System.Drawing.Size(193, 409) + Me.DocumentViewer1.Size = New System.Drawing.Size(193, 407) Me.DocumentViewer1.TabIndex = 0 ' 'DockPanel4 @@ -458,7 +456,7 @@ Partial Class Form1 Me.DockPanel4_Container.Controls.Add(Me.GridControl1) Me.DockPanel4_Container.Location = New System.Drawing.Point(0, 0) Me.DockPanel4_Container.Name = "DockPanel4_Container" - Me.DockPanel4_Container.Size = New System.Drawing.Size(590, 426) + Me.DockPanel4_Container.Size = New System.Drawing.Size(590, 424) Me.DockPanel4_Container.TabIndex = 0 ' 'GridControl1 @@ -469,7 +467,7 @@ Partial Class Form1 Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(590, 426) + Me.GridControl1.Size = New System.Drawing.Size(590, 424) Me.GridControl1.TabIndex = 5 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -507,8 +505,8 @@ Partial Class Form1 Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1093, 664) - Me.Controls.Add(Me.DockPanel1) Me.Controls.Add(Me.DockPanel2) + Me.Controls.Add(Me.DockPanel1) Me.Controls.Add(Me.hideContainerBottom) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) diff --git a/GUIs.Test.EDMIBenchmark/Form1.resx b/GUIs.Test.EDMIBenchmark/Form1.resx index 96070a10..7d14a195 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.resx +++ b/GUIs.Test.EDMIBenchmark/Form1.resx @@ -335,12 +335,12 @@ 159 - - 316, 17 - 176, 18 + + 316, 17 + 453, 17 diff --git a/GUIs.Test.EDMIBenchmark/Form1.vb b/GUIs.Test.EDMIBenchmark/Form1.vb index f4f9fc13..3a7c7d4f 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.vb +++ b/GUIs.Test.EDMIBenchmark/Form1.vb @@ -61,8 +61,9 @@ Public Class Form1 AddLogMessage($"Importing {oFileInfo.Name}... ({FormatBytes(oFileInfo.Length)})") - 'Dim oObjectId As Long = Await _Client.ImportFileAsync(oFileInfo.FullName, "WichtigesDokument", 1, 0) - 'AddLogMessage($"File with Id [{oObjectId}] imported!") + Dim oObjectId As Long = Await _Client.NewFileAsync(oFileInfo.FullName, "Work", "DOC", "DEFAULT", + New Client.NewFileOptions With {.Username = Environment.UserName}) + AddLogMessage($"File with Id [{oObjectId}] imported!") oCountFiles += 1 oSW.Stop() AddLogMessage($"Import Time: {FormatTime(oSW.ElapsedMilliseconds)}") @@ -145,81 +146,79 @@ Public Class Form1 End Try End Sub - Private Async Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick - Try - Dim oResult As Client.FileList = Await _Client.ListFilesForUserAsync() - Dim oParams As New DocumentResultParams() With { - .Results = New List(Of DocumentResult) From { - New DocumentResult() With {.Title = "lol", .Datatable = oResult.Datatable} - }, - .WindowGuid = "1", - .ColumnNames = New ColumnNames() With { - .FilenameColumn = "FILENAME_EXT", - .FullPathColumn = "FULL_PATH", - .ObjectIdColumn = "IDB_OBJ_ID" - } - } - Dim oEnv As New DigitalData.Modules.ZooFlow.Environment() With { - .Service = New ServiceState() With { - .IsActive = True, - .Address = "172.24.12.39:9000" - }, - .Settings = New SettingsState With { - .GdPictureKey = "21182889975216572111813147150675976632" - }, - .User = New UserState() With { - .UserId = 2 - } - } - Dim oForm As New frmDocumentResultList(_LogConfig, oEnv, oParams) - oForm.Show() - Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!") - End Try - End Sub + 'Private Async Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + ' Try + ' Dim oResult As Client.FileList = Await _Client.ListFilesForUserAsync() + ' Dim oParams As New DocumentResultParams() With { + ' .Results = New List(Of DocumentResult) From { + ' New DocumentResult() With {.Title = "lol", .Datatable = oResult.Datatable} + ' }, + ' .WindowGuid = "1", + ' .ColumnNames = New ColumnNames() With { + ' .FilenameColumn = "FILENAME_EXT", + ' .FullPathColumn = "FULL_PATH", + ' .ObjectIdColumn = "IDB_OBJ_ID" + ' } + ' } + ' Dim oEnv As New DigitalData.Modules.ZooFlow.Environment() With { + ' .Service = New ServiceState() With { + ' .IsActive = True, + ' .Address = "172.24.12.39:9000" + ' }, + ' .Settings = New SettingsState With { + ' .GdPictureKey = "21182889975216572111813147150675976632" + ' }, + ' .User = New UserState(2) + ' } + ' Dim oForm As New frmDocumentResultList(_LogConfig, oEnv, oParams) + ' oForm.Show() + ' Catch ex As Exception + ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!") + ' End Try + 'End Sub - Private Async Sub BindingSource1_CurrentChanged(sender As Object, e As EventArgs) Handles BindingSource1.CurrentChanged - Dim oRow As DataRow = GridView1.GetFocusedDataRow() + 'Private Async Sub BindingSource1_CurrentChanged(sender As Object, e As EventArgs) Handles BindingSource1.CurrentChanged + ' Dim oRow As DataRow = GridView1.GetFocusedDataRow() - If oRow Is Nothing Then - Exit Sub - End If + ' If oRow Is Nothing Then + ' Exit Sub + ' End If - Try - Dim oSWTotal As New Stopwatch() - oSWTotal.Start() + ' Try + ' Dim oSWTotal As New Stopwatch() + ' oSWTotal.Start() - Dim oObjectId As Long = oRow.Item("IDB_OBJ_ID") - Dim oResponse As Client.StreamedFile = Await _Client.GetFileByObjectIdAsync(oObjectId) + ' Dim oObjectId As Long = oRow.Item("IDB_OBJ_ID") + ' Dim oResponse As Client.StreamedFile = Await _Client.GetFileByObjectIdAsync(oObjectId) - DocumentViewer1.LoadFile(oResponse.FileName, oResponse.Stream) + ' DocumentViewer1.LoadFile(oResponse.FileName, oResponse.Stream) - oSWTotal.Stop() - AddLogMessage($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]") - Catch ex As FaultException - MsgBox(ex.Reason.ToString, MsgBoxStyle.Critical, "Error from Service") - Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!") - End Try - End Sub + ' oSWTotal.Stop() + ' AddLogMessage($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]") + ' Catch ex As FaultException + ' MsgBox(ex.Reason.ToString, MsgBoxStyle.Critical, "Error from Service") + ' Catch ex As Exception + ' MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!") + ' End Try + 'End Sub - Private Async Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick - Try - Dim oSWTotal As New Stopwatch() - oSWTotal.Start() + 'Private Async Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick + ' Try + ' Dim oSWTotal As New Stopwatch() + ' oSWTotal.Start() - Dim oObjectId As Integer = TextboxObjectId.EditValue + ' Dim oObjectId As Integer = TextboxObjectId.EditValue - Dim oResponse As Client.StreamedFile = Await _Client.GetFileByObjectIdAsync(oObjectId) + ' Dim oResponse As Client.StreamedFile = Await _Client.GetFileByObjectIdAsync(oObjectId) - DocumentViewer1.LoadFile(oResponse.FileName, oResponse.Stream) + ' DocumentViewer1.LoadFile(oResponse.FileName, oResponse.Stream) - oSWTotal.Stop() - AddLogMessage($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]") - Catch ex As Exception - AddLogMessage($"Error while getting file: [{ex.Message}]") - End Try - End Sub + ' oSWTotal.Stop() + ' AddLogMessage($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]") + ' Catch ex As Exception + ' AddLogMessage($"Error while getting file: [{ex.Message}]") + ' End Try + 'End Sub Private Sub BarToggleSwitchItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarToggleSwitchItem1.CheckedChanged If BarToggleSwitchItem1.Checked Then