diff --git a/MultiTool.Form/App.config b/MultiTool.Form/App.config index 2296b93..e09f004 100644 --- a/MultiTool.Form/App.config +++ b/MultiTool.Form/App.config @@ -1,13 +1,54 @@ - + - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UseSegoeUI + + + + + + PerMonitorV2 + + + + + + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/MultiTool.Form.vbproj b/MultiTool.Form/MultiTool.Form.vbproj index 57b5487..3d9eb5b 100644 --- a/MultiTool.Form/MultiTool.Form.vbproj +++ b/MultiTool.Form/MultiTool.Form.vbproj @@ -338,6 +338,8 @@ + + diff --git a/MultiTool.Form/My Project/Resources.Designer.vb b/MultiTool.Form/My Project/Resources.Designer.vb index 8bc635f..e5b590a 100644 --- a/MultiTool.Form/My Project/Resources.Designer.vb +++ b/MultiTool.Form/My Project/Resources.Designer.vb @@ -110,6 +110,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_checkcircled2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_checkcircled2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -290,6 +300,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property editquery() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("editquery", 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/MultiTool.Form/My Project/Resources.resx b/MultiTool.Form/My Project/Resources.resx index 8ee522a..85a87fd 100644 --- a/MultiTool.Form/My Project/Resources.resx +++ b/MultiTool.Form/My Project/Resources.resx @@ -118,29 +118,83 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\logical.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\icon_export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\bo_country.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\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\tilelabels.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\squarified1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\redo.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\logical1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_unknown1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_unknown.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\resetview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\open26.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\open25.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_send4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\up1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\up.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\bo_unknown1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\bo_unknown2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\open3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_send5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\wraptext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -148,44 +202,53 @@ ..\Resources\tableproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_send3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\up1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\logical1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\preview.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\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_send4.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\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\tilelabels.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\charthorizontalaxis_logscale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\insertpagenumber.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\exporttopdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open21.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open24.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_reload.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_product.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -193,121 +256,64 @@ ..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\rotatecounterclockwise.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\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_unknown.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\charthorizontalaxis_logscale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\showallfieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\open26.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\up.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\new.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\actions_reload.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\open27.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\open2.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\actions_delete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\followupall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open24.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_send3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_send5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\icon_export.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\open3.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\exporttopdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\open22.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_unknown2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\import.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open21.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\insertpagenumber.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\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\showallfieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_delete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_addcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\resetview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open27.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\logical.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\new.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_checkcircled2.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 \ No newline at end of file diff --git a/MultiTool.Form/Resources/actions_checkcircled2.svg b/MultiTool.Form/Resources/actions_checkcircled2.svg new file mode 100644 index 0000000..b1b6aa9 --- /dev/null +++ b/MultiTool.Form/Resources/actions_checkcircled2.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Resources/editquery.svg b/MultiTool.Form/Resources/editquery.svg new file mode 100644 index 0000000..54e75cd --- /dev/null +++ b/MultiTool.Form/Resources/editquery.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb b/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb index c9d14b8..c48b1e4 100644 --- a/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb +++ b/MultiTool.Form/Strings/frmImportMainExtra.Designer.vb @@ -64,6 +64,15 @@ Namespace My.Resources End Set End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die {0} Dateien erfolgreich in die Winline übertragen! ähnelt. + ''' + Friend Shared ReadOnly Property _0__Dateien_erfolgreich_in_die_Winline_übertragen_() As String + Get + Return ResourceManager.GetString("{0} Dateien erfolgreich in die Winline übertragen!", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die {0} Dateien geladen ähnelt. ''' diff --git a/MultiTool.Form/Strings/frmImportMainExtra.resx b/MultiTool.Form/Strings/frmImportMainExtra.resx index ac13980..d42e347 100644 --- a/MultiTool.Form/Strings/frmImportMainExtra.resx +++ b/MultiTool.Form/Strings/frmImportMainExtra.resx @@ -195,6 +195,9 @@ Zur Zeit werden nur bis zu 4 Tabellen unterstützt! + + {0} Dateien erfolgreich in die Winline übertragen! + {0} Dateien geladen diff --git a/MultiTool.Form/frmImportMain.Designer.vb b/MultiTool.Form/frmImportMain.Designer.vb index 9fbdca5..cf23b4b 100644 --- a/MultiTool.Form/frmImportMain.Designer.vb +++ b/MultiTool.Form/frmImportMain.Designer.vb @@ -30,7 +30,6 @@ Partial Class frmImportMain Me.GridControlFiles = New DevExpress.XtraGrid.GridControl() Me.GridViewFiles = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView() Me.gridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() - Me.colSelected = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.GridBand2 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() Me.colFilename = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.colCreatedAt = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() @@ -52,11 +51,10 @@ Partial Class frmImportMain Me.txtCurrentFile = New DevExpress.XtraBars.BarStaticItem() Me.btnConfig = New DevExpress.XtraBars.BarButtonItem() Me.btnRemoveRow = New DevExpress.XtraBars.BarButtonItem() - Me.BarWorkspaceMenuItem1 = New DevExpress.XtraBars.BarWorkspaceMenuItem() - Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components) Me.btnTestTransferFile = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.btnDebugExportReport = New DevExpress.XtraBars.BarButtonItem() + Me.btnEditRow = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -85,6 +83,7 @@ Partial Class frmImportMain Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.GridControl4 = New DevExpress.XtraGrid.GridControl() Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components) Me.BehaviorManager = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) Me.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.MultiTool.Form.frmWaitForm), True, True) CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() @@ -147,7 +146,7 @@ Partial Class frmImportMain ' Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainerGrids) resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2") - Me.SplitContainerMain.SplitterPosition = 340 + Me.SplitContainerMain.SplitterPosition = 287 ' 'GridControlFiles ' @@ -161,9 +160,13 @@ Partial Class frmImportMain 'GridViewFiles ' Me.GridViewFiles.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.gridBand1, Me.GridBand2}) - Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colSelected, Me.colFilename, Me.colMandator, Me.colCreatedAt}) + Me.GridViewFiles.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colFilename, Me.colMandator, Me.colCreatedAt}) Me.GridViewFiles.GridControl = Me.GridControlFiles Me.GridViewFiles.Name = "GridViewFiles" + Me.GridViewFiles.OptionsSelection.CheckBoxSelectorColumnWidth = 25 + Me.GridViewFiles.OptionsSelection.CheckBoxSelectorField = "Selected" + Me.GridViewFiles.OptionsSelection.MultiSelect = True + Me.GridViewFiles.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect Me.GridViewFiles.OptionsView.ShowBands = False Me.GridViewFiles.OptionsView.ShowDetailButtons = False Me.GridViewFiles.OptionsView.ShowGroupPanel = False @@ -172,20 +175,7 @@ Partial Class frmImportMain 'gridBand1 ' resources.ApplyResources(Me.gridBand1, "gridBand1") - Me.gridBand1.Columns.Add(Me.colSelected) - Me.gridBand1.VisibleIndex = 0 - ' - 'colSelected - ' - Me.colSelected.AutoFillDown = True - resources.ApplyResources(Me.colSelected, "colSelected") - Me.colSelected.FieldName = "Selected" - Me.colSelected.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send2 - Me.colSelected.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) - Me.colSelected.MinWidth = 27 - Me.colSelected.Name = "colSelected" - Me.colSelected.OptionsColumn.FixedWidth = True - Me.colSelected.UnboundType = DevExpress.Data.UnboundColumnType.[Boolean] + Me.gridBand1.VisibleIndex = -1 ' 'GridBand2 ' @@ -193,7 +183,7 @@ Partial Class frmImportMain Me.GridBand2.Columns.Add(Me.colFilename) Me.GridBand2.Columns.Add(Me.colCreatedAt) Me.GridBand2.Columns.Add(Me.colMandator) - Me.GridBand2.VisibleIndex = 1 + Me.GridBand2.VisibleIndex = 0 ' 'colFilename ' @@ -230,11 +220,10 @@ Partial Class frmImportMain 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.btnOpenReport, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.btnRemoveRow, Me.BarWorkspaceMenuItem1, Me.btnTestTransferFile, Me.BarButtonItem1, Me.btnDebugExportReport}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.txtFilesLoaded, Me.btnLoadFiles, Me.btnTransferFile, Me.btnOpenInputDirectory, Me.btnOpenOutputDirectory, Me.btnOpenSchemaDirectory, Me.btnReloadFile, Me.btnTransferAllFiles, Me.btnOpenReport, Me.btnShowXml, Me.btnOpenLogDirectory, Me.btnOpenConfigDirectory, Me.txtCurrentFile, Me.btnConfig, Me.btnRemoveRow, Me.btnTestTransferFile, Me.BarButtonItem1, Me.btnDebugExportReport, Me.btnEditRow}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") - Me.RibbonControl.MaxItemId = 34 + Me.RibbonControl.MaxItemId = 36 Me.RibbonControl.Name = "RibbonControl" - Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1) Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2}) Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemProgressBar1}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -297,7 +286,6 @@ Partial Class frmImportMain 'btnTransferAllFiles ' resources.ApplyResources(Me.btnTransferAllFiles, "btnTransferAllFiles") - Me.btnTransferAllFiles.Enabled = False Me.btnTransferAllFiles.Id = 13 Me.btnTransferAllFiles.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_send Me.btnTransferAllFiles.Name = "btnTransferAllFiles" @@ -356,18 +344,6 @@ Partial Class frmImportMain Me.btnRemoveRow.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_deletecircled Me.btnRemoveRow.Name = "btnRemoveRow" ' - 'BarWorkspaceMenuItem1 - ' - resources.ApplyResources(Me.BarWorkspaceMenuItem1, "BarWorkspaceMenuItem1") - Me.BarWorkspaceMenuItem1.Id = 28 - Me.BarWorkspaceMenuItem1.Name = "BarWorkspaceMenuItem1" - Me.BarWorkspaceMenuItem1.WorkspaceManager = Me.WorkspaceManager1 - ' - 'WorkspaceManager1 - ' - Me.WorkspaceManager1.TargetControl = Me - Me.WorkspaceManager1.TransitionType = PushTransition1 - ' 'btnTestTransferFile ' resources.ApplyResources(Me.btnTestTransferFile, "btnTestTransferFile") @@ -389,6 +365,13 @@ Partial Class frmImportMain Me.btnDebugExportReport.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.exporttopdf Me.btnDebugExportReport.Name = "btnDebugExportReport" ' + 'btnEditRow + ' + resources.ApplyResources(Me.btnEditRow, "btnEditRow") + Me.btnEditRow.Id = 35 + Me.btnEditRow.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.editquery + Me.btnEditRow.Name = "btnEditRow" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3, Me.RibbonPageGroup7}) @@ -419,6 +402,7 @@ Partial Class frmImportMain ' 'RibbonPageGroup7 ' + Me.RibbonPageGroup7.ItemLinks.Add(Me.btnEditRow) Me.RibbonPageGroup7.ItemLinks.Add(Me.btnRemoveRow) Me.RibbonPageGroup7.Name = "RibbonPageGroup7" resources.ApplyResources(Me.RibbonPageGroup7, "RibbonPageGroup7") @@ -605,6 +589,11 @@ Partial Class frmImportMain Me.GridView4.GridControl = Me.GridControl4 Me.GridView4.Name = "GridView4" ' + 'WorkspaceManager1 + ' + Me.WorkspaceManager1.TargetControl = Me + Me.WorkspaceManager1.TransitionType = PushTransition1 + ' 'SplashScreenManager ' Me.SplashScreenManager.ClosingDelay = 500 @@ -699,7 +688,6 @@ Partial Class frmImportMain Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox Friend WithEvents GridViewFiles As DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView - Friend WithEvents colSelected As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn Friend WithEvents colCreatedAt As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn Friend WithEvents colMandator As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn Friend WithEvents colFilename As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn @@ -725,12 +713,12 @@ Partial Class frmImportMain Friend WithEvents GridView3 As GridView Friend WithEvents GridControl4 As DevExpress.XtraGrid.GridControl Friend WithEvents GridView4 As GridView - Friend WithEvents BarWorkspaceMenuItem1 As DevExpress.XtraBars.BarWorkspaceMenuItem Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager Friend WithEvents btnTestTransferFile As DevExpress.XtraBars.BarButtonItem - Friend WithEvents gridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand - Friend WithEvents GridBand2 As DevExpress.XtraGrid.Views.BandedGrid.GridBand Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents btnDebugExportReport As DevExpress.XtraBars.BarButtonItem + Friend WithEvents gridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand + Friend WithEvents GridBand2 As DevExpress.XtraGrid.Views.BandedGrid.GridBand + Friend WithEvents btnEditRow As DevExpress.XtraBars.BarButtonItem End Class diff --git a/MultiTool.Form/frmImportMain.resx b/MultiTool.Form/frmImportMain.resx index 23cb9c0..51f6882 100644 --- a/MultiTool.Form/frmImportMain.resx +++ b/MultiTool.Form/frmImportMain.resx @@ -134,19 +134,13 @@ gridBand1 - - Ausgewählt - - - - True - - - 27 - gridBand1 + + + False + 27 @@ -160,7 +154,7 @@ True - 683 + 249 Eingegangen @@ -169,7 +163,7 @@ True - 299 + 118 Mandant @@ -188,13 +182,13 @@ True - 384 + 131 GridBand2 - 683 + 249 0 Dateien geladen @@ -241,23 +235,53 @@ Zeile löschen - - BarWorkspaceMenuItem1 + + Übermittlung Testen - - 336, 17 - - - True - - - 6, 13 + + BarButtonItem1 - - 189, 17 - - - 1215, 746 + + Bericht Exportieren + + + Zeile bearbeiten + + + 0, 0 + + + Einlesen + + + Auswertung + + + Übermittlung + + + Bearbeitung + + + Start + + + Verzeichnisse + + + RibbonPageGroup2 + + + Erweitert + + + False + + + Combo + + + 1215, 158 0, 722 @@ -277,6 +301,456 @@ 1 + + RibbonControl + + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 2 + + + 287, 531 + + + 0 + + + GridControlFiles + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain.Panel1 + + + 0 + + + True + + + Tahoma, 8.25pt, style=Bold + + + 5, 9 + + + 50, 13 + + + 2 + + + Mandant + + + LabelControl1 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelControl1 + + + 0 + + + Top, Left, Right + + + 75, 6 + + + Combo + + + Id + + + True + + + 0 + + + Name + + + True + + + 1 + + + 202, 20 + + + 1 + + + lookupMandator + + + DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PanelControl1 + + + 1 + + + Top + + + 0, 0 + + + 287, 33 + + + 2 + + + PanelControl1 + + + DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain.Panel1 + + + 1 + + + Panel1 + + + SplitContainerMain.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain + + + 0 + + + Fill + + + 0, 0 + + + Fill + + + 0, 0 + + + Fill + + + 0, 0 + + + 918, 129 + + + 0 + + + GridControl1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids1.Panel1 + + + 0 + + + Panel1 + + + SplitContainerGrids1.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids1 + + + 0 + + + Fill + + + 0, 0 + + + 918, 149 + + + 0 + + + GridControl2 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids1.Panel2 + + + 0 + + + Panel2 + + + SplitContainerGrids1.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids1 + + + 1 + + + 918, 288 + + + 0 + + + SplitContainerGrids1 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids.Panel1 + + + 0 + + + Panel1 + + + SplitContainerGrids.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids + + + 0 + + + Fill + + + 0, 0 + + + Fill + + + 0, 0 + + + 918, 126 + + + 0 + + + GridControl3 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids2.Panel1 + + + 0 + + + Panel1 + + + SplitContainerGrids2.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids2 + + + 0 + + + Fill + + + 0, 0 + + + 918, 130 + + + 0 + + + GridControl4 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids2.Panel2 + + + 0 + + + Panel2 + + + SplitContainerGrids2.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids2 + + + 1 + + + 918, 266 + + + 0 + + + SplitContainerGrids2 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids.Panel2 + + + 0 + + + Panel2 + + + SplitContainerGrids.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerGrids + + + 1 + + + 918, 564 + + + 0 + + + SplitContainerGrids + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain.Panel2 + + + 0 + + + Panel2 + + + SplitContainerMain.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain + + + 1 + + + 1215, 564 + + + 2 + + + SplitContainerMain + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + + + 336, 17 + + + True + + + 6, 13 + + + 189, 17 + + + 1215, 746 + @@ -314,12 +788,6 @@ DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - colSelected - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - GridBand2 @@ -440,18 +908,6 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarWorkspaceMenuItem1 - - - DevExpress.XtraBars.BarWorkspaceMenuItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - WorkspaceManager1 - - - DevExpress.Utils.WorkspaceManager, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - btnTestTransferFile @@ -470,6 +926,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + btnEditRow + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -572,6 +1034,12 @@ DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + WorkspaceManager1 + + + DevExpress.Utils.WorkspaceManager, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + BehaviorManager @@ -590,484 +1058,4 @@ DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Übermittlung Testen - - - BarButtonItem1 - - - Bericht Exportieren - - - 0, 0 - - - Einlesen - - - Auswertung - - - Übermittlung - - - Bearbeitung - - - Start - - - Verzeichnisse - - - RibbonPageGroup2 - - - Erweitert - - - False - - - Combo - - - 1215, 158 - - - RibbonControl - - - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 2 - - - 340, 531 - - - 0 - - - GridControlFiles - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain.Panel1 - - - 0 - - - True - - - Tahoma, 8.25pt, style=Bold - - - 5, 9 - - - 50, 13 - - - 2 - - - Mandant - - - LabelControl1 - - - DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PanelControl1 - - - 0 - - - Top, Left, Right - - - 75, 6 - - - Combo - - - Id - - - True - - - 0 - - - Name - - - True - - - 1 - - - 255, 20 - - - 1 - - - lookupMandator - - - DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - PanelControl1 - - - 1 - - - Top - - - 0, 0 - - - 340, 33 - - - 2 - - - PanelControl1 - - - DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain.Panel1 - - - 1 - - - Panel1 - - - SplitContainerMain.Panel1 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain - - - 0 - - - Fill - - - 0, 0 - - - Fill - - - 0, 0 - - - Fill - - - 0, 0 - - - 865, 129 - - - 0 - - - GridControl1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids1.Panel1 - - - 0 - - - Panel1 - - - SplitContainerGrids1.Panel1 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids1 - - - 0 - - - Fill - - - 0, 0 - - - 865, 149 - - - 0 - - - GridControl2 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids1.Panel2 - - - 0 - - - Panel2 - - - SplitContainerGrids1.Panel2 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids1 - - - 1 - - - 865, 288 - - - 0 - - - SplitContainerGrids1 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids.Panel1 - - - 0 - - - Panel1 - - - SplitContainerGrids.Panel1 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids - - - 0 - - - Fill - - - 0, 0 - - - Fill - - - 0, 0 - - - 865, 126 - - - 0 - - - GridControl3 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids2.Panel1 - - - 0 - - - Panel1 - - - SplitContainerGrids2.Panel1 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids2 - - - 0 - - - Fill - - - 0, 0 - - - 865, 130 - - - 0 - - - GridControl4 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids2.Panel2 - - - 0 - - - Panel2 - - - SplitContainerGrids2.Panel2 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids2 - - - 1 - - - 865, 266 - - - 0 - - - SplitContainerGrids2 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids.Panel2 - - - 0 - - - Panel2 - - - SplitContainerGrids.Panel2 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerGrids - - - 1 - - - 865, 564 - - - 0 - - - SplitContainerGrids - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain.Panel2 - - - 0 - - - Panel2 - - - SplitContainerMain.Panel2 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain - - - 1 - - - 1215, 564 - - - 2 - - - SplitContainerMain - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 0 - \ No newline at end of file diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index 0dc767f..c1e982b 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -16,6 +16,7 @@ Imports MultiTool.Shared.Winline.Entities Imports MultiTool.Shared.Constants Imports MultiTool.Shared.Exceptions Imports Document = MultiTool.Shared.Documents.Document +Imports DevExpress.XtraGrid.Views.Grid.ViewInfo Public Class frmImportMain Public LogConfig As LogConfig @@ -47,19 +48,6 @@ Public Class frmImportMain LogConfig = pLogConfig ConfigManager = pConfigManager CurrentTemplate = pTemplate - - BehaviorManager.Attach(Of PersistenceBehavior)(Me, AddressOf LoadPersistenceSettings) - End Sub - - Protected Overrides Sub OnLoad(e As EventArgs) - GridControlFiles.ForceInitialize() - MyBase.OnLoad(e) - End Sub - - Private Sub LoadPersistenceSettings(pBehaviour As PersistenceBehavior) - pBehaviour.Properties.StoreChildLayouts = DevExpress.Utils.DefaultBoolean.True - pBehaviour.Properties.Storage = Storage.File - pBehaviour.Properties.Path = Application.UserAppDataPath End Sub Private Sub frmImportMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -132,70 +120,40 @@ Public Class frmImportMain CurrentGrid = sender End Sub - Private Function CreateGridsAndColumns(pTemplate As Templates.Template) As List(Of GridControl) - Dim oGrids As New List(Of GridControl) - Dim oTableCounter = 0 + Private Sub Grid_MouseDoubleClick(sender As Object, e As MouseEventArgs) + Dim oGrid As GridControl = DirectCast(sender, GridControl) + Dim oView As GridView = DirectCast(oGrid.FocusedView, GridView) + Dim oHitInfo = oView.CalcHitInfo(e.Location) - For Each oTable In pTemplate.Tables - If oTableCounter = 0 Then - Dim oGrid = GridLoader.GetGridFromElement(GridControl1, oTable) - AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick - AddHandler GridView1.CustomDrawCell, AddressOf GridView_CustomDrawCell - oGrids.Add(oGrid) - End If - - If oTableCounter = 1 Then - Dim oGrid = GridLoader.GetGridFromElement(GridControl2, oTable) - AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick - AddHandler GridView2.CustomDrawCell, AddressOf GridView_CustomDrawCell - oGrids.Add(oGrid) - End If - - If oTableCounter = 2 Then - Dim oGrid = GridLoader.GetGridFromElement(GridControl3, oTable) - AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick - AddHandler GridView3.CustomDrawCell, AddressOf GridView_CustomDrawCell - oGrids.Add(oGrid) - End If - - If oTableCounter = 3 Then - Dim oGrid = GridLoader.GetGridFromElement(GridControl4, oTable) - AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick - AddHandler GridView4.CustomDrawCell, AddressOf GridView_CustomDrawCell - oGrids.Add(oGrid) - End If - - If oTableCounter > 3 Then - MsgBox(My.Resources.frmImportMainExtra.Zur_Zeit_werden_nur_bis_zu_4_Tabellen_unterstützt_, MsgBoxStyle.Exclamation, Text) - End If - - oTableCounter += 1 - Next - - If oTableCounter < 3 Then - SplitContainerGrids.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 + If Not oHitInfo.InDataRow Then + Exit Sub End If - Return oGrids - End Function + Dim oRow As DataRow = oView.GetFocusedDataRow() - Private Sub Grid_MouseDoubleClick(sender As Object, e As MouseEventArgs) + EditRow(oRow, oView) + End Sub + + Private Sub btnEditRow_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnEditRow.ItemClick + Dim oGrid As GridControl = DirectCast(CurrentGrid, GridControl) + Dim oView As GridView = DirectCast(oGrid.FocusedView, GridView) + Dim oRow As DataRow = oView.GetFocusedDataRow() + + If oRow Is Nothing Then + Exit Sub + End If + + EditRow(oRow, oView) + End Sub + + Private Sub EditRow(pRow As DataRow, pView As GridView) Try - Dim oGrid As GridControl = DirectCast(sender, GridControl) - Dim oView As GridView = DirectCast(oGrid.FocusedView, GridView) - Dim oHitInfo = oView.CalcHitInfo(e.Location) - - If Not oHitInfo.InDataRow Then - Exit Sub - End If - - Dim oRow As DataRow = oView.GetDataRow(oView.FocusedRowHandle) - Dim oColumns = oView.Columns.Select(Function(c) c.FieldName).ToList() + Dim oColumns = pView.Columns.Select(Function(c) c.FieldName).ToList() Dim oDocumentRow = CurrentDocument.Rows. - Where(Function(r) r.Id.ToString = oRow.Item(COLUMN_GUID)). + Where(Function(r) r.Id.ToString = pRow.Item(COLUMN_GUID)). SingleOrDefault() Dim oTemplateTable = CurrentTemplate.Tables. - Where(Function(t) t.Name = oGrid.Name). + Where(Function(t) t.Name = pView.GridControl.Name). SingleOrDefault() Dim oForm As New frmRowEditor( @@ -216,12 +174,14 @@ Public Class frmImportMain ' Refresh Files to update Row color GridViewFiles.RefreshData() End If + Catch ex As Exception FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Detailzeilen) End Try End Sub + Private Sub btnLoadFiles_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnLoadFiles.ItemClick LoadFiles() End Sub @@ -292,137 +252,6 @@ Public Class frmImportMain End Try End Sub - Private Sub LoadDocument(pDocument As Document) - Try - Dim oDatasources As New Dictionary(Of String, DataTable) - - ' Reset datasource so that all data will be refreshed - For Each oGrid In Grids - oGrid.DataSource = Nothing - Next - - ' Create initial Datatable for each Root Element - For Each oTable In CurrentTemplate.Tables - Dim oDataTable As New DataTable() - - ' This is makes it possible to fetch the DocumentRow later - oDataTable.Columns.Add(New DataColumn(COLUMN_GUID)) - - For Each oColumn In oTable.Columns - oDataTable.Columns.Add(New DataColumn(oColumn.Name)) - Next - - oDatasources.Add(oTable.Name, oDataTable) - Next - - ' List of Root Elements in XML - For Each oRow In pDocument.Rows - ' Grab grid for the current DocumentRow - Dim oGrid As GridControl = Grids. - Where(Function(g) g.Name = oRow.Name). - SingleOrDefault() - - ' Grab table for the current DocumentRow and create new row - Dim oDataTable As DataTable = oDatasources.Item(oRow.Name) - Dim oDataRow = oDataTable.NewRow() - - ' Assign the Guid of the DocumentRow - oDataRow.Item(COLUMN_GUID) = oRow.Id.ToString - - ' Set values for the current row - For Each oField In oRow.Fields - If oDataTable.Columns.Contains(oField.Key) Then - oDataRow.Item(oField.Key) = oField.Value - Else - Logger.Warn("Element [{0}] from files does not exist in Schema. Skipping.", oField.Key) - End If - Next - - ' Add row to the current table - oDataTable.Rows.Add(oDataRow) - oDataTable.AcceptChanges() - - ' Finally load data into grid - oGrid.DataSource = oDataTable - Next - - txtCurrentFile.Caption = String.Format(My.Resources.frmImportMainExtra.Aktuelle_Datei___0_, pDocument.FileName) - - CurrentDocument = pDocument - SetDocumentButtonsEnabled(True) - Catch ex As Exception - SetDocumentButtonsEnabled(False) - Logger.Error(ex) - Throw ex - End Try - End Sub - - Private Sub SetDocumentButtonsEnabled(pEnabled As Boolean) - btnShowXml.Enabled = pEnabled - btnReloadFile.Enabled = pEnabled - btnTransferFile.Enabled = pEnabled - btnRemoveRow.Enabled = pEnabled - btnOpenReport.Enabled = pEnabled - ' TODO: Implement all file transfer first - ' btnTransferAllFiles.Enabled = pEnabled - End Sub - - - Private Async Sub btnTransferFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnTransferFile.ItemClick - Try - SplashScreenManager.ShowWaitForm() - SetDocumentButtonsEnabled(False) - GridControlFiles.Enabled = False - btnLoadFiles.Enabled = False - SplitContainerGrids.Enabled = False - - ' Get the document - Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle) - - ' Check for errors and abort - If oDocument.HasErrors = True Then - FormHelper.ShowWarning("Diese Datei kann noch nicht übertragen werden, da sie noch Fehler oder fehlende Werte enthält.") - Exit Sub - End If - - ' Transfer to winline - Dim oTransferResult = Await WebService.TransferDocumentToWinline(oDocument, CurrentTemplate, lookupMandator.EditValue) - - If oTransferResult = True Then - - WebService.RaiseWebServiceProgress("Bericht erzeugen") - - ' Generate the report - Dim oReport = ReportGenerator.GenerateReport(oDocument) - Dim oFilePath = ReportGenerator.GetReportFilePath(oDocument, CurrentTemplate) - - WebService.RaiseWebServiceProgress("Bericht exportieren") - - ' Export it to pdf - oReport.ExportToPdf(oFilePath) - - WebService.RaiseWebServiceProgress("Datei archivieren") - - ' Mark Document as Imported, will be moved on Form Close - oDocument.Imported = True - End If - - 'MsgBox(My.Resources.frmImportMainExtra.Datei_erfolgreich_in_die_WinLine_übertragen, MsgBoxStyle.Information, Text) - Catch ex As HttpRequestException - FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine, My.Resources.frmImportMainExtra.Die_Verbindung_zum_WinLine_Server_ist_fehlgeschlagen) - - Catch ex As Exception - FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine) - - Finally - SplitContainerGrids.Enabled = True - btnLoadFiles.Enabled = True - GridControlFiles.Enabled = True - SetDocumentButtonsEnabled(True) - SplashScreenManager.CloseWaitForm() - End Try - End Sub - Private Sub WebService_Progress(sender As Object, e As String) SplashScreenManager.SetWaitFormDescription(e) End Sub @@ -439,24 +268,6 @@ Public Class frmImportMain FormHelper.TryOpenDirectory(My.GeneralConfiguration.TemplateDirectory, My.Resources.frmImportMainExtra.Vorlagenverzeichnis) End Sub - Private Sub TryOpenDirectory(pPath As String, pDisplayName As String) - If Directory.Exists(pPath) Then - Process.Start(pPath) - Else - Dim oMessage = String.Format(My.Resources.frmImportMainExtra._0__nicht_konfiguriert_oder_nicht_gefunden, pDisplayName) - MsgBox(oMessage, MsgBoxStyle.Exclamation, Text) - End If - End Sub - - Private Sub TryOpenFile(pPath As String, pDisplayName As String) - If File.Exists(pPath) Then - Process.Start(pPath) - Else - Dim oMessage = String.Format(My.Resources.frmImportMainExtra._0__nicht_konfiguriert_oder_nicht_gefunden, pDisplayName) - MsgBox(oMessage, MsgBoxStyle.Exclamation, Text) - End If - End Sub - Private Sub btnShowXml_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnShowXml.ItemClick Dim oForm As New frmXmlEditor With {.FileName = CurrentDocument.FullName} oForm.Show() @@ -571,30 +382,121 @@ Public Class frmImportMain End If End Sub + + Private Async Sub btnTestTransferFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnTestTransferFile.ItemClick Try - SplashScreenManager.ShowWaitForm() - SetDocumentButtonsEnabled(False) - GridControlFiles.Enabled = False - btnLoadFiles.Enabled = False - SplitContainerGrids.Enabled = False + BeginLoadingUI() + ' Get the document Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle) - Await WebService.TransferDocumentToWinline(oDocument, CurrentTemplate, lookupMandator.EditValue, pIsTest:=True) - MsgBox(My.Resources.frmImportMainExtra.Datei_erfolgreich_in_die_WinLine_übertragen, MsgBoxStyle.Information, Text) + ' Check for errors and abort + If oDocument.HasErrors = True Then + FormHelper.ShowWarning("Diese Datei kann noch nicht übertragen werden, da sie noch Fehler oder fehlende Werte enthält.") + Exit Sub + End If + + Dim oResult = Await TransferFile(oDocument, pIsTest:=True) + If oResult = True Then + MsgBox(My.Resources.frmImportMainExtra.Datei_erfolgreich_in_die_WinLine_übertragen, MsgBoxStyle.Information, Text) + End If + Catch ex As HttpRequestException FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine, My.Resources.frmImportMainExtra.Die_Verbindung_zum_WinLine_Server_ist_fehlgeschlagen) + Catch ex As TaskCanceledException + FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine, My.Resources.frmImportMainExtra.Die_Verbindung_zum_WinLine_Server_ist_fehlgeschlagen) + Catch ex As Exception FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine) Finally - SplitContainerGrids.Enabled = True - btnLoadFiles.Enabled = True - GridControlFiles.Enabled = True - SetDocumentButtonsEnabled(True) - SplashScreenManager.CloseWaitForm() + EndLoadingUI() + End Try + End Sub + + Private Async Sub btnTransferFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnTransferFile.ItemClick + Try + BeginLoadingUI() + + ' Get the document + Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle) + + ' Check for errors and abort + If oDocument.HasErrors = True Then + FormHelper.ShowWarning("Diese Datei kann noch nicht übertragen werden, da sie noch Fehler oder fehlende Werte enthält.") + Exit Sub + End If + + Dim oResult = Await TransferFile(oDocument, pIsTest:=False) + If oResult = True Then + MsgBox(My.Resources.frmImportMainExtra.Datei_erfolgreich_in_die_WinLine_übertragen, MsgBoxStyle.Information, Text) + End If + + Catch ex As HttpRequestException + FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine, My.Resources.frmImportMainExtra.Die_Verbindung_zum_WinLine_Server_ist_fehlgeschlagen) + + Catch ex As TaskCanceledException + FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine, My.Resources.frmImportMainExtra.Die_Verbindung_zum_WinLine_Server_ist_fehlgeschlagen) + + Catch ex As Exception + FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine) + + Finally + EndLoadingUI() + + End Try + End Sub + + Private Async Sub btnTransferAllFiles_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnTransferAllFiles.ItemClick + Try + BeginLoadingUI() + + ' Get the documents + Dim oSelectedRows = GridViewFiles.GetSelectedRows() + + If oSelectedRows.Length = 0 Then + Exit Sub + End If + + Dim oDocuments As List(Of Document) = oSelectedRows. + Select(Of Document)(Function(rowHandle) GridViewFiles.GetRow(rowHandle)). + ToList() + + Dim oFailedDocuments As New List(Of String) + Dim oSuccessfulDocuments As Integer = 0 + + For Each oDocument As Document In oDocuments + Try + Await TransferFile(oDocument) + + Catch ex As Exception + Logger.Error(ex) + oFailedDocuments.Add(ex.Message) + + End Try + Next + + oSuccessfulDocuments = oDocuments.Count - oFailedDocuments.Count + + If oSuccessfulDocuments > 0 Then + Dim oMessage = String.Format(My.Resources.frmImportMainExtra._0__Dateien_erfolgreich_in_die_Winline_übertragen_, oSuccessfulDocuments) + MsgBox(oMessage, MsgBoxStyle.Information, Text) + End If + + If oFailedDocuments.Count > 0 Then + Dim oErrorMessages = String.Join(vbNewLine, oFailedDocuments) + Dim oMessage = String.Format("Für {0} Dateien ist die Übertragung in die Winline fehlgeschlagen. Folgende Fehler sind aufgetreten: {2}{1}", oFailedDocuments.Count, oErrorMessages, vbNewLine) + MsgBox(oMessage, MsgBoxStyle.Exclamation, Text) + End If + + Catch ex As Exception + FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Übertragung_zur_WinLine) + + Finally + EndLoadingUI() + End Try End Sub @@ -610,13 +512,75 @@ Public Class frmImportMain oReport.ExportToPdf(oFilePath) End Sub +#Region "Methods" + Private Sub LoadDocument(pDocument As Document) + Try + Dim oDatasources As New Dictionary(Of String, DataTable) + + ' Reset datasource so that all data will be refreshed + For Each oGrid In Grids + oGrid.DataSource = Nothing + Next + + ' Create initial Datatable for each Root Element + For Each oTable In CurrentTemplate.Tables + Dim oDataTable As New DataTable() + + ' This is makes it possible to fetch the DocumentRow later + oDataTable.Columns.Add(New DataColumn(COLUMN_GUID)) + + For Each oColumn In oTable.Columns + oDataTable.Columns.Add(New DataColumn(oColumn.Name)) + Next + + oDatasources.Add(oTable.Name, oDataTable) + Next + + ' List of Root Elements in XML + For Each oRow In pDocument.Rows + ' Grab grid for the current DocumentRow + Dim oGrid As GridControl = Grids. + Where(Function(g) g.Name = oRow.Name). + SingleOrDefault() + + ' Grab table for the current DocumentRow and create new row + Dim oDataTable As DataTable = oDatasources.Item(oRow.Name) + Dim oDataRow = oDataTable.NewRow() + + ' Assign the Guid of the DocumentRow + oDataRow.Item(COLUMN_GUID) = oRow.Id.ToString + + ' Set values for the current row + For Each oField In oRow.Fields + If oDataTable.Columns.Contains(oField.Key) Then + oDataRow.Item(oField.Key) = oField.Value + Else + Logger.Warn("Element [{0}] from files does not exist in Schema. Skipping.", oField.Key) + End If + Next + + ' Add row to the current table + oDataTable.Rows.Add(oDataRow) + oDataTable.AcceptChanges() + + ' Finally load data into grid + oGrid.DataSource = oDataTable + Next + + txtCurrentFile.Caption = String.Format(My.Resources.frmImportMainExtra.Aktuelle_Datei___0_, pDocument.FileName) + + CurrentDocument = pDocument + SetDocumentButtonsEnabled(True) + Catch ex As Exception + SetDocumentButtonsEnabled(False) + Logger.Error(ex) + Throw ex + End Try + End Sub + Private Sub LoadFiles() Try - SplashScreenManager.ShowWaitForm() - SetDocumentButtonsEnabled(False) - GridControlFiles.Enabled = False - btnLoadFiles.Enabled = False - SplitContainerGrids.Enabled = False + BeginLoadingUI() AddHandler DocumentLoader.FileLoadComplete, Sub(_sender As Object, _e As Documents.DocumentLoader.FileLoadInfo) Dim oMessage = String.Format("Lade Dateien ({0}/{1})", _e.FilesLoaded, _e.FilesTotal) @@ -636,11 +600,138 @@ Public Class frmImportMain FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Dokumente) Finally - SplitContainerGrids.Enabled = True - btnLoadFiles.Enabled = True - GridControlFiles.Enabled = True - SetDocumentButtonsEnabled(True) - SplashScreenManager.CloseWaitForm() + EndLoadingUI() End Try End Sub + + Private Async Function TransferFile(pDocument As Document, Optional pIsTest As Boolean = False) As Task(Of Boolean) + ' Check for errors and abort + If pDocument.HasErrors = True Then + FormHelper.ShowWarning("Diese Datei kann noch nicht übertragen werden, da sie noch Fehler oder fehlende Werte enthält.") + Return False + End If + + Dim oResult = Await WebService.TransferDocumentToWinline(pDocument, CurrentTemplate, lookupMandator.EditValue, pIsTest) + + If oResult = True Then + + ' If this was only a test, we are done. + If pIsTest = True Then + Return True + End If + + WebService.RaiseWebServiceProgress("Bericht erzeugen") + + ' Generate the report + Dim oReport = ReportGenerator.GenerateReport(pDocument) + Dim oFilePath = ReportGenerator.GetReportFilePath(pDocument, CurrentTemplate) + + WebService.RaiseWebServiceProgress("Bericht exportieren") + + ' Export it to pdf + oReport.ExportToPdf(oFilePath) + + WebService.RaiseWebServiceProgress("Datei archivieren") + + ' Mark Document as Imported, will be moved on Form Close + pDocument.Imported = True + + Return True + Else + Return False + End If + End Function + + Private Function CreateGridsAndColumns(pTemplate As Templates.Template) As List(Of GridControl) + Dim oGrids As New List(Of GridControl) + Dim oTableCounter = 0 + + For Each oTable In pTemplate.Tables + If oTableCounter = 0 Then + Dim oGrid = GridLoader.GetGridFromElement(GridControl1, oTable) + AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick + AddHandler GridView1.CustomDrawCell, AddressOf GridView_CustomDrawCell + oGrids.Add(oGrid) + End If + + If oTableCounter = 1 Then + Dim oGrid = GridLoader.GetGridFromElement(GridControl2, oTable) + AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick + AddHandler GridView2.CustomDrawCell, AddressOf GridView_CustomDrawCell + oGrids.Add(oGrid) + End If + + If oTableCounter = 2 Then + Dim oGrid = GridLoader.GetGridFromElement(GridControl3, oTable) + AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick + AddHandler GridView3.CustomDrawCell, AddressOf GridView_CustomDrawCell + oGrids.Add(oGrid) + End If + + If oTableCounter = 3 Then + Dim oGrid = GridLoader.GetGridFromElement(GridControl4, oTable) + AddHandler oGrid.DoubleClick, AddressOf Grid_MouseDoubleClick + AddHandler GridView4.CustomDrawCell, AddressOf GridView_CustomDrawCell + oGrids.Add(oGrid) + End If + + If oTableCounter > 3 Then + MsgBox(My.Resources.frmImportMainExtra.Zur_Zeit_werden_nur_bis_zu_4_Tabellen_unterstützt_, MsgBoxStyle.Exclamation, Text) + End If + + oTableCounter += 1 + Next + + If oTableCounter < 3 Then + SplitContainerGrids.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 + End If + + Return oGrids + End Function + + Private Sub TryOpenDirectory(pPath As String, pDisplayName As String) + If Directory.Exists(pPath) Then + Process.Start(pPath) + Else + Dim oMessage = String.Format(My.Resources.frmImportMainExtra._0__nicht_konfiguriert_oder_nicht_gefunden, pDisplayName) + MsgBox(oMessage, MsgBoxStyle.Exclamation, Text) + End If + End Sub + + Private Sub TryOpenFile(pPath As String, pDisplayName As String) + If File.Exists(pPath) Then + Process.Start(pPath) + Else + Dim oMessage = String.Format(My.Resources.frmImportMainExtra._0__nicht_konfiguriert_oder_nicht_gefunden, pDisplayName) + MsgBox(oMessage, MsgBoxStyle.Exclamation, Text) + End If + End Sub + + Private Sub BeginLoadingUI() + SplashScreenManager.ShowWaitForm() + SetDocumentButtonsEnabled(False) + GridControlFiles.Enabled = False + btnLoadFiles.Enabled = False + SplitContainerGrids.Enabled = False + End Sub + + Private Sub EndLoadingUI() + SplitContainerGrids.Enabled = True + btnLoadFiles.Enabled = True + GridControlFiles.Enabled = True + SetDocumentButtonsEnabled(True) + SplashScreenManager.CloseWaitForm() + End Sub + + Private Sub SetDocumentButtonsEnabled(pEnabled As Boolean) + btnShowXml.Enabled = pEnabled + btnReloadFile.Enabled = pEnabled + btnTransferFile.Enabled = pEnabled + btnRemoveRow.Enabled = pEnabled + btnOpenReport.Enabled = pEnabled + btnTransferAllFiles.Enabled = pEnabled + btnEditRow.Enabled = pEnabled + End Sub + +#End Region End Class \ No newline at end of file diff --git a/MultiTool.Form/frmRowEditor.Designer.vb b/MultiTool.Form/frmRowEditor.Designer.vb index 576aef1..006dec2 100644 --- a/MultiTool.Form/frmRowEditor.Designer.vb +++ b/MultiTool.Form/frmRowEditor.Designer.vb @@ -57,7 +57,7 @@ Partial Class frmRowEditor ' 'btnSave ' - Me.btnSave.Caption = "Speichern und Schließen" + Me.btnSave.Caption = "Speichern und Schließen (F5)" Me.btnSave.Id = 1 Me.btnSave.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.save Me.btnSave.Name = "btnSave" @@ -187,7 +187,9 @@ Partial Class frmRowEditor Me.Controls.Add(Me.GridControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.Font = New System.Drawing.Font("Segoe UI", 8.25!) Me.IconOptions.SvgImage = CType(resources.GetObject("frmRowEditor.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.KeyPreview = True Me.Name = "frmRowEditor" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 diff --git a/MultiTool.Form/frmRowEditor.resx b/MultiTool.Form/frmRowEditor.resx index 0bc78dc..a49f460 100644 --- a/MultiTool.Form/frmRowEditor.resx +++ b/MultiTool.Form/frmRowEditor.resx @@ -120,7 +120,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIIFAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi diff --git a/MultiTool.Form/frmRowEditor.vb b/MultiTool.Form/frmRowEditor.vb index dc6e849..85fe9ee 100644 --- a/MultiTool.Form/frmRowEditor.vb +++ b/MultiTool.Form/frmRowEditor.vb @@ -142,6 +142,10 @@ Public Class frmRowEditor End Sub Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick + SaveAndClose() + End Sub + + Private Sub SaveAndClose() Try GridView1.CloseEditor() @@ -313,5 +317,11 @@ Public Class frmRowEditor ' e.Appearance.BackColor = Color.LightCoral 'End If End Sub + + Private Sub frmRowEditor_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown + If e.KeyCode = Keys.F5 Then + SaveAndClose() + End If + End Sub End Class diff --git a/MultiTool.Shared/Constants.vb b/MultiTool.Shared/Constants.vb index 59d69da..6e8299c 100644 --- a/MultiTool.Shared/Constants.vb +++ b/MultiTool.Shared/Constants.vb @@ -1,4 +1,6 @@ Public Class Constants + Public Const HTTP_REQUEST_TIMEOUT_IN_SECONDS = 60 + Public Const COLUMN_GUID = "GUID" Public Const FUNCTION_GLN = "GLN" diff --git a/MultiTool.Shared/Winline/WebServiceData.vb b/MultiTool.Shared/Winline/WebServiceData.vb index 0d0d242..8d6a7a5 100644 --- a/MultiTool.Shared/Winline/WebServiceData.vb +++ b/MultiTool.Shared/Winline/WebServiceData.vb @@ -5,6 +5,7 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Filesystem Imports DigitalData.Modules.Logging Imports MultiTool.Shared.Documents +Imports MultiTool.Shared.Exceptions Imports MultiTool.Shared.Templates Imports MultiTool.Shared.Templates.GeneralConfig Imports MultiTool.Shared.Winline.Entities @@ -35,6 +36,17 @@ Namespace Winline End Sub #Region "Import" + ''' + ''' Transfers a document to winline via Webservices + ''' + ''' + ''' + ''' + ''' + ''' + ''' + ''' + ''' True if request was successful. Public Async Function TransferDocumentToWinline(pDocument As Documents.Document, pTemplate As Template, pMandator As Mandator, Optional pIsTest As Boolean = False) As Task(Of Boolean) Dim oBytes As Byte() = GetBytesFromDocument(pDocument) Dim oWS = Config @@ -91,7 +103,9 @@ Namespace Winline Dim oByref = 1 Dim oURL As String = $"{oWS.BaseUrl}/ewlservice/import?User={oWS.Username}&Password={oWS.Password}&Company={pMandator.Id}&Type={oTemplateType}&Vorlage={oTemplateName}&ActionCode={oActionCode}&Byref={oByref}&Data={oImportRelativeFilePath}" - Dim oClient As New HttpClient() + Dim oClient As New HttpClient With { + .Timeout = TimeSpan.FromSeconds(Constants.HTTP_REQUEST_TIMEOUT_IN_SECONDS) + } Logger.Info("Creating HTTP Request to [{0}]", oWS.BaseUrl) @@ -146,17 +160,17 @@ Namespace Winline If oResponseObject.OverallSuccess = False Then Dim oMessage = $"Request to Webservice was unsuccessful:{vbNewLine}{vbNewLine}{String.Join(vbNewLine, oErrorStrings.ToArray)}" - Throw New ApplicationException(oMessage) + Throw New WebServiceException(oMessage) End If End Using Case "text/html" WriteResponseFileWithSuffix(pTemplate.OutputWebserviceDirectory, pBaseFileNAme, oResponseBody, "txt", "Response") - Throw New ApplicationException(oResponseBody) + Throw New WebServiceException(oResponseBody) Case Else - Throw New ApplicationException(oResponseBody) + Throw New WebServiceException(oResponseBody) End Select End Function