This commit is contained in:
SchreiberM 2022-05-02 08:57:22 +02:00
parent 962daff669
commit ce87ce9376
17 changed files with 153 additions and 73 deletions

View File

@ -187,9 +187,9 @@
<EmbeddedResource Include="My Project\licenses.licx" /> <EmbeddedResource Include="My Project\licenses.licx" />
<EmbeddedResource Include="My Project\Resources.resx"> <EmbeddedResource Include="My Project\Resources.resx">
<Generator>VbMyResourcesResXFileCodeGenerator</Generator> <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
<CustomToolNamespace>My.Resources</CustomToolNamespace> <CustomToolNamespace>My.Resources</CustomToolNamespace>
<SubType>Designer</SubType> <SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.vb</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="ObjectPropertyDialog\ctrlObjectPropertyDialog.resx"> <EmbeddedResource Include="ObjectPropertyDialog\ctrlObjectPropertyDialog.resx">
<DependentUpon>ctrlObjectPropertyDialog.vb</DependentUpon> <DependentUpon>ctrlObjectPropertyDialog.vb</DependentUpon>
@ -386,5 +386,17 @@
<ItemGroup> <ItemGroup>
<None Include="Resources\business_world.svg" /> <None Include="Resources\business_world.svg" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Resources\ZooFlow_Sidebar_TOP_Drop.svg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\ZooFlow_Sidebar_TOP_Drop_HOT.svg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\ZooFlow_Sidebar_TOP_Drop.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\ZooFlow_Sidebar_TOP_Drop_HOT.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project> </Project>

View File

@ -145,9 +145,6 @@
<data name="ZooFlow-Vergroessern" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="ZooFlow-Vergroessern" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </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>
</data>
<data name="Open_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Open_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
@ -160,8 +157,11 @@
<data name="jpg" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="jpg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="editcolors" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="insertpagecount" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="ppt" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="ppt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -169,12 +169,15 @@
<data name="copy" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="zoom_more" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="refreshallpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="refreshallpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="insertpagecount" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="enablescrolling" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="enablescrolling" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
@ -202,17 +205,14 @@
<data name="tiff" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="tiff" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="columnheaders" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="columnheaders" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="_page" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="editcolors" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -232,13 +232,13 @@
<data name="save1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="save1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="zoom_more" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="Article_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="business_world" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="business_world" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\business_world.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>..\Resources\business_world.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="Article_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

View File

@ -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.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.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.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.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

View File

@ -12,12 +12,14 @@ Public Class frmWorkflow_Adhoc_start
Private ReadOnly Property Logger As Logger Private ReadOnly Property Logger As Logger
Private Property OperationMode As OperationMode Private Property OperationMode As OperationMode
Private ReadOnly Environment As Environment Private ReadOnly Environment As Environment
Private ReadOnly AdHocWorkflow As AdHocWorkflow
Private Client As Client Private Client As Client
Private IsLoading As Boolean = True 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. ' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent() InitializeComponent()
Environment = pEnvironment
AdHocWorkflow = pAdhocWorkflow
LogConfig = pLogConfig LogConfig = pLogConfig
Logger = pLogConfig.GetLogger() Logger = pLogConfig.GetLogger()
End Sub End Sub

View File

@ -40,6 +40,7 @@ Public Class ClassInit
_Loader.AddStep("Initializing EDMI Service", AddressOf InitializeService, True) _Loader.AddStep("Initializing EDMI Service", AddressOf InitializeService, True)
_Loader.AddStep("Initializing Database", AddressOf InitializeDatabaseWithFallback, True) _Loader.AddStep("Initializing Database", AddressOf InitializeDatabaseWithFallback, True)
_Loader.AddStep("Initializing User", AddressOf InitializeUser, 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 Language", AddressOf InitializeLanguage, False)
_Loader.AddStep("Initializing 3rd-party licenses", AddressOf Initialize3rdParty, False) _Loader.AddStep("Initializing 3rd-party licenses", AddressOf Initialize3rdParty, False)
_Loader.AddStep("Initializing Basic Config", AddressOf InitBasicConfig, 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) Throw New InitException($"Unexpected error while initializing user!", ex)
End Try End Try
End Sub 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) Private Sub InitializeLanguage(MyApplication As My.MyApplication)
Dim oLanguage = MyApplication.User.Language Dim oLanguage = MyApplication.User.Language
Dim oDateFormat = MyApplication.User.DateFormat Dim oDateFormat = MyApplication.User.DateFormat

View File

@ -72,6 +72,13 @@ Namespace My
.User = My.Application.User .User = My.Application.User
} }
End Function 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 Class
End Namespace End Namespace

View File

@ -10,4 +10,7 @@
Public Function FNIDB_GET_SEARCH_PROFILES(UserId As Integer, UserLanguage As String) As String 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) Return String.Format("SELECT * FROM [dbo].[FNIDB_GET_SEARCH_PROFILES] ({0},'{1}')", UserId, UserLanguage)
End Function End Function
Public Function IDB_CATALOG() As String
Return String.Format("SELECT * FROM TBIDB_CATALOG")
End Function
End Class End Class

View File

@ -770,12 +770,6 @@
<ItemGroup> <ItemGroup>
<None Include="Resources\1_LOGO_ZOO_FLOW1.png" /> <None Include="Resources\1_LOGO_ZOO_FLOW1.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="Resources\1_LOGO_ZOO_FLOW_DROP2.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\1_LOGO_ZOO_FLOW_DROP3.png" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Resources\2_ZOO_FLOW_Abo.png" /> <None Include="Resources\2_ZOO_FLOW_Abo.png" />
</ItemGroup> </ItemGroup>

View File

@ -38,7 +38,7 @@ Partial Class frmFlowForm
Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() 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.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox()
Me.PictureBoxSearch = 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.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
Me.colPrimary = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.colPrimary = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn()
Me.colSecondary = 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.AdornerUIManager1 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components)
Me.TaskBadge = New DevExpress.Utils.VisualEffects.Badge() Me.TaskBadge = New DevExpress.Utils.VisualEffects.Badge()
Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl()
Me.ContextMenuSystray.SuspendLayout() Me.ContextMenuSystray.SuspendLayout()
CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBoxSearch, 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.Size = New System.Drawing.Size(169, 22)
Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
' '
'TimerRefreshSidebarData
'
Me.TimerRefreshSidebarData.Interval = 10000
'
'PictureBoxPM 'PictureBoxPM
' '
Me.PictureBoxPM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) 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.RowIndex = 1
Me.colSecondary.Visible = True 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 'AdornerUIManager1
' '
Me.AdornerUIManager1.Elements.Add(Me.TaskBadge) Me.AdornerUIManager1.Elements.Add(Me.TaskBadge)
@ -497,18 +513,6 @@ Partial Class frmFlowForm
Me.TaskBadge.TargetElement = Me.PictureBoxPM Me.TaskBadge.TargetElement = Me.PictureBoxPM
Me.TaskBadge.TargetElementRegion = DevExpress.Utils.VisualEffects.TargetElementRegion.Control 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 'frmFlowForm
' '
Me.AllowDrop = True Me.AllowDrop = True
@ -553,7 +557,7 @@ Partial Class frmFlowForm
Friend WithEvents ContextMenuSystray As ContextMenuStrip Friend WithEvents ContextMenuSystray As ContextMenuStrip
Friend WithEvents VerwaltungToolStripMenuItem As ToolStripMenuItem Friend WithEvents VerwaltungToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ZooFlowBeendenToolStripMenuItem As ToolStripMenuItem Friend WithEvents ZooFlowBeendenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents TimerRefreshData As Timer Friend WithEvents TimerRefreshSidebarData As Timer
Friend WithEvents ToolTip1 As ToolTip Friend WithEvents ToolTip1 As ToolTip
Friend WithEvents ToolStripSeparator1 As ToolStripSeparator Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
Friend WithEvents TimerFolderwatch As Timer Friend WithEvents TimerFolderwatch As Timer

View File

@ -1956,17 +1956,17 @@
AMADAADwDwAA AMADAADwDwAA
</value> </value>
</data> </data>
<metadata name="TimerRefreshData.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TimerRefreshSidebarData.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>468, 17</value> <value>468, 17</value>
</metadata> </metadata>
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>617, 17</value> <value>658, 17</value>
</metadata> </metadata>
<metadata name="TimerFolderwatch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TimerFolderwatch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>716, 17</value> <value>757, 17</value>
</metadata> </metadata>
<metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>865, 17</value> <value>906, 17</value>
</metadata> </metadata>
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /> <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="BarSubItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="BarSubItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -2042,6 +2042,6 @@
</value> </value>
</data> </data>
<metadata name="AdornerUIManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="AdornerUIManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>990, 17</value> <value>1031, 17</value>
</metadata> </metadata>
</root> </root>

View File

@ -72,6 +72,7 @@ Public Class frmFlowForm
ABN_FULLSCREENAPP ABN_FULLSCREENAPP
ABN_WINDOWARRANGE ABN_WINDOWARRANGE
End Enum End Enum
Public LOAD_SIDEBAR_DATA As Boolean = False
#End Region #End Region
#Region "Sidebar Enum Properties Register" #Region "Sidebar Enum Properties Register"
Protected Overrides Sub WndProc(ByRef m As System.Windows.Forms.Message) Protected Overrides Sub WndProc(ByRef m As System.Windows.Forms.Message)
@ -242,8 +243,8 @@ Public Class frmFlowForm
End If End If
' === Setup Timers === ' === Setup Timers ===
AddHandler TimerRefreshData.Tick, AddressOf TimerRefreshData_Tick AddHandler TimerRefreshSidebarData.Tick, AddressOf TimerRefreshSidebarData_Tick
TimerRefreshData.Enabled = True TimerRefreshSidebarData.Enabled = True
' === Setup Event Handlers === ' === Setup Event Handlers ===
AddHandler KeyDown, AddressOf frmFlowForm_KeyDown AddHandler KeyDown, AddressOf frmFlowForm_KeyDown
@ -259,12 +260,7 @@ Public Class frmFlowForm
End If End If
Next Next
Dim oSql = $"SELECT TOP 10 * FROM VWIDB_DOCRESULT_DE WHERE [Changed who] = '{My.Application.User.UserName}' ORDER BY [Changed when] DESC" Load_Recent_Files
Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(oSql)
GridControl1.DataSource = AccessedFilesTable
colPrimary.FieldName = "DisplayFileName"
colSecondary.FieldName = "Changed when"
If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then
Try Try
@ -395,7 +391,18 @@ Public Class frmFlowForm
SHAppBarMessage(ABMsg.ABM_REMOVE, AppDeskData) SHAppBarMessage(ABMsg.ABM_REMOVE, AppDeskData)
End If End If
End Sub 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() Public Sub Init_Folderwatch()
Try Try
Dim oSql As String = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & My.Application.User.UserId 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 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) Private Sub frmFlowForm_KeyDown(ByVal sender As Object, ByVal e As KeyEventArgs)
If e.KeyCode = Keys.Escape Then If e.KeyCode = Keys.Escape Then
If RunningTask IsNot Nothing 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 Private Sub frmFlowForm_DragEnter(sender As Object, e As DragEventArgs) Handles MyBase.DragEnter
If My.Application.GlobixDropAreaStyle = "PROGRESSIVE" Then If My.Application.GlobixDropAreaStyle = "PROGRESSIVE" Then
'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3 PictureEdit2.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3
PictureEdit2.Image = My.Resources.ZooFlow_drop_drag 'PictureEdit2.Image = My.Resources.ZooFlow_drop_drag
Else Else
'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP2 'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP2
PictureEdit2.Image = My.Resources.ZooFlow_drop_drag PictureEdit2.Image = My.Resources.ZooFlow_drop_drag
@ -1242,5 +1245,12 @@ Public Class frmFlowForm
End Try End Try
End If End If
End Sub 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 End Class

View File

@ -39,6 +39,7 @@ Partial Class frmtest
Me.txtDoctypeID = New System.Windows.Forms.TextBox() Me.txtDoctypeID = New System.Windows.Forms.TextBox()
Me.Label3 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label()
Me.Button1 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button()
Me.txtObjectID = New System.Windows.Forms.TextBox()
Me.SuspendLayout() Me.SuspendLayout()
' '
'Label2 'Label2
@ -182,11 +183,19 @@ Partial Class frmtest
Me.Button1.Text = "AdhocWorkflow" Me.Button1.Text = "AdhocWorkflow"
Me.Button1.UseVisualStyleBackColor = True 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 'frmtest
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(865, 450) Me.ClientSize = New System.Drawing.Size(865, 450)
Me.Controls.Add(Me.txtObjectID)
Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.txtDoctypeID) Me.Controls.Add(Me.txtDoctypeID)
@ -226,4 +235,5 @@ Partial Class frmtest
Friend WithEvents txtDoctypeID As TextBox Friend WithEvents txtDoctypeID As TextBox
Friend WithEvents Label3 As Label Friend WithEvents Label3 As Label
Friend WithEvents Button1 As Button Friend WithEvents Button1 As Button
Friend WithEvents txtObjectID As TextBox
End Class End Class

View File

@ -5,10 +5,12 @@ Imports DigitalData.Modules.ZooFlow
Public Class frmtest Public Class frmtest
Private Property Environment As Environment Private Property Environment As Environment
Private Property AdHoc_Workflow As AdHocWorkflow
Private Sub frmtest_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmtest_Load(sender As Object, e As EventArgs) Handles MyBase.Load
cmbObjectStoreType.SelectedIndex = 0 cmbObjectStoreType.SelectedIndex = 0
Environment = My.Application.GetEnvironment() Environment = My.Application.GetEnvironment()
End Sub End Sub
Private Sub btnOpenFile_Click(sender As Object, e As EventArgs) Handles btnOpenFile.Click Private Sub btnOpenFile_Click(sender As Object, e As EventArgs) Handles btnOpenFile.Click
@ -73,7 +75,8 @@ Public Class frmtest
End Sub End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click 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.Show()
oForm.BringToFront() oForm.BringToFront()
oForm.Focus() oForm.Focus()

View File

@ -11,5 +11,7 @@ Module modCurrent
Public Property NI_TYPE As String = "INFO" Public Property NI_TYPE As String = "INFO"
Public Property GLOBIX_JUMP_DOCTYPE_ID As Integer 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 Public Property DocResultBaseSearch As String
End Module End Module

View File

@ -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

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.1.0.0")> <Assembly: AssemblyVersion("1.2.0.0")>
<Assembly: AssemblyFileVersion("1.1.0.0")> <Assembly: AssemblyFileVersion("1.1.0.0")>

View File

@ -74,6 +74,7 @@
<Import Include="System.Threading.Tasks" /> <Import Include="System.Threading.Tasks" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AdHocWorkflow.vb" />
<Compile Include="Constants.vb" /> <Compile Include="Constants.vb" />
<Compile Include="Environment.vb" /> <Compile Include="Environment.vb" />
<Compile Include="My Project\AssemblyInfo.vb" /> <Compile Include="My Project\AssemblyInfo.vb" />