diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index c91db4eb..ae901f75 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -187,9 +187,9 @@ VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb My.Resources Designer + Resources.Designer.vb ctrlObjectPropertyDialog.vb @@ -386,5 +386,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/My Project/Resources.resx b/GUIs.Common/My Project/Resources.resx index 162cdbc7..cff44005 100644 --- a/GUIs.Common/My Project/Resources.resx +++ b/GUIs.Common/My Project/Resources.resx @@ -145,9 +145,6 @@ ..\Resources\ZooFlow-Vergroessern.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 - ..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,8 +157,11 @@ ..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,12 +169,15 @@ ..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -202,17 +205,14 @@ ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -232,13 +232,13 @@ ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\business_world.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\Article_32x32.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.Common/My Project/licenses.licx b/GUIs.Common/My Project/licenses.licx index f75c037a..e22582e6 100644 --- a/GUIs.Common/My Project/licenses.licx +++ b/GUIs.Common/My Project/licenses.licx @@ -1,12 +1,13 @@ -DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Common/frmWorkflow_Adhoc_start.vb b/GUIs.Common/frmWorkflow_Adhoc_start.vb index d01f2b14..8bd31ce5 100644 --- a/GUIs.Common/frmWorkflow_Adhoc_start.vb +++ b/GUIs.Common/frmWorkflow_Adhoc_start.vb @@ -12,12 +12,14 @@ Public Class frmWorkflow_Adhoc_start Private ReadOnly Property Logger As Logger Private Property OperationMode As OperationMode Private ReadOnly Environment As Environment + Private ReadOnly AdHocWorkflow As AdHocWorkflow Private Client As Client Private IsLoading As Boolean = True - Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pObjectID As Long) + Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pAdhocWorkflow As AdHocWorkflow) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() - + Environment = pEnvironment + AdHocWorkflow = pAdhocWorkflow LogConfig = pLogConfig Logger = pLogConfig.GetLogger() End Sub diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 7c577ed8..24b4c676 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -40,6 +40,7 @@ Public Class ClassInit _Loader.AddStep("Initializing EDMI Service", AddressOf InitializeService, True) _Loader.AddStep("Initializing Database", AddressOf InitializeDatabaseWithFallback, True) _Loader.AddStep("Initializing User", AddressOf InitializeUser, True) + _Loader.AddStep("Initializing BasicCatalogues", AddressOf InitializeBasicsfromDB, True) _Loader.AddStep("Initializing Language", AddressOf InitializeLanguage, False) _Loader.AddStep("Initializing 3rd-party licenses", AddressOf Initialize3rdParty, False) _Loader.AddStep("Initializing Basic Config", AddressOf InitBasicConfig, False) @@ -193,6 +194,31 @@ Public Class ClassInit Throw New InitException($"Unexpected error while initializing user!", ex) End Try End Sub + Private Sub InitializeBasicsfromDB(MyApplication As My.MyApplication) + Try + Dim oSql As String = My.Queries.Common.IDB_CATALOG() + Dim oDatatable As DataTable = My.Database.GetDatatableIDB(oSql) + For Each oRow As DataRow In oDatatable.Rows + Dim oCAT_TITLE As String = oRow.Item("CAT_TITLE") + + Select Case oCAT_TITLE + Case "AHWF_CMD_USR_SELECT" + AHWF_CMD_USR_SELECT = oRow.Item("CAT_STRING") + Case "AHWF_CMD_LAYOUT_SELECT" + AHWF_CMD_LAYOUT_SELECT = oRow.Item("CAT_STRING") + + End Select + Next + + Catch ex As InitException + Logger.Error(ex) + Throw ex + + Catch ex As Exception + Logger.Error(ex) + Throw New InitException($"Unexpected error while initializing basics from DB!", ex) + End Try + End Sub Private Sub InitializeLanguage(MyApplication As My.MyApplication) Dim oLanguage = MyApplication.User.Language Dim oDateFormat = MyApplication.User.DateFormat diff --git a/GUIs.ZooFlow/MyApplication.vb b/GUIs.ZooFlow/MyApplication.vb index 6b07924f..da847c64 100644 --- a/GUIs.ZooFlow/MyApplication.vb +++ b/GUIs.ZooFlow/MyApplication.vb @@ -72,6 +72,13 @@ Namespace My .User = My.Application.User } End Function + Public Function GetAdHocWorkflow(pObjectID As Long) As AdHocWorkflow + Return New AdHocWorkflow With { + .AHWF_CMD_LAYOUT_SELECT = AHWF_CMD_LAYOUT_SELECT, + .AHWF_CMD_USR_SELECT = AHWF_CMD_USR_SELECT, + .OBJECT_ID = pObjectID + } + End Function End Class End Namespace diff --git a/GUIs.ZooFlow/Queries/ClassCommonQueries.vb b/GUIs.ZooFlow/Queries/ClassCommonQueries.vb index ec6f94f0..b710e69e 100644 --- a/GUIs.ZooFlow/Queries/ClassCommonQueries.vb +++ b/GUIs.ZooFlow/Queries/ClassCommonQueries.vb @@ -10,4 +10,7 @@ Public Function FNIDB_GET_SEARCH_PROFILES(UserId As Integer, UserLanguage As String) As String Return String.Format("SELECT * FROM [dbo].[FNIDB_GET_SEARCH_PROFILES] ({0},'{1}')", UserId, UserLanguage) End Function + Public Function IDB_CATALOG() As String + Return String.Format("SELECT * FROM TBIDB_CATALOG") + End Function End Class diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index e509c311..1919b7e5 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -770,12 +770,6 @@ - - - - - - diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 1d969d59..83c48a80 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -38,7 +38,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.TimerRefreshData = New System.Windows.Forms.Timer(Me.components) + Me.TimerRefreshSidebarData = New System.Windows.Forms.Timer(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxSearch = New DevExpress.XtraEditors.SvgImageBox() @@ -73,9 +73,9 @@ Partial Class frmFlowForm Me.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() Me.colPrimary = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.colSecondary = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() Me.AdornerUIManager1 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components) Me.TaskBadge = New DevExpress.Utils.VisualEffects.Badge() - Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() Me.ContextMenuSystray.SuspendLayout() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit() @@ -156,6 +156,10 @@ Partial Class frmFlowForm Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' + 'TimerRefreshSidebarData + ' + Me.TimerRefreshSidebarData.Interval = 10000 + ' 'PictureBoxPM ' Me.PictureBoxPM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -481,6 +485,18 @@ Partial Class frmFlowForm Me.colSecondary.RowIndex = 1 Me.colSecondary.Visible = True ' + 'LabelControl1 + ' + Me.LabelControl1.Anchor = System.Windows.Forms.AnchorStyles.Bottom + Me.LabelControl1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelControl1.Appearance.Options.UseFont = True + Me.LabelControl1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None + Me.LabelControl1.Location = New System.Drawing.Point(21, 222) + Me.LabelControl1.Name = "LabelControl1" + Me.LabelControl1.Size = New System.Drawing.Size(158, 18) + Me.LabelControl1.TabIndex = 0 + Me.LabelControl1.Text = "Zuletzt bearbeitet" + ' 'AdornerUIManager1 ' Me.AdornerUIManager1.Elements.Add(Me.TaskBadge) @@ -497,18 +513,6 @@ Partial Class frmFlowForm Me.TaskBadge.TargetElement = Me.PictureBoxPM Me.TaskBadge.TargetElementRegion = DevExpress.Utils.VisualEffects.TargetElementRegion.Control ' - 'LabelControl1 - ' - Me.LabelControl1.Anchor = System.Windows.Forms.AnchorStyles.Bottom - Me.LabelControl1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelControl1.Appearance.Options.UseFont = True - Me.LabelControl1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None - Me.LabelControl1.Location = New System.Drawing.Point(21, 222) - Me.LabelControl1.Name = "LabelControl1" - Me.LabelControl1.Size = New System.Drawing.Size(158, 18) - Me.LabelControl1.TabIndex = 0 - Me.LabelControl1.Text = "Zuletzt bearbeitet" - ' 'frmFlowForm ' Me.AllowDrop = True @@ -553,7 +557,7 @@ Partial Class frmFlowForm Friend WithEvents ContextMenuSystray As ContextMenuStrip Friend WithEvents VerwaltungToolStripMenuItem As ToolStripMenuItem Friend WithEvents ZooFlowBeendenToolStripMenuItem As ToolStripMenuItem - Friend WithEvents TimerRefreshData As Timer + Friend WithEvents TimerRefreshSidebarData As Timer Friend WithEvents ToolTip1 As ToolTip Friend WithEvents ToolStripSeparator1 As ToolStripSeparator Friend WithEvents TimerFolderwatch As Timer diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 8ce010c1..a6c59f48 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1956,17 +1956,17 @@ AMADAADwDwAA - + 468, 17 - 617, 17 + 658, 17 - 716, 17 + 757, 17 - 865, 17 + 906, 17 @@ -2042,6 +2042,6 @@ - 990, 17 + 1031, 17 \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 19aa1698..9613bb73 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -72,6 +72,7 @@ Public Class frmFlowForm ABN_FULLSCREENAPP ABN_WINDOWARRANGE End Enum + Public LOAD_SIDEBAR_DATA As Boolean = False #End Region #Region "Sidebar Enum Properties Register" Protected Overrides Sub WndProc(ByRef m As System.Windows.Forms.Message) @@ -242,8 +243,8 @@ Public Class frmFlowForm End If ' === Setup Timers === - AddHandler TimerRefreshData.Tick, AddressOf TimerRefreshData_Tick - TimerRefreshData.Enabled = True + AddHandler TimerRefreshSidebarData.Tick, AddressOf TimerRefreshSidebarData_Tick + TimerRefreshSidebarData.Enabled = True ' === Setup Event Handlers === AddHandler KeyDown, AddressOf frmFlowForm_KeyDown @@ -259,12 +260,7 @@ Public Class frmFlowForm End If Next - Dim oSql = $"SELECT TOP 10 * FROM VWIDB_DOCRESULT_DE WHERE [Changed who] = '{My.Application.User.UserName}' ORDER BY [Changed when] DESC" - Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(oSql) - - GridControl1.DataSource = AccessedFilesTable - colPrimary.FieldName = "DisplayFileName" - colSecondary.FieldName = "Changed when" + Load_Recent_Files If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then Try @@ -395,7 +391,18 @@ Public Class frmFlowForm SHAppBarMessage(ABMsg.ABM_REMOVE, AppDeskData) End If End Sub + Async Sub Load_Recent_Files() + Try + Dim oSql = $"SELECT TOP 10 * FROM VWIDB_DOCRESULT_DE WHERE [Changed who] = '{My.Application.User.UserName}' ORDER BY [Changed when] DESC" + Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(oSql) + GridControl1.DataSource = AccessedFilesTable + colPrimary.FieldName = "DisplayFileName" + colSecondary.FieldName = "Changed when" + Catch ex As Exception + ShowErrorMessage(ex) + End Try + End Sub Public Sub Init_Folderwatch() Try Dim oSql As String = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & My.Application.User.UserId @@ -463,10 +470,6 @@ Public Class frmFlowForm End Sub - Private Sub TimerRefreshData_Tick(sender As Object, e As EventArgs) - 'TODO: Refresh Data - End Sub - Private Sub frmFlowForm_KeyDown(ByVal sender As Object, ByVal e As KeyEventArgs) If e.KeyCode = Keys.Escape Then If RunningTask IsNot Nothing Then @@ -542,8 +545,8 @@ Public Class frmFlowForm Private Sub frmFlowForm_DragEnter(sender As Object, e As DragEventArgs) Handles MyBase.DragEnter If My.Application.GlobixDropAreaStyle = "PROGRESSIVE" Then - 'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3 - PictureEdit2.Image = My.Resources.ZooFlow_drop_drag + PictureEdit2.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3 + 'PictureEdit2.Image = My.Resources.ZooFlow_drop_drag Else 'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP2 PictureEdit2.Image = My.Resources.ZooFlow_drop_drag @@ -1242,5 +1245,12 @@ Public Class frmFlowForm End Try End If End Sub + + Private Sub TimerRefreshSidebarData_Tick(sender As Object, e As EventArgs) Handles TimerRefreshSidebarData.Tick + If LOAD_SIDEBAR_DATA = True Then + Load_Recent_Files() + End If + + End Sub End Class diff --git a/GUIs.ZooFlow/frmtest.Designer.vb b/GUIs.ZooFlow/frmtest.Designer.vb index 9911b47e..3f0f49b2 100644 --- a/GUIs.ZooFlow/frmtest.Designer.vb +++ b/GUIs.ZooFlow/frmtest.Designer.vb @@ -39,6 +39,7 @@ Partial Class frmtest Me.txtDoctypeID = New System.Windows.Forms.TextBox() Me.Label3 = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() + Me.txtObjectID = New System.Windows.Forms.TextBox() Me.SuspendLayout() ' 'Label2 @@ -182,11 +183,19 @@ Partial Class frmtest Me.Button1.Text = "AdhocWorkflow" Me.Button1.UseVisualStyleBackColor = True ' + 'txtObjectID + ' + Me.txtObjectID.Location = New System.Drawing.Point(174, 193) + Me.txtObjectID.Name = "txtObjectID" + Me.txtObjectID.Size = New System.Drawing.Size(118, 20) + Me.txtObjectID.TabIndex = 25 + ' '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.txtObjectID) Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.txtDoctypeID) @@ -226,4 +235,5 @@ Partial Class frmtest Friend WithEvents txtDoctypeID As TextBox Friend WithEvents Label3 As Label Friend WithEvents Button1 As Button + Friend WithEvents txtObjectID As TextBox End Class diff --git a/GUIs.ZooFlow/frmtest.vb b/GUIs.ZooFlow/frmtest.vb index aeb00231..513db025 100644 --- a/GUIs.ZooFlow/frmtest.vb +++ b/GUIs.ZooFlow/frmtest.vb @@ -5,10 +5,12 @@ Imports DigitalData.Modules.ZooFlow Public Class frmtest Private Property Environment As Environment + Private Property AdHoc_Workflow As AdHocWorkflow Private Sub frmtest_Load(sender As Object, e As EventArgs) Handles MyBase.Load cmbObjectStoreType.SelectedIndex = 0 Environment = My.Application.GetEnvironment() + End Sub Private Sub btnOpenFile_Click(sender As Object, e As EventArgs) Handles btnOpenFile.Click @@ -73,7 +75,8 @@ Public Class frmtest End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click - Dim oForm As New frmWorkflow_Adhoc_start(My.LogConfig, Environment, 4711) + AdHoc_Workflow = My.Application.GetAdHocWorkflow(txtObjectID.Text) + Dim oForm As New frmWorkflow_Adhoc_start(My.LogConfig, Environment, AdHoc_Workflow) oForm.Show() oForm.BringToFront() oForm.Focus() diff --git a/GUIs.ZooFlow/modCurrent.vb b/GUIs.ZooFlow/modCurrent.vb index a2849bfd..8a121489 100644 --- a/GUIs.ZooFlow/modCurrent.vb +++ b/GUIs.ZooFlow/modCurrent.vb @@ -11,5 +11,7 @@ Module modCurrent Public Property NI_TYPE As String = "INFO" Public Property GLOBIX_JUMP_DOCTYPE_ID As Integer + Public Property AHWF_CMD_USR_SELECT As String + Public Property AHWF_CMD_LAYOUT_SELECT As String Public Property DocResultBaseSearch As String End Module diff --git a/Modules.ZooFlow/AdHocWorkflow.vb b/Modules.ZooFlow/AdHocWorkflow.vb new file mode 100644 index 00000000..3eaf8d28 --- /dev/null +++ b/Modules.ZooFlow/AdHocWorkflow.vb @@ -0,0 +1,5 @@ +Public Class AdHocWorkflow + Public Property AHWF_CMD_LAYOUT_SELECT As String + Public Property AHWF_CMD_USR_SELECT As String + Public Property OBJECT_ID As Long +End Class diff --git a/Modules.ZooFlow/My Project/AssemblyInfo.vb b/Modules.ZooFlow/My Project/AssemblyInfo.vb index 4303e3f0..bab052d6 100644 --- a/Modules.ZooFlow/My Project/AssemblyInfo.vb +++ b/Modules.ZooFlow/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/Modules.ZooFlow/ZooFlow.vbproj b/Modules.ZooFlow/ZooFlow.vbproj index c5ea896f..3184ff3c 100644 --- a/Modules.ZooFlow/ZooFlow.vbproj +++ b/Modules.ZooFlow/ZooFlow.vbproj @@ -74,6 +74,7 @@ +