From 770fc8d159410435477135b5334349a67f1ad0d3 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 23 Aug 2019 10:37:13 +0200 Subject: [PATCH] Version6: Bugfixing, Vektorindexing etc --- app/DD_PM_WINDREAM/ClassControlCreator.vb | 6 +- .../DD_DMSLiteDataSet.Designer.vb | 6 +- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 54 +- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 2 +- app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj | 3 + app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- .../My Project/Resources.Designer.vb | 30 ++ app/DD_PM_WINDREAM/My Project/Resources.resx | 61 ++- app/DD_PM_WINDREAM/Resources/Open_6296.png | Bin 0 -> 248 bytes .../Resources/Search(Go)_5718.png | Bin 0 -> 192 bytes .../Resources/properties_16xLG.png | Bin 0 -> 357 bytes app/DD_PM_WINDREAM/clsPatterns.vb | 16 +- .../frmAdministration.Designer.vb | 12 +- app/DD_PM_WINDREAM/frmAdministration.resx | 18 - app/DD_PM_WINDREAM/frmAdministration.vb | 1 + app/DD_PM_WINDREAM/frmControl_Detail.vb | 5 +- app/DD_PM_WINDREAM/frmFormDesigner.vb | 2 +- app/DD_PM_WINDREAM/frmMain.resx | 6 +- app/DD_PM_WINDREAM/frmMain.vb | 2 +- app/DD_PM_WINDREAM/frmMassValidator.vb | 2 +- app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb | 10 +- app/DD_PM_WINDREAM/frmValidator.Designer.vb | 93 ++-- app/DD_PM_WINDREAM/frmValidator.resx | 451 +++++++++------- app/DD_PM_WINDREAM/frmValidator.vb | 503 +++++++++++------- 24 files changed, 744 insertions(+), 541 deletions(-) create mode 100644 app/DD_PM_WINDREAM/Resources/Open_6296.png create mode 100644 app/DD_PM_WINDREAM/Resources/Search(Go)_5718.png create mode 100644 app/DD_PM_WINDREAM/Resources/properties_16xLG.png diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb index 867690c..4f58ac0 100644 --- a/app/DD_PM_WINDREAM/ClassControlCreator.vb +++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb @@ -322,7 +322,7 @@ Public Class ClassControlCreator Return control End Function - Public Shared Function CreateExistingTable(row As DataRow, columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow), designMode As Boolean) As GridControl + Public Shared Function CreateExistingGridControl(row As DataRow, columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow), designMode As Boolean) As GridControl Dim oControl As GridControl = CreateBaseControl(New GridControl(), row, designMode) Dim oDatatable As New DataTable Dim oView As GridView @@ -331,6 +331,7 @@ Public Class ClassControlCreator oView = oControl.DefaultView oView.OptionsView.ShowGroupPanel = False + oControl.ContextMenu = Nothing If Not designMode Then oView.OptionsBehavior.Editable = Not row.Item("READ_ONLY") @@ -338,9 +339,11 @@ Public Class ClassControlCreator If row.Item("VKT_ADD_ITEM") = True Then oView.OptionsBehavior.AllowAddRows = DefaultBoolean.True + oView.OptionsBehavior.AllowDeleteRows = DefaultBoolean.True oView.OptionsView.NewItemRowPosition = NewItemRowPosition.Bottom Else oView.OptionsBehavior.AllowAddRows = DefaultBoolean.False + oView.OptionsBehavior.AllowDeleteRows = DefaultBoolean.False oView.OptionsView.NewItemRowPosition = NewItemRowPosition.None End If End If @@ -359,6 +362,7 @@ Public Class ClassControlCreator .NextPage.Visible = False .PrevPage.Visible = False .Prev.Visible = False + End With For Each oRow As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In columns diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 277f7d1..6cfff9b 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -16187,12 +16187,12 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LO"& _ "C, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_N"& _ - "AME, VALIDATION, CHOICE_LIST, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TYP, CONNECTION_ID, SQL"& _ + "AME, VALIDATION, CHOICE_LIST, TYP, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CONNECTION_ID, SQL"& _ "_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE, REGEX_MATCH"& _ ", REGEX_MESSAGE_DE, REGEX_MESSAGE_EN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWPM_CONTROL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ - " (PROFIL_NAME = @Profil)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" + " (LOWER(PROFIL_NAME) = LOWER(@Profil))"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Profil", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Profil", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(1).Connection = Me.Connection Me._commandCollection(1).CommandText = "SELECT GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWPM_CONTROL_INDEX"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFIL_ID ="& _ diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index 8826de7..5c0931c 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -620,14 +620,14 @@ WHERE (PROFIL_ID = @PROF_ID) - - SELECT GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_NAME, VALIDATION, CHOICE_LIST, - TYP, CONNECTION_ID, SQL_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN + + SELECT GUID, PROFIL_ID, PROFIL_NAME, CTRL_NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, WIDTH, HEIGHT, INDEX_NAME, VALIDATION, CHOICE_LIST, TYP, + CONNECTION_ID, SQL_UEBERPRUEFUNG, READ_ONLY, LOAD_IDX_VALUE, LOG_INDEX, DEFAULT_VALUE, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM VWPM_CONTROL_INDEX -WHERE (PROFIL_NAME = @Profil) +WHERE (LOWER(PROFIL_NAME) = LOWER(@Profil)) ORDER BY Y_LOC, X_LOC - + @@ -2005,7 +2005,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2058,7 +2058,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2154,7 +2154,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2219,7 +2219,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2249,7 +2249,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2272,7 +2272,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2383,7 +2383,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2456,7 +2456,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2505,7 +2505,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2520,7 +2520,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2628,7 +2628,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2701,7 +2701,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2752,7 +2752,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2868,7 +2868,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2946,7 +2946,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2987,7 +2987,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3025,7 +3025,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3160,11 +3160,11 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - - - - - + + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index 8dc7250..c2a33ae 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index a3a3969..aaa8a85 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -740,6 +740,9 @@ + + + diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index b3e69bc..3b5f580 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb index 7507a9c..52e5c92 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb @@ -610,6 +610,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Open_6296() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Open_6296", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -670,6 +680,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property properties_16xLG() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("properties_16xLG", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -760,6 +780,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Search_Go__5718() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Search(Go)_5718", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD_PM_WINDREAM/My Project/Resources.resx b/app/DD_PM_WINDREAM/My Project/Resources.resx index a67aed1..5a15b2f 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.resx +++ b/app/DD_PM_WINDREAM/My Project/Resources.resx @@ -124,12 +124,6 @@ ..\Resources\asterisk_yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -148,8 +142,8 @@ ..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ampel-rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Open_6296.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\doc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -175,12 +169,12 @@ ..\Resources\zoom_in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ampel-rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\application_form_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -193,6 +187,9 @@ ..\Resources\txt.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\properties_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\checkbox_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -232,14 +229,17 @@ ..\Resources\flag_pink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\resultset_next.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\world_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Files_7954.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\search_glyph.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -253,8 +253,11 @@ ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\A_1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -274,6 +277,9 @@ ..\Resources\delete_12x12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Nextrequest_10302.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -283,6 +289,9 @@ ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\bullet_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -313,6 +322,9 @@ ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Files_7954.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -325,9 +337,6 @@ ..\Resources\doc_text_image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -337,8 +346,8 @@ ..\Resources\WorkItem_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\resultset_first.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -352,14 +361,14 @@ ..\Resources\zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Checkbox.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\key1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -367,7 +376,7 @@ ..\Resources\user_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\search_glyph.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Search(Go)_5718.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/Resources/Open_6296.png b/app/DD_PM_WINDREAM/Resources/Open_6296.png new file mode 100644 index 0000000000000000000000000000000000000000..d425ff14a04983df231a876c709fb13c7022321c GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMpx`P` z7srr_xV@A1@-i#(wB}FgnIQQ>Hq0>d(gQ#K*jH!!oZ^4hCfDmyk7iRlR~QID+p z^quF&kFp@I^FdyFu86sQxyB~6XltHRhu)fc_LW=hiq5^CeNme8;Gt^yUPE36H>stZ zFHc5zXttkZesE)k4bRe$&DY+=GjcOXoXwac{$=am4#k$tB%{@ptQOC$8a8`85iN7E sd&KwPowRzx=1s{HEf}h%_Sethx9{G~7Sr_g6VTNRp00i_>zopr015e9asU7T literal 0 HcmV?d00001 diff --git a/app/DD_PM_WINDREAM/Resources/Search(Go)_5718.png b/app/DD_PM_WINDREAM/Resources/Search(Go)_5718.png new file mode 100644 index 0000000000000000000000000000000000000000..aa06662182c9d160c8dc2f10541ea3a14a0740df GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!B9^Z#}EtuiXQ+_P<4^E~eg<`c@G0!r2#gk@Piz)=*< z@SPJm!Y~Y~>pJNu%kx}e00ByfAggH_26#VfC*(g+H4KBCaQgu?O_R!%BP`(`*ko8# z5Cl{T9 129 - - Titel - - - True - - - 1 - - - 58 - 268, 367 @@ -4951,12 +4939,6 @@ der Wertänderungen nutzen wollen: DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - colTITLE - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - TBPM_PROFILE_FINAL_INDEXINGBindingSource diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 30d93b1..60133d8 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -953,6 +953,7 @@ Public Class frmAdministration Dim preventDuplicates As Boolean = NotNull(focusedRow.Item("PREVENT_DUPLICATES"), False) Dim allowNewValues As Boolean = NotNull(focusedRow.Item("ALLOW_NEW_VALUES"), False) + CURRENT_INDEX_ID = guid CURRENT_SQL_CON = connectionId diff --git a/app/DD_PM_WINDREAM/frmControl_Detail.vb b/app/DD_PM_WINDREAM/frmControl_Detail.vb index 0ea6cf0..976f437 100644 --- a/app/DD_PM_WINDREAM/frmControl_Detail.vb +++ b/app/DD_PM_WINDREAM/frmControl_Detail.vb @@ -9,10 +9,11 @@ Public Class frmControl_Detail Public Function FillData(ID As Integer) Try + TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING TBPM_CONTROL_TABLETableAdapter.FillByGUID(DD_DMSLiteDataSet.TBPM_CONTROL_TABLE, ID) Return True Catch ex As System.Exception - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Daten:") + MsgBox(TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Daten zu SpaltenID: " & ID) End Try End Function @@ -55,12 +56,12 @@ Public Class frmControl_Detail Private Sub frmControl_Detail_Load(sender As Object, e As EventArgs) Handles Me.Load Try + Me.TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING If My.Settings.frmTableColumns_Position.IsEmpty = False Then If My.Settings.frmTableColumns_Position.X > 0 And My.Settings.frmTableColumns_Position.Y > 0 Then Me.Location = My.Settings.frmTableColumns_Position End If End If - Me.TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING Catch ex As Exception LOGGER.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Formulardaten:") diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 7a05970..03b79ed 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -216,7 +216,7 @@ Public Class frmFormDesigner Where r.CONTROL_ID = guid Select r) Dim columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow) = findControlColumnsQuery.ToList() - Dim table = ClassControlCreator.CreateExistingTable(row, columns, True) + Dim table = ClassControlCreator.CreateExistingGridControl(row, columns, True) AddHandler table.MouseClick, AddressOf gridControl_MouseClick ' AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 37c5052..0dfa915 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAASwBBAEsAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAATQBBAE0AQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -671,10 +671,10 @@ No - 163, 24 + 127, 24 - Letzte Synchronisation: + Last Sync: NONE 0, 24 diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 0674624..2ecfc96 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -825,7 +825,7 @@ Public Class frmMain SaveGridLayout() Load_Profile_items() Decide_Load() - tsslblLastSysnc.Text = "Letzte Synchronisation: " & Now.ToLongTimeString + tsslblLastSysnc.Text = "Last Client-Sync: " & Now.ToLongTimeString If GridControl_Docs.Visible = True And formopenClose = False Then RefreshHelper.LoadViewInfo() Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", Environment.UserName, CLIENT_SELECTED) Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql) diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index b7ab5e6..66775fb 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -327,7 +327,7 @@ Public Class frmMassValidator Where r.CONTROL_ID = oControlRow.Item("GUID") Select r).ToList() - ctrl = ClassControlCreator.CreateExistingTable(oControlRow, columns, False) + ctrl = ClassControlCreator.CreateExistingGridControl(oControlRow, columns, False) End Select If TypeOf ctrl IsNot Label Then diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index bfd6793..3e83c44 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -36,11 +36,15 @@ Public Class frmSQL_DESIGNER lblSaveFinalIndex.Visible = False TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) + If CURRENT_DESIGN_TYPE = "INPUT_INDEX" Then + CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_CONTROL_ID), True) + Else + CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), True) + End If - CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_CONTROL_ID), True) - If CURRENT_DESIGN_TYPE = "INPUT_INDEX" Then - If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count > 0 Then + If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then + If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then cmbConnection.SelectedValue = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CONNECTION_ID") cmbConnection.FindStringExact(CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CON_STRING")) SQL_COMMANDTextBox.Text = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("SQL_COMMAND") diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index 6a19034..3b566bc 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -32,12 +32,6 @@ Partial Class frmValidator Me.tstrlbl_Info = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblDocID = New System.Windows.Forms.ToolStripStatusLabel() Me.Panel1 = New System.Windows.Forms.Panel() - Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DateiInfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DateieigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() - Me.RefreshAdditionalSearchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TITLELabel1 = New System.Windows.Forms.Label() Me.btnSave = New System.Windows.Forms.Button() Me.DESCRIPTIONLabel = New System.Windows.Forms.Label() @@ -128,9 +122,14 @@ Partial Class frmValidator Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.grpbxMailBody = New System.Windows.Forms.GroupBox() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() + Me.ToolStripDropDownButton2 = New System.Windows.Forms.ToolStripDropDownButton() + Me.DateiÖffnenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.InfoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripButtonJumpFile = New System.Windows.Forms.ToolStripButton() Me.ToolStripButtonDeleteFile = New System.Windows.Forms.ToolStripButton() Me.ToolStripButtonAnnotation = New System.Windows.Forms.ToolStripButton() + Me.ToolStripButtonSearchesReload = New System.Windows.Forms.ToolStripButton() Me.FinalIndexDataSet = New DD_PM_WINDREAM.FinalIndexDataSet() Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = New DD_PM_WINDREAM.FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter() @@ -139,7 +138,6 @@ Partial Class frmValidator CType(Me.BarAndDockingController1, System.ComponentModel.ISupportInitialize).BeginInit() Me.StatusStrip1.SuspendLayout() Me.Panel1.SuspendLayout() - Me.ContextMenuStrip1.SuspendLayout() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -206,7 +204,6 @@ Partial Class frmValidator 'Panel1 ' Me.Panel1.BackColor = System.Drawing.SystemColors.ControlLight - Me.Panel1.ContextMenuStrip = Me.ContextMenuStrip1 Me.Panel1.Controls.Add(Me.TITLELabel1) Me.Panel1.Controls.Add(Me.btnSave) Me.Panel1.Controls.Add(Me.DESCRIPTIONLabel) @@ -214,40 +211,6 @@ Partial Class frmValidator resources.ApplyResources(Me.Panel1, "Panel1") Me.Panel1.Name = "Panel1" ' - 'ContextMenuStrip1 - ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.DateiInfoToolStripMenuItem, Me.DateieigenschaftenToolStripMenuItem, Me.ToolStripSeparator1, Me.RefreshAdditionalSearchToolStripMenuItem}) - Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") - ' - 'DateiÖffnenToolStripMenuItem - ' - Me.DateiÖffnenToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.book_open - Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem" - resources.ApplyResources(Me.DateiÖffnenToolStripMenuItem, "DateiÖffnenToolStripMenuItem") - ' - 'DateiInfoToolStripMenuItem - ' - Me.DateiInfoToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Symbols_Information_16xLG - Me.DateiInfoToolStripMenuItem.Name = "DateiInfoToolStripMenuItem" - resources.ApplyResources(Me.DateiInfoToolStripMenuItem, "DateiInfoToolStripMenuItem") - ' - 'DateieigenschaftenToolStripMenuItem - ' - resources.ApplyResources(Me.DateieigenschaftenToolStripMenuItem, "DateieigenschaftenToolStripMenuItem") - Me.DateieigenschaftenToolStripMenuItem.Name = "DateieigenschaftenToolStripMenuItem" - ' - 'ToolStripSeparator1 - ' - Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - resources.ApplyResources(Me.ToolStripSeparator1, "ToolStripSeparator1") - ' - 'RefreshAdditionalSearchToolStripMenuItem - ' - resources.ApplyResources(Me.RefreshAdditionalSearchToolStripMenuItem, "RefreshAdditionalSearchToolStripMenuItem") - Me.RefreshAdditionalSearchToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.search_glyph - Me.RefreshAdditionalSearchToolStripMenuItem.Name = "RefreshAdditionalSearchToolStripMenuItem" - ' 'TITLELabel1 ' resources.ApplyResources(Me.TITLELabel1, "TITLELabel1") @@ -269,7 +232,6 @@ Partial Class frmValidator ' resources.ApplyResources(Me.pnldesigner, "pnldesigner") Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnldesigner.ContextMenuStrip = Me.ContextMenuStrip1 Me.pnldesigner.Name = "pnldesigner" ' 'DD_DMSLiteDataSet @@ -801,9 +763,34 @@ Partial Class frmValidator 'ToolStrip1 ' resources.ApplyResources(Me.ToolStrip1, "ToolStrip1") - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButtonJumpFile, Me.ToolStripButtonDeleteFile, Me.ToolStripButtonAnnotation}) + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripDropDownButton2, Me.ToolStripButtonSearchesReload, Me.ToolStripButtonJumpFile, Me.ToolStripButtonDeleteFile, Me.ToolStripButtonAnnotation}) Me.ToolStrip1.Name = "ToolStrip1" ' + 'ToolStripDropDownButton2 + ' + Me.ToolStripDropDownButton2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem1, Me.InfoToolStripMenuItem, Me.EigenschaftenToolStripMenuItem}) + Me.ToolStripDropDownButton2.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Files_7954 + resources.ApplyResources(Me.ToolStripDropDownButton2, "ToolStripDropDownButton2") + Me.ToolStripDropDownButton2.Name = "ToolStripDropDownButton2" + ' + 'DateiÖffnenToolStripMenuItem1 + ' + Me.DateiÖffnenToolStripMenuItem1.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Open_6296 + Me.DateiÖffnenToolStripMenuItem1.Name = "DateiÖffnenToolStripMenuItem1" + resources.ApplyResources(Me.DateiÖffnenToolStripMenuItem1, "DateiÖffnenToolStripMenuItem1") + ' + 'InfoToolStripMenuItem + ' + Me.InfoToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.information + Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem" + resources.ApplyResources(Me.InfoToolStripMenuItem, "InfoToolStripMenuItem") + ' + 'EigenschaftenToolStripMenuItem + ' + Me.EigenschaftenToolStripMenuItem.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.properties_16xLG + Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem" + resources.ApplyResources(Me.EigenschaftenToolStripMenuItem, "EigenschaftenToolStripMenuItem") + ' 'ToolStripButtonJumpFile ' Me.ToolStripButtonJumpFile.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Nextrequest_10302 @@ -822,6 +809,12 @@ Partial Class frmValidator resources.ApplyResources(Me.ToolStripButtonAnnotation, "ToolStripButtonAnnotation") Me.ToolStripButtonAnnotation.Name = "ToolStripButtonAnnotation" ' + 'ToolStripButtonSearchesReload + ' + Me.ToolStripButtonSearchesReload.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.refresh_16xMD + resources.ApplyResources(Me.ToolStripButtonSearchesReload, "ToolStripButtonSearchesReload") + Me.ToolStripButtonSearchesReload.Name = "ToolStripButtonSearchesReload" + ' 'FinalIndexDataSet ' Me.FinalIndexDataSet.DataSetName = "FinalIndexDataSet" @@ -855,7 +848,6 @@ Partial Class frmValidator Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() Me.Panel1.ResumeLayout(False) - Me.ContextMenuStrip1.ResumeLayout(False) CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() @@ -915,9 +907,6 @@ Partial Class frmValidator Friend WithEvents TBPM_KONFIGURATIONBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_CONTROL_TABLETableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter Friend WithEvents TBPM_CONTROL_TABLEBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents ContextMenuStrip1 As System.Windows.Forms.ContextMenuStrip - Friend WithEvents DateiÖffnenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents DateieigenschaftenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents pnlpdf As System.Windows.Forms.Panel Friend WithEvents StatusStrip2 As System.Windows.Forms.StatusStrip Friend WithEvents pdfstatuslblPageNumber As System.Windows.Forms.ToolStripStatusLabel @@ -994,10 +983,12 @@ Partial Class frmValidator Friend WithEvents ToolStripButtonJumpFile As ToolStripButton Friend WithEvents ToolStripButtonDeleteFile As ToolStripButton Friend WithEvents ToolStripButtonAnnotation As ToolStripButton - Friend WithEvents DateiInfoToolStripMenuItem As ToolStripMenuItem - Friend WithEvents RefreshAdditionalSearchToolStripMenuItem As ToolStripMenuItem Friend WithEvents FinalIndexDataSet As FinalIndexDataSet Friend WithEvents TBPM_PROFILE_FINAL_INDEXINGBindingSource As BindingSource Friend WithEvents TBPM_PROFILE_FINAL_INDEXINGTableAdapter As FinalIndexDataSetTableAdapters.TBPM_PROFILE_FINAL_INDEXINGTableAdapter - Friend WithEvents ToolStripSeparator1 As ToolStripSeparator + Friend WithEvents ToolStripDropDownButton2 As ToolStripDropDownButton + Friend WithEvents DateiÖffnenToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents InfoToolStripMenuItem As ToolStripMenuItem + Friend WithEvents EigenschaftenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripButtonSearchesReload As ToolStripButton End Class diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index b0b1c0b..a24bd84 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -130,6 +130,35 @@ 608, 17 + + 0, 621 + + + + 1, 0, 16, 0 + + + 962, 22 + + + + 4 + + + StatusStrip1 + + + StatusStrip1 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + Segoe UI, 9pt, style=Bold @@ -139,7 +168,6 @@ sss - False @@ -155,85 +183,80 @@ Document-ID: - - 0, 621 + + TITLELabel1 - - - 1, 0, 16, 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 962, 22 + + Panel1 - - 4 + + 0 - - StatusStrip1 + + btnSave - - StatusStrip1 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Panel1 - - $this + + 1 - - 3 + + DESCRIPTIONLabel - - 533, 134 - - - 239, 22 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Datei öffnen + + Panel1 - - 239, 22 + + 2 - - Datei-Info + + pnldesigner - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAANlJREFUOE+lkrsRgzAQRCmBEijBNZDTgwNqIacCQkIHFEAJJBRATkBGer6nQTYS - 4mffzBv9dhchKRKRvwhO3uHb8Wqe50R5KbKCcbJI9gNUFCtTWZaSpqkhyzIZx5GQSXmgOwqofHPf985O - 0B0FfMxgzbSE0Ud3OaAoChmGwZgZs64kwQBd4P+dALBmYB3tJmAxd03TOOY1nI1qtmdww8wtmKv0A1rf - zFjn11RK+B1wSAFzp8SLflNOAF/I89yY67o+NVN+wJMQdqJte2amnABbV4y2nIDfkOgNgPkt6Gl+jn4A - AAAASUVORK5CYII= - + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 239, 22 + + Panel1 - - Dateieigenschaften + + 3 - - 236, 6 + + Fill - - False + + 0, 0 - - 239, 22 + + 3, 4, 3, 4 - - Aktualisiere Zusätzliche Suchen + + 477, 593 + + + 24 - - 240, 98 + + Panel1 - - ContextMenuStrip1 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + SplitContainer1.Panel1 + + + 0 Top, Left, Right @@ -364,33 +387,6 @@ 3 - - Fill - - - 0, 0 - - - 3, 4, 3, 4 - - - 477, 593 - - - 24 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainer1.Panel1 - - - 0 - 725, 17 @@ -470,7 +466,7 @@ $this - 7 + 6 Bottom @@ -491,7 +487,7 @@ $this - 6 + 5 Left @@ -512,7 +508,7 @@ $this - 4 + 3 Right @@ -533,7 +529,7 @@ $this - 5 + 4 True @@ -553,6 +549,24 @@ Segoe UI, 9.75pt + + Magenta + + + 67, 22 + + + Datei + + + Magenta + + + 178, 22 + + + Zusätzliche Suchen reload + Magenta @@ -602,7 +616,7 @@ $this - 1 + 0 Top, Bottom, Left, Right @@ -622,21 +636,9 @@ 0 - - Fill - - - 3, 21 - - - 20, 20 - - - 194, 54 - - - 2 - + + 1228, 134 + WebBrowser @@ -649,27 +651,6 @@ 0 - - 1228, 134 - - - 120, 17 - - - ToolStripStatusLabel1 - - - 3, 75 - - - 194, 22 - - - 0 - - - StatusStrip3 - StatusStrip3 @@ -706,21 +687,6 @@ 0 - - Fill - - - Segoe UI, 9.75pt, style=Italic - - - 3, 21 - - - 194, 25 - - - 0 - txtBetreff @@ -794,7 +760,7 @@ $this - 2 + 1 Segoe UI, 9.75pt @@ -1007,36 +973,6 @@ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DateiÖffnenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DateiInfoToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DateieigenschaftenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator1 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - RefreshAdditionalSearchToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - DD_DMSLiteDataSet @@ -1463,6 +1399,30 @@ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripDropDownButton2 + + + System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DateiÖffnenToolStripMenuItem1 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InfoToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + EigenschaftenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ToolStripButtonJumpFile @@ -1481,6 +1441,12 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripButtonSearchesReload + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + FinalIndexDataSet @@ -1529,24 +1495,6 @@ 690, 134 - - Segoe UI Semibold, 9pt, style=Bold, Italic - - - 139, 16 - - - ToolStripStatusLabel1 - - - Magenta - - - 153, 20 - - - Seitenansicht Minimal - 0, 340 @@ -1616,12 +1564,135 @@ 1 + + Segoe UI Semibold, 9pt, style=Bold, Italic + + + 139, 16 + + + ToolStripStatusLabel1 + + + Magenta + + + 153, 20 + + + Seitenansicht Minimal + 807, 134 1080, 134 + + Fill + + + 3, 21 + + + 20, 20 + + + 194, 54 + + + 2 + + + WebBrowser + + + System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxMailBody + + + 0 + + + 1228, 134 + + + 3, 75 + + + 194, 22 + + + 0 + + + StatusStrip3 + + + StatusStrip3 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxMailBody + + + 1 + + + 120, 17 + + + ToolStripStatusLabel1 + + + Fill + + + Segoe UI, 9.75pt, style=Italic + + + 3, 21 + + + 194, 25 + + + 0 + + + txtBetreff + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpBetreff + + + 0 + + + 156, 22 + + + Datei öffnen + + + 156, 22 + + + Info + + + 156, 22 + + + Eigenschaften + 124, 173 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index fa8e3ed..1c32eb8 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -446,7 +446,7 @@ Public Class frmValidator If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Or CURRENT_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then frmValidatorSearch.Show() _frmValidatorSearch = frmValidatorSearch - RefreshAdditionalSearchToolStripMenuItem.Enabled = True + ToolStripButtonSearchesReload.Visible = True Dim oPnl1Collapsed As Boolean = True Dim oPnl2Collapsed As Boolean = True If CURRENT_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then @@ -479,10 +479,10 @@ Public Class frmValidator End If Else LOGGER.Info("Not loading AdditionalSearches...!") - RefreshAdditionalSearchToolStripMenuItem.Enabled = False + ToolStripButtonSearchesReload.Visible = False End If End Sub - Sub LoadSimpleData(control As Control, controlId As Integer) + Sub LoadSQLData(control As Control, controlId As Integer) Try If TypeOf control Is Label Then Exit Sub @@ -520,6 +520,7 @@ Public Class frmValidator If TypeOf control Is TextBox Then Try Dim firstRow As DataRow = dt.Rows(0) + Dim value = firstRow.Item(0) control.Text = value @@ -530,14 +531,18 @@ Public Class frmValidator End Try ElseIf TypeOf control Is ComboBox Then Try - Dim comboxBox As ComboBox = control + Dim oMyComboBox As ComboBox = control + Dim oselectedIndex = oMyComboBox.SelectedIndex + LOGGER.Debug($"oMyComboBox {oMyComboBox.Name} - Saving selected index {oselectedIndex}") Dim list As New List(Of String) For Each _row As DataRow In dt.Rows list.Add(_row.Item(0)) Next - comboxBox.DataSource = list + oMyComboBox.DataSource = list + oMyComboBox.SelectedIndex = oselectedIndex + Catch ex As Exception LOGGER.Error(ex) clsLogger.Add("Error in LoadSimpleData for Combobox: " & ex.Message) @@ -598,7 +603,7 @@ Public Class frmValidator Dim oCount As Integer = 0 For Each oControlRow As DataRow In DTCONTROLS.Rows - Dim ctrl As Control + Dim oMyControl As Control Select Case oControlRow.Item("CTRL_TYPE").ToString.ToUpper Case "TXT" @@ -610,10 +615,10 @@ Public Class frmValidator AddHandler txt.LostFocus, AddressOf OnTextBoxLostFocus AddHandler txt.KeyUp, AddressOf OnTextBoxKeyUp - ctrl = txt + oMyControl = txt Case "LBL" LOGGER.Debug("Versuch LBL zu laden") - ctrl = ClassControlCreator.CreateExistingLabel(oControlRow, False) + oMyControl = ClassControlCreator.CreateExistingLabel(oControlRow, False) Case "CMB" LOGGER.Debug("Versuch CMB zu laden") @@ -746,12 +751,12 @@ Public Class frmValidator End Using cmb.DropDownWidth = maxWith - ctrl = cmb + oMyControl = cmb 'add_ComboBox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), Case "DTP" LOGGER.Debug("Versuch DTP zu laden") - ctrl = ClassControlCreator.CreateExistingDatepicker(oControlRow, False) + oMyControl = ClassControlCreator.CreateExistingDatepicker(oControlRow, False) 'add_DTP(dr.Item("GUID"), dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), Case "DGV" @@ -760,7 +765,7 @@ Public Class frmValidator AddHandler dgv.RowValidating, AddressOf onDGVRowValidating - ctrl = dgv + oMyControl = dgv Case "LOOKUP" LOGGER.Debug("Versuch LOOKUP zu laden") @@ -774,11 +779,11 @@ Public Class frmValidator lookup.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")} End If - ctrl = lookup + oMyControl = lookup 'Wenn Multiselect false dann prüfen ob abhängiges Control If CBool(oControlRow.Item("MULTISELECT")) = False Then Dim filteredData As DataTable = DTCONTROLS.Clone() - Dim oExpression = $"SQL_UEBERPRUEFUNG like '%#CTRL#{ctrl.Name}%'" + Dim oExpression = $"SQL_UEBERPRUEFUNG like '%#CTRL#{oMyControl.Name}%'" DTCONTROLS.Select(oExpression).CopyToDataTable(filteredData, LoadOption.PreserveChanges) If filteredData.Rows.Count = 1 Then 'AddHandler lookup.EditValueChanged, AddressOf onLookUp1 @@ -793,7 +798,7 @@ Public Class frmValidator Case "CHK" LOGGER.Debug("Versuch Checkbox zu laden") - ctrl = ClassControlCreator.CreateExisingCheckbox(oControlRow, False) + oMyControl = ClassControlCreator.CreateExisingCheckbox(oControlRow, False) 'add_Checkbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) Case "TABLE" LOGGER.Debug("Versuch Tabelle zu laden") @@ -802,21 +807,22 @@ Public Class frmValidator Where r.CONTROL_ID = oControlRow.Item("GUID") Select r).ToList() - ctrl = ClassControlCreator.CreateExistingTable(oControlRow, columns, False) + oMyControl = ClassControlCreator.CreateExistingGridControl(oControlRow, columns, False) Case "LINE" LOGGER.Debug("Versuch Linie zu laden") - ctrl = ClassControlCreator.CreateExistingLine(oControlRow, False) + oMyControl = ClassControlCreator.CreateExistingLine(oControlRow, False) End Select - If TypeOf ctrl IsNot Label Then + If TypeOf oMyControl IsNot Label Then If first_control Is Nothing Then - first_control = ctrl + first_control = oMyControl End If - last_control = ctrl + last_control = oMyControl End If - pnldesigner.Controls.Add(ctrl) + + pnldesigner.Controls.Add(oMyControl) 'LoadSimpleData(ctrl, oControlRow.Item("GUID")) Next @@ -1559,7 +1565,7 @@ Public Class frmValidator FillIndexValues(first) For Each oControl As Control In pnldesigner.Controls - LoadSimpleData(oControl, oControl.Tag) + LoadSQLData(oControl, oControl.Tag) Next LOGGER.Debug("Indexmaske geladen") @@ -2076,26 +2082,37 @@ Public Class frmValidator Else If wertWD.ToString = "System.Object[]" Then LOGGER.Debug("TextBox with VektorField: " & oWMIndexName) + Try + LOGGER.Debug($"Length of Vektorarray: {wertWD.length}") + Catch ex As Exception + LOGGER.Info($"Error in gettin the lenth of vektorfield {oWMIndexName} - {ex.Message}") + End Try If wertWD.length = 1 Then wertWD = wertWD(0) - _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD(0) Else ' LOGGER.Info(" >> Vectorfield " & oWMIndexName & "' contains more then one value - First value will be used") wertWD = wertWD(0) - _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD(0) End If + LOGGER.Debug($"wertWD has been saved...") + End If End If End If + Try + oControl.Text = NotNull(wertWD, oDefaultValue) + _CURRENT_INDEX_ARRAY(oCount, 1) = NotNull(wertWD, oDefaultValue) + Catch ex As Exception + LOGGER.Info("ERROR while converting defaultValue [" & oDefaultValue & "]: " & ex.Message) + oControl.Text = "" + _CURRENT_INDEX_ARRAY(oCount, 1) = "" + End Try - oControl.Text = NotNull(wertWD, oDefaultValue) - _CURRENT_INDEX_ARRAY(oCount, 1) = NotNull(wertWD, oDefaultValue) End If Catch ex As Exception LOGGER.Error(ex) - errormessage = "Unvorhergesehener Fehler bei FillIndexValues TextBox:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile" + errormessage = $"Unvorhergesehener Fehler bei FillIndexValues TextBox [{oControl.Name}]:" & vbNewLine & ex.Message & vbNewLine & "Check Logfile" My.Settings.Save() frmError.ShowDialog() LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValuesTextBox: " & ex.Message, True) @@ -2106,7 +2123,7 @@ Public Class frmValidator Case "System.Windows.Forms.ComboBox" oControlType = "ComboBox" - Dim cmb As ComboBox = oControl + Dim oMyCombobox As ComboBox = oControl Try If oWMIndexName = "" Then MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & oControl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) @@ -2115,12 +2132,12 @@ Public Class frmValidator If oWMIndexName Is Nothing = False Then If oLoadIndex = False Or oWMIndexName = "DD PM-ONLY FOR DISPLAY" Then If oDefaultValue = String.Empty Then - cmb.SelectedIndex = -1 + oMyCombobox.SelectedIndex = -1 Else - cmb.Text = oDefaultValue + oMyCombobox.Text = oDefaultValue _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue End If - LOGGER.Debug("Indexwert soll nicht geladen werden.") + LOGGER.Debug($" oMyComboBox {oMyCombobox.Name}: Indexwert soll nicht geladen werden.") Exit Select End If Dim wertWD @@ -2131,39 +2148,58 @@ Public Class frmValidator End If If wertWD Is Nothing Then - LOGGER.Debug($"Indexwert aus index {oWMIndexName}: Nothing") + + LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} - Indexvalue from index {oWMIndexName}: Nothing") If oDefaultValue = String.Empty Then - LOGGER.Debug($"Indexwert-defaultValue wurde nicht gefunden") - cmb.SelectedIndex = -1 + LOGGER.Debug($"oMyComboBox {oMyCombobox.Name}-defaultValue wurde nicht gefunden") + oMyCombobox.SelectedIndex = -1 Else - LOGGER.Debug($"Indexwert-defaultValue wird geladen") - cmb.Text = oDefaultValue + LOGGER.Debug($"oMyComboBox {oMyCombobox.Name}-defaultValue wird geladen") + oMyCombobox.Text = oDefaultValue _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue 'cmb.SelectedIndex = cmb.FindStringExact(defaultValue) End If Else - LOGGER.Debug($"Indexwert aus index {oWMIndexName}: {wertWD}") - LOGGER.Debug($"Items in Combobox: {cmb.Items.Count}") + If wertWD.ToString = "System.Object[]" Then + LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} - Combobox with VektorField: " & oWMIndexName) + Try + LOGGER.Debug($"Length of Vektorarray: {wertWD.length}") + Catch ex As Exception + LOGGER.Info($"Error in gettin the length of vektorfield {oWMIndexName} - {ex.Message}") + End Try + If wertWD.length = 1 Then + wertWD = wertWD(0) + Else ' + LOGGER.Info(" >> Vectorfield " & oWMIndexName & "' contains more then one value - First value will be used") + wertWD = wertWD(0) + End If + LOGGER.Debug($"wertWD has been saved...") + Else + End If + LOGGER.Debug($"Indexwert from Index {oWMIndexName}: {wertWD}") + LOGGER.Debug($"Items in Combobox: {oMyCombobox.Items.Count}") - LOGGER.Debug($"Index Wert wurde gesetzt") - cmb.Text = wertWD _CURRENT_INDEX_ARRAY(oCount, 1) = wertWD - 'If cmb.Items.Count = 0 Then - ' If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde gesetzt") - ' cmb.Text = wertWD - 'Else - ' If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde ausgewählt") - ' cmb.SelectedIndex = cmb.FindStringExact(wertWD) - 'End If + LOGGER.Debug($"_CURRENT_INDEX_ARRAY set...") + If oMyCombobox.Items.Count = 0 Then + ' If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde gesetzt") + oMyCombobox.Text = wertWD + Else + ' If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde ausgewählt") + oMyCombobox.SelectedIndex = oMyCombobox.FindStringExact(wertWD) + LOGGER.Debug($"oMyComboBox {oMyCombobox.Name} .SelectedIndex: {oMyCombobox.SelectedIndex}") + + End If End If End If + LOGGER.Debug("") Catch ex As Exception LOGGER.Error(ex) - LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & cmb.Name & "): " & ex.Message, True) + LOGGER.Info(">> Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & oMyCombobox.Name & "): " & ex.Message, True) LOGGER.Info(">> Controltype: " & oControlType) LOGGER.Info(">> Indexname windream: " & oIndexName) - errormessage = "Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & cmb.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile" + errormessage = "Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & oMyCombobox.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile" My.Settings.Save() frmError.ShowDialog() @@ -2270,7 +2306,7 @@ Public Class frmValidator Dim SpaltenWerte As String() LOGGER.Debug($"{dt.Rows.Count} Columns configured for control {oControlId}.") - If dt.Rows.Count > 1 Then + If dt.Rows.Count >= 1 Then Dim oDataSource As DataTable = dgv.DataSource oDataSource.Rows.Clear() @@ -2369,25 +2405,31 @@ Public Class frmValidator _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue If Boolean.TryParse(oDefaultValue, result) Then chk.Checked = result - + Exit Select End If End If - Exit Select End If - LOGGER.Debug("Loading Index value from Windream.") + LOGGER.Debug("Loading Bool-Value from Windream.") Dim wertWD If oWMIndexName.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then wertWD = ReturnVektor_IndexValue(oWMIndexName) Else - wertWD = CURRENT_WMFILE.GetVariableValue(oWMIndexName) + Try + LOGGER.Debug($"..Now GetVariableValue({oWMIndexName})...") + wertWD = CURRENT_WMFILE.GetVariableValue(oWMIndexName) + Catch ex As Exception + LOGGER.Warn($"Could not get the windreamValue for CheckboxIndex: {oWMIndexName} [{ex.Message}]") + End Try + End If If wertWD Is Nothing Then LOGGER.Info(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & oIndexName & "' ist nothing. Check defaultvalue") + chk.Checked = False Else LOGGER.Debug("Index value loaded: " & wertWD.ToString) @@ -2409,7 +2451,7 @@ Public Class frmValidator Else Dim _value If wertWD.ToString = "System.Object[]" Then - LOGGER.Debug("CheckBoxValue with VektorField: " & oWMIndexName) + LOGGER.Debug("CheckBoxValue with VectorField: " & oWMIndexName) If wertWD.length = 1 Then _value = wertWD(0) Else ' @@ -2417,6 +2459,7 @@ Public Class frmValidator _value = wertWD(0) End If Else + LOGGER.Debug("Value is not nothing and also not System.Object[]...") _value = wertWD End If Try @@ -2606,7 +2649,7 @@ Public Class frmValidator If Check_UpdateIndexe() = False Then 'lblerror.Visible = False Try - Dim oHasError As Boolean = False + Dim oErrorOcurred As Boolean = False TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName) Dim dtfinal As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING @@ -2623,16 +2666,24 @@ Public Class frmValidator LOGGER.Debug("SQL_COMMAND before ReplaceAllValues: " & oSQLCommand) oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - LOGGER.Debug("SQL_COMMAND after ReplaceAllValues: " & oSQLCommand) - - Dim dynamic_value = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True) + If IsNothing(oSQLCommand) Then + errormessage = "Error while replacing Values in final indexing - Check the log" + My.Settings.Save() + frmError.ShowDialog() + oErrorOcurred = True + End If + If Not IsNothing(oSQLCommand) Then + LOGGER.Debug("SQL_COMMAND after ReplaceAllValues: " & oSQLCommand) + Dim dynamic_value = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True) - If Not IsNothing(dynamic_value) Then - LOGGER.Debug("DYNAMIC VALUE IS: " & dynamic_value.ToString) - oValue = dynamic_value - Else - LOGGER.Info("ATTENTION: DYNAMIC VALUE IS NOTHING!") + If Not IsNothing(dynamic_value) Then + LOGGER.Debug("DYNAMIC VALUE IS: " & dynamic_value.ToString) + oValue = dynamic_value + Else + LOGGER.Info("ATTENTION: DYNAMIC VALUE IS NOTHING!") + End If End If + Else If oValue.StartsWith("v") Then Select Case dr.Item("VALUE").ToString @@ -2645,7 +2696,9 @@ Public Class frmValidator End Select End If End If - + If oErrorOcurred Then + Exit For + End If Dim oResult() As String ReDim Preserve oResult(0) oResult(0) = oValue @@ -2661,7 +2714,7 @@ Public Class frmValidator errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message My.Settings.Save() frmError.ShowDialog() - oHasError = True + oErrorOcurred = True End If Else LOGGER.Debug("Jetzt das indexieren") @@ -2677,17 +2730,17 @@ Public Class frmValidator errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message My.Settings.Save() frmError.ShowDialog() - oHasError = True + oErrorOcurred = True End If End If - If oHasError = True Then + If oErrorOcurred = True Then Exit For End If Next End If ''Wenn kein Fehler nach der finalen Indexierung gesetzt wurde - If oHasError = False Then + If oErrorOcurred = False Then LOGGER.Debug("Tabelle updaten und co") 'Das Dokument freigeben und als editiert markieren Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", Environment.UserName, CURRENT_DOC_GUID) @@ -2826,7 +2879,7 @@ Public Class frmValidator errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message My.Settings.Save() frmError.ShowDialog() - oHasError = True + oErrorOcurred = True End If End If 'Validierungsfile löschen wenn vorhanden @@ -2942,9 +2995,12 @@ Public Class frmValidator Return oMissing End Function Function Check_UpdateIndexe() + Dim oControlName + Dim oControlId As String Try Dim dt As DataTable = DD_DMSLiteDataSet.VWPM_CONTROL_INDEX Dim oMissing As Boolean = False + 'Jedes Control auf panel durchlaufen For Each oControl As Control In Me.pnldesigner.Controls 'Der input der Box,Cmb muss jedes mal geleert werden @@ -2961,10 +3017,10 @@ Public Class frmValidator Dim oSQLCheckCommand As String = IIf(IsDBNull(dr.Item("SQL_UEBERPRUEFUNG")), "", dr.Item("SQL_UEBERPRUEFUNG")) Dim oIsReadOnly As Boolean = CBool(dr.Item("READ_ONLY")) Dim oControlType As String = dr.Item("CTRL_TYPE") - Dim oControlId As String = dr.Item("GUID") + oControlId = dr.Item("GUID") Dim oRegexMatch As String = NotNull(dr.Item("REGEX_MATCH"), String.Empty) Dim oRegexMessage As String = NotNull(dr.Item("REGEX_MESSAGE_DE"), String.Empty) - Dim oControlName = dr.Item("CTRL_NAME") + oControlName = dr.Item("CTRL_NAME") 'Nur wenn der Name der Zeile entspricht und der Index READ_ONLY FALSE ist If dr.Item("CTRL_NAME") = oControl.Name And (oIsReadOnly = False Or oSQLCheckCommand <> "") And oIndexName <> "DD PM-ONLY FOR DISPLAY" Then @@ -2978,7 +3034,9 @@ Public Class frmValidator Case "DigitalData.Controls.LookupGrid.LookupControl2" Try Dim lookup As LookupControl2 = oControl - + If oControl.Name = "DGV_ca94be19" Then + 'MsgBox("attebt") + End If If lookup.SelectedValues.Count = 0 And oIsRequired = True Then oMissing = True oErrorMessage = $"Kein Auswahl getroffen in LookupGrid '{oControl.Name}'" @@ -3022,63 +3080,65 @@ Public Class frmValidator Else input = lookup.SelectedValues.FirstOrDefault() - If IsNothing(input) Then + If IsNothing(input) And oIsRequired = True Then oMissing = True - oErrorMessage = "Could not get FirstOrDefault-Value of LookUpGrid!" + oErrorMessage = $"Could not get FirstOrDefault-Value of LookUpGrid! - LookUPGridName: {lookup.Name}" Exit For + ElseIf IsNothing(input) And oIsRequired = False Then + Continue For End If 'den aktuellen Wert in windream auslesen Dim wertWD - If oIndexName.StartsWith("[%VKT") Then - wertWD = ReturnVektor_IndexValue(oIndexName) - Else - wertWD = CURRENT_WMFILE.GetVariableValue(oIndexName) - If Not IsNothing(wertWD) Then - If wertWD.ToString = "System.Object[]" Then - If wertWD.Length = 1 Then - wertWD = wertWD(0) - Else ' - LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") - wertWD = wertWD(0) - End If + If oIndexName.StartsWith("[%VKT") Then + wertWD = ReturnVektor_IndexValue(oIndexName) + Else + wertWD = CURRENT_WMFILE.GetVariableValue(oIndexName) + If Not IsNothing(wertWD) Then + If wertWD.ToString = "System.Object[]" Then + If wertWD.Length = 1 Then + wertWD = wertWD(0) + Else ' + LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") + wertWD = wertWD(0) End If - Else - wertWD = "" End If + Else + wertWD = "" + End If - 'wenn Wert in Windream <> der Eingabe darf indexiert werden - If IsNothing(wertWD) Or wertWD <> input Then - 'Wenn der Wert in ein Vektorfeld geschrieben wird - If oIndexName.StartsWith("[%VKT") Then - input = Return_PM_VEKTOR(input, oIndexName) - 'Hier muss nun separat als Vektorfeld indexiert werden - If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren Textbox als VEKTOR - ERROR: " & idxerr_message - Exit For - End If + 'wenn Wert in Windream <> der Eingabe darf indexiert werden + If IsNothing(wertWD) Or wertWD <> input Then + 'Wenn der Wert in ein Vektorfeld geschrieben wird + If oIndexName.StartsWith("[%VKT") Then + input = Return_PM_VEKTOR(input, oIndexName) + 'Hier muss nun separat als Vektorfeld indexiert werden + If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then + oMissing = True + oErrorMessage = "Fehler beim Indexieren Textbox als VEKTOR - ERROR: " & idxerr_message + Exit For + End If + Else + Dim result() As String + ReDim Preserve result(0) + result(0) = input + If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then + oMissing = True + oErrorMessage = "Fehler beim Indexieren Textbox - ERROR: " & idxerr_message + Exit For Else - Dim result() As String - ReDim Preserve result(0) - result(0) = input - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren Textbox - ERROR: " & idxerr_message - Exit For - Else - 'Nun das Logging - If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(input, wertWD, oIndexName) - Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) - End If + 'Nun das Logging + If PROFIL_LOGINDEX <> "" Then + input = Return_LOGString(input, wertWD, oIndexName) + Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) End If End If End If End If End If - End If + + End If Catch ex As Exception LOGGER.Error(ex) @@ -3178,53 +3238,105 @@ Public Class frmValidator End Try Case "System.Windows.Forms.ComboBox" - Dim cmb As ComboBox = oControl - 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss - If cmb.SelectedIndex = -1 And oIsRequired = True Then - oMissing = True - oErrorMessage = "Please Choose an entry out of ComboBox '" & cmb.Name & "'" - Exit For - 'ElseIf cmb.SelectedIndex <> -1 Then - Else 'Änderung 28.08.2018: Ein leerer Wert in der Combobox wird in den Index geschrieben - input = cmb.Text - Dim wertWD As String - 'den aktuellen Wert in windream auslesen - If oIndexName.StartsWith("[%VKT") Then - wertWD = ReturnVektor_IndexValue(oIndexName) - Else - wertWD = CURRENT_WMFILE.GetVariableValue(oIndexName) - End If - - 'wenn Wert in Windream <> der Eingabe darf indexiert werden - If wertWD <> input Then - 'Wenn der Wert in ein Vektorfeld geschrieben wird + Try + LOGGER.Debug($"Working on Combobox...") + Dim cmb As ComboBox = oControl + 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss + If cmb.SelectedIndex = -1 And oIsRequired = True Then + oMissing = True + oErrorMessage = "Please Choose an entry out of ComboBox '" & cmb.Name & "'" + Exit For + 'ElseIf cmb.SelectedIndex <> -1 Then + Else 'Änderung 28.08.2018: Ein leerer Wert in der Combobox wird in den Index geschrieben + input = cmb.Text + LOGGER.Debug($"inputvalue Combobox: {cmb.Text}") + Dim oWMValue + 'den aktuellen Wert in windream auslesen If oIndexName.StartsWith("[%VKT") Then - input = Return_PM_VEKTOR(input, oIndexName) - 'Hier muss nun separat als Vektorfeld indexiert werden - If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then - oMissing = True - oErrorMessage = "Fehler beim Indexieren Combobox als VEKTOR - ERROR: " & idxerr_message - Exit For + oWMValue = ReturnVektor_IndexValue(oIndexName) + Else + oWMValue = CURRENT_WMFILE.GetVariableValue(oIndexName) + End If + LOGGER.Debug($"Got a WMValue...") + If IsNothing(oWMValue) Then + LOGGER.Debug($"WMValue is nothing...Value EmptyString will be used") + oWMValue = String.Empty + End If + Dim oIndexType As String = "Index" + Try + If oWMValue.ToString = "System.Object[]" Then + oIndexType = "Vector" + End If + Catch ex As Exception + LOGGER.Debug($"Exception while oWMValue.ToString = System.Object[]...") + End Try + If oIndexType = "Vector" Then + LOGGER.Debug($"Control with ID{oControlId} is a vectorfield...") + If oWMValue.Length = 1 Then + oWMValue = oWMValue(0).ToString + Else ' + LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") + oWMValue = oWMValue(0).ToString End If Else - Dim result() As String - ReDim Preserve result(0) - result(0) = input - If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then - cmb.DroppedDown = True - oMissing = True - oErrorMessage = "Fehler beim Indexieren Combobox - ERROR: " & idxerr_message - Exit For - Else - 'Nun das Logging - If PROFIL_LOGINDEX <> "" Then - input = Return_LOGString(input, wertWD, oIndexName) - Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) + LOGGER.Debug($"WMValue is a regular item...") + Dim oitsadifference As Boolean = False + Try + If oWMValue.ToString <> input.ToString Then + oitsadifference = True End If + Catch ex As Exception + LOGGER.Warn($"Could not convert the WMValue of Control with ID{oControlId}...") + LOGGER.Error(ex.Message) + oitsadifference = True + End Try + 'wenn Wert in Windream <> der Eingabe darf indexiert werden + If oitsadifference = True Then + LOGGER.Debug($"Index with ID{oControlId} will now be indexed...") + 'Wenn der Wert in ein Vektorfeld geschrieben wird + If oIndexName.StartsWith("[%VKT") Then + input = Return_PM_VEKTOR(input, oIndexName) + 'Hier muss nun separat als Vektorfeld indexiert werden + If Indexiere_VektorfeldPM(input, PROFIL_VEKTORINDEX) = True Then + oMissing = True + oErrorMessage = "Fehler beim Indexieren Combobox als VEKTOR - ERROR: " & idxerr_message + Exit For + End If + Else + Dim result() As String + ReDim Preserve result(0) + result(0) = input + If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then + cmb.DroppedDown = True + oMissing = True + oErrorMessage = "Fehler beim Indexieren Combobox - ERROR: " & idxerr_message + Exit For + Else + 'Nun das Logging + If PROFIL_LOGINDEX <> "" Then + input = Return_LOGString(input, oWMValue, oIndexName) + Indexiere_VektorfeldPM(input, PROFIL_LOGINDEX) + End If + End If + End If + Else + LOGGER.Debug($"oitsadifference = False...Index with ID{oControlId} will not be indexed...") + 'Wenn der Wert in ein Vektorfeld geschrieben wird End If End If + + + End If - End If + Catch ex As Exception + LOGGER.Error(ex) + Dim st As New StackTrace(True) + st = New StackTrace(ex, True) + MsgBox($"Unvorhergesehener Fehler in Check_UpdateIndexe Combobox : ID{oControlId} " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Error:") + LOGGER.Info($"Unvorhergesehener Fehler in Check_UpdateIndexe Combobox : ID{oControlId}" & ex.Message) + Return True + End Try + Case "System.Windows.Forms.DateTimePicker" Dim dtp As DateTimePicker = oControl 'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss @@ -3285,11 +3397,11 @@ Public Class frmValidator Dim chk As CheckBox = oControl input = chk.Checked.ToString - If chk.Checked = False And oIsRequired = True Then - oMissing = True - oErrorMessage = "Option '" & chk.Name & "' is required." - Exit For - End If + 'If chk.Checked = False And oIsRequired = True Then + ' oMissing = True + ' oErrorMessage = "Option '" & chk.Name & "' is required." + ' Exit For + 'End If 'den aktuellen Wert in windream auslesen Dim WertWD As String @@ -3506,10 +3618,11 @@ Public Class frmValidator Return oMissing Catch ex As Exception + LOGGER.Warn($"Unexpected error in Check_UpdateIndexe - ControlID: {oControlId},{oControlName}") LOGGER.Error(ex) Dim st As New StackTrace(True) st = New StackTrace(ex, True) - MsgBox("Unvorhergesehener Fehler in Check_UpdateIndexe: " & vbNewLine & ex.Message & vbNewLine & "Line: " & st.GetFrame(0).GetFileLineNumber().ToString, MsgBoxStyle.Critical, "Error:") + MsgBox($"Unvorhergesehener Fehler in Check_UpdateIndexe ControlID,Name: {oControlId},{oControlName}" & vbNewLine & ex.Message & vbNewLine & "Line: " & st.GetFrame(0).GetFileLineNumber().ToString, MsgBoxStyle.Critical, "Error:") LOGGER.Info("Unvorhergesehener Fehler in Check_UpdateIndexe:" & ex.Message & " - Line: " & st.GetFrame(0).GetFileLineNumber().ToString, True) Return True End Try @@ -3622,23 +3735,6 @@ Public Class frmValidator navStep = Nothing End If End Sub - - Private Sub DateiÖffnenToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles DateiÖffnenToolStripMenuItem.Click - Try - Dim Proc As New System.Diagnostics.Process - Dim psi As New ProcessStartInfo(WMDocPathWindows) - Proc.EnableRaisingEvents = True - Proc.StartInfo = psi - Proc.Start() - LOGGER.Info(" - Datei wurde geöffnet!") - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Fehler bei Datei öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - LOGGER.Info("Fehler bei Datei öffnen: " & ex.Message, True) - End Try - - - End Sub Sub Datei_ueberspringen() Try LOGGER.Debug("Dokument überspringen") @@ -3741,24 +3837,6 @@ Public Class frmValidator Public hIcon As IntPtr Public hProcess As IntPtr End Structure - - Private Sub DateieigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateieigenschaftenToolStripMenuItem.Click - If WMDocPathWindows <> "" Then - Cursor = Cursors.WaitCursor - Dim oShellExecuteInfo As New SHELLEXECUTEINFO - oShellExecuteInfo.cbSize = Marshal.SizeOf(oShellExecuteInfo) - oShellExecuteInfo.lpVerb = "properties" - oShellExecuteInfo.lpFile = WMDocPathWindows - oShellExecuteInfo.nShow = SW_SHOW - oShellExecuteInfo.fMask = SEE_MASK_INVOKEIDLIST - If Not ShellExecuteEx(oShellExecuteInfo) Then - Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error()) - MsgBox("Fehler in Datei-Eigenschaften öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End If - End If - Cursor = Cursors.Default - - End Sub Private Sub frmValidation_ResizeEnd(sender As Object, e As EventArgs) Handles Me.ResizeEnd If WMDocPathWindows Is Nothing = False Then Select Case Path.GetExtension(WMDocPathWindows).ToLower @@ -3851,11 +3929,44 @@ Public Class frmValidator End Sub - Private Sub DateiInfoToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiInfoToolStripMenuItem.Click + Private Sub InfoToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles InfoToolStripMenuItem.Click frmFileInfo.ShowDialog() End Sub - Private Sub RefreshAdditionalSearchToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RefreshAdditionalSearchToolStripMenuItem.Click + Private Sub EigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EigenschaftenToolStripMenuItem.Click + If WMDocPathWindows <> "" Then + Cursor = Cursors.WaitCursor + Dim oShellExecuteInfo As New SHELLEXECUTEINFO + oShellExecuteInfo.cbSize = Marshal.SizeOf(oShellExecuteInfo) + oShellExecuteInfo.lpVerb = "properties" + oShellExecuteInfo.lpFile = WMDocPathWindows + oShellExecuteInfo.nShow = SW_SHOW + oShellExecuteInfo.fMask = SEE_MASK_INVOKEIDLIST + If Not ShellExecuteEx(oShellExecuteInfo) Then + Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error()) + MsgBox("Fehler in Datei-Eigenschaften öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End If + End If + Cursor = Cursors.Default + + End Sub + + Private Sub DateiÖffnenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles DateiÖffnenToolStripMenuItem1.Click + Try + Dim Proc As New System.Diagnostics.Process + Dim psi As New ProcessStartInfo(WMDocPathWindows) + Proc.EnableRaisingEvents = True + Proc.StartInfo = psi + Proc.Start() + LOGGER.Info(" - Datei wurde geöffnet!") + Catch ex As Exception + LOGGER.Error(ex) + MsgBox("Fehler bei Datei öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + LOGGER.Info("Fehler bei Datei öffnen: " & ex.Message, True) + End Try + End Sub + + Private Sub ToolStripButtonSearchesReload_Click(sender As Object, e As EventArgs) Handles ToolStripButtonSearchesReload.Click Load_Additional_Searches() End Sub End Class \ No newline at end of file