From 72c7d94f0e2e1179eb3a64624092616c3f21e5fe Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 25 Sep 2018 09:04:15 +0200 Subject: [PATCH] MS Changes --- app/DD_PM_WINDREAM/ClassDatabase.vb | 5 +- app/DD_PM_WINDREAM/ClassInit.vb | 27 ++-- app/DD_PM_WINDREAM/ClassLogger.vb | 4 +- app/DD_PM_WINDREAM/frmMain.Designer.vb | 37 +++-- app/DD_PM_WINDREAM/frmMain.resx | 185 ++++++++++++++++--------- app/DD_PM_WINDREAM/frmMassValidator.vb | 3 +- app/DD_PM_WINDREAM/frmValidator.vb | 91 ++++++------ 7 files changed, 213 insertions(+), 139 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassDatabase.vb b/app/DD_PM_WINDREAM/ClassDatabase.vb index 3c9efa0..046651f 100644 --- a/app/DD_PM_WINDREAM/ClassDatabase.vb +++ b/app/DD_PM_WINDREAM/ClassDatabase.vb @@ -58,6 +58,7 @@ Public Class ClassDatabase Try Dim SQLconnect As New SqlClient.SqlConnection Dim SQLcommand As SqlClient.SqlCommand + If LogErrorsOnly = False Then ClassLogger.Add(">>> ReturnDatatable: " & Select_anweisung, False) SQLconnect.ConnectionString = SQLSERVERConnectionString SQLconnect.Open() SQLcommand = SQLconnect.CreateCommand @@ -81,7 +82,7 @@ Public Class ClassDatabase Public Shared Function Return_Datatable_CS(Select_anweisung As String, Conn_ID As Integer, Optional userInput As Boolean = False) Try Dim ConString As String = Get_ConnectionString(Conn_ID) - + If LogErrorsOnly = False Then ClassLogger.Add(">>> ReturnDatatable: " & Select_anweisung, False) Dim SQLconnect As New SqlClient.SqlConnection Dim SQLcommand As SqlClient.SqlCommand SQLconnect.ConnectionString = ConString @@ -108,6 +109,7 @@ Public Class ClassDatabase Dim SQLconnect As New SqlClient.SqlConnection Dim SQLcommand As SqlClient.SqlCommand SQLconnect.ConnectionString = SQLSERVERConnectionString + If LogErrorsOnly = False Then ClassLogger.Add(">>> Execute_non_Query: " & ExecuteCMD, False) SQLconnect.Open() SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo @@ -134,6 +136,7 @@ Public Class ClassDatabase Dim SQLconnect As New SqlClient.SqlConnection Dim SQLcommand As SqlClient.SqlCommand SQLconnect.ConnectionString = ConString + If LogErrorsOnly = False Then ClassLogger.Add(">>> Execute_non_Query: " & cmdscalar, False) SQLconnect.Open() SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index db2932d..1a43d20 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -137,8 +137,8 @@ Public Class ClassInit USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") If LogErrorsOnly = False Then ClassLogger.Add(" >> User exists....", False) - 'Am System anmelden - Refresh_Licence() + 'Am System anmelden + Refresh_Licence() 'Check_User_Exists_in_PMGroups() ClassAllgemeineFunktionen.LoginOut("LOGIN") @@ -148,21 +148,18 @@ Public Class ClassInit sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'Process-Manager'" ClassDatabase.Execute_non_Query(sql, True) If LogErrorsOnly = False Then ClassLogger.Add(" >> Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString, False) - If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then - MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") - ClassLogger.Add(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Process Manager!", False) - If USER_IS_ADMIN = False Then - ClassAllgemeineFunktionen.LoginOut("LOGOUT") - ClassLogger.Add(" - Wieder abgemeldet - START INCOMPLETE", False) - ERROR_STATE = "START INCOMPLETE" - End If + If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then + MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") + ClassLogger.Add(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Process Manager!", False) + If USER_IS_ADMIN = False Then + ClassAllgemeineFunktionen.LoginOut("LOGOUT") + ClassLogger.Add(" - Wieder abgemeldet - START INCOMPLETE", False) + ERROR_STATE = "START INCOMPLETE" End If - 'Alles OK bis hierhin...nun die FolderwatchKonfig laden - If LogErrorsOnly = False Then ClassLogger.Add(" >> Init Userlogin successfull completed....", False) End If - - - + 'Alles OK bis hierhin...nun die FolderwatchKonfig laden + If LogErrorsOnly = False Then ClassLogger.Add(" >> Init Userlogin successfull completed....", False) + End If Catch ex As Exception ClassLogger.Add("Unexpected Error in InitUserLogin: " & ex.Message, True) ERROR_STATE = "START INCOMPLETE" diff --git a/app/DD_PM_WINDREAM/ClassLogger.vb b/app/DD_PM_WINDREAM/ClassLogger.vb index 816ee98..7b05c8e 100644 --- a/app/DD_PM_WINDREAM/ClassLogger.vb +++ b/app/DD_PM_WINDREAM/ClassLogger.vb @@ -76,9 +76,9 @@ Public Class ClassLogger If ClassLogger.OpenFile Then Try If ACHTUNG Then - ClassLogger.StreamWriter.WriteLine("#ACHTUNG# (" & System.DateTime.Now & "): " & information) + ClassLogger.StreamWriter.WriteLine(System.DateTime.Now & " #ACHTUNG#: " & information) Else - ClassLogger.StreamWriter.WriteLine(information) + ClassLogger.StreamWriter.WriteLine(System.DateTime.Now & " " & information) End If ClassLogger.CloseFile() Catch e As Exception diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 7794ac5..602363a 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmMain 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Me.SplitContainerDashboard = New System.Windows.Forms.SplitContainer() Me.SplitContainerTop = New System.Windows.Forms.SplitContainer() @@ -34,9 +35,9 @@ Partial Class frmMain Me.ToolStripBottomLeft = New System.Windows.Forms.ToolStrip() Me.ChartBottomRight = New DevExpress.XtraCharts.ChartControl() Me.ToolStripBottomRight = New System.Windows.Forms.ToolStrip() - Me.ImageListProfile = New System.Windows.Forms.ImageList() + Me.ImageListProfile = New System.Windows.Forms.ImageList(Me.components) Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() - Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter() Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() @@ -56,8 +57,8 @@ Partial Class frmMain Me.tslblmessage = New System.Windows.Forms.ToolStripStatusLabel() Me.Panel1 = New System.Windows.Forms.Panel() Me.pnlNavigator = New System.Windows.Forms.Panel() - Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator() - Me.bindsourcegrid = New System.Windows.Forms.BindingSource() + Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator(Me.components) + Me.bindsourcegrid = New System.Windows.Forms.BindingSource(Me.components) Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() @@ -68,7 +69,7 @@ Partial Class frmMain Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.GridControl_Docs = New DevExpress.XtraGrid.GridControl() - Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.CMGroupStart = New System.Windows.Forms.ToolStripMenuItem() Me.CMFileStart = New System.Windows.Forms.ToolStripMenuItem() Me.MarkierteDateienAbschliessenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -77,20 +78,20 @@ Partial Class frmMain Me.lblViewType = New System.Windows.Forms.Label() Me.NavBarControl1 = New DevExpress.XtraNavBar.NavBarControl() Me.NavBarGroupProfiles = New DevExpress.XtraNavBar.NavBarGroup() - Me.cmsNavPane = New System.Windows.Forms.ContextMenuStrip() + Me.cmsNavPane = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.tsmiValidationProfil = New System.Windows.Forms.ToolStripMenuItem() Me.NavBarGroupMore = New DevExpress.XtraNavBar.NavBarGroup() Me.NavBarItemOverview = New DevExpress.XtraNavBar.NavBarItem() Me.NavBarItemDashboard = New DevExpress.XtraNavBar.NavBarItem() - Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon() - Me.TimerRefresh = New System.Windows.Forms.Timer() - Me.TBPM_USERBindingSource = New System.Windows.Forms.BindingSource() + Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) + Me.TimerRefresh = New System.Windows.Forms.Timer(Me.components) + Me.TBPM_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_USERTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter() - Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_KONFIGURATIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() - Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource() + Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() - Me.TimerReminder = New System.Windows.Forms.Timer() + Me.TimerReminder = New System.Windows.Forms.Timer(Me.components) CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerDashboard.Panel1.SuspendLayout() Me.SplitContainerDashboard.Panel2.SuspendLayout() @@ -163,6 +164,7 @@ Partial Class frmMain 'ToolStripTopLeft ' Me.ToolStripTopLeft.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden + Me.ToolStripTopLeft.ImageScalingSize = New System.Drawing.Size(20, 20) resources.ApplyResources(Me.ToolStripTopLeft, "ToolStripTopLeft") Me.ToolStripTopLeft.Name = "ToolStripTopLeft" ' @@ -175,6 +177,7 @@ Partial Class frmMain 'ToolStripTopRight ' Me.ToolStripTopRight.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden + Me.ToolStripTopRight.ImageScalingSize = New System.Drawing.Size(20, 20) resources.ApplyResources(Me.ToolStripTopRight, "ToolStripTopRight") Me.ToolStripTopRight.Name = "ToolStripTopRight" ' @@ -202,6 +205,7 @@ Partial Class frmMain 'ToolStripBottomLeft ' Me.ToolStripBottomLeft.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden + Me.ToolStripBottomLeft.ImageScalingSize = New System.Drawing.Size(20, 20) resources.ApplyResources(Me.ToolStripBottomLeft, "ToolStripBottomLeft") Me.ToolStripBottomLeft.Name = "ToolStripBottomLeft" ' @@ -214,6 +218,7 @@ Partial Class frmMain 'ToolStripBottomRight ' Me.ToolStripBottomRight.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden + Me.ToolStripBottomRight.ImageScalingSize = New System.Drawing.Size(20, 20) resources.ApplyResources(Me.ToolStripBottomRight, "ToolStripBottomRight") Me.ToolStripBottomRight.Name = "ToolStripBottomRight" ' @@ -258,6 +263,7 @@ Partial Class frmMain 'ToolStrip1 ' resources.ApplyResources(Me.ToolStrip1, "ToolStrip1") + Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20) Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabel1, Me.ToolStripSeparator2, Me.ToolStripButton2, Me.ToolStripButton1, Me.ToolStripSeparator1, Me.tstrpbtn_Config, Me.tsbtnrefresh}) Me.ToolStrip1.Name = "ToolStrip1" ' @@ -308,6 +314,7 @@ Partial Class frmMain 'StatusStrip1 ' resources.ApplyResources(Me.StatusStrip1, "StatusStrip1") + Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(20, 20) Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsstlblUser, Me.tslblLicenses, Me.tslblUserLoggedin, Me.tslblVersion, Me.tsslblLastSysnc, Me.tslblmessage}) Me.StatusStrip1.Name = "StatusStrip1" ' @@ -385,6 +392,7 @@ Partial Class frmMain Me.BindingNavigator1.CountItemFormat = "von {0} Dateien" Me.BindingNavigator1.DeleteItem = Nothing resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1") + Me.BindingNavigator1.ImageScalingSize = New System.Drawing.Size(20, 20) Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2}) Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem @@ -446,13 +454,15 @@ Partial Class frmMain ' resources.ApplyResources(Me.GridControl_Docs, "GridControl_Docs") Me.GridControl_Docs.ContextMenuStrip = Me.ContextMenuGrid + Me.GridControl_Docs.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControl_Docs.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding) Me.GridControl_Docs.MainView = Me.GridView_Docs Me.GridControl_Docs.Name = "GridControl_Docs" Me.GridControl_Docs.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView_Docs}) ' 'ContextMenuGrid ' - Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.MarkierteDateienAbschliessenToolStripMenuItem, Me.TabellenlayoutZurücksetzenToolStripMenuItem}) + Me.ContextMenuGrid.ImageScalingSize = New System.Drawing.Size(20, 20) + Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.TabellenlayoutZurücksetzenToolStripMenuItem, Me.MarkierteDateienAbschliessenToolStripMenuItem}) Me.ContextMenuGrid.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuGrid, "ContextMenuGrid") ' @@ -518,6 +528,7 @@ Partial Class frmMain ' 'cmsNavPane ' + Me.cmsNavPane.ImageScalingSize = New System.Drawing.Size(20, 20) Me.cmsNavPane.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiValidationProfil}) Me.cmsNavPane.Name = "cmsNavPane" resources.ApplyResources(Me.cmsNavPane, "cmsNavPane") diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index c65500c..4b12366 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -123,7 +123,10 @@ - 242, 61 + 296, 77 + + + 4, 4, 4, 4 Horizontal @@ -134,14 +137,20 @@ 0, 0 + + 4, 4, 4, 4 + Fill 0, 25 + + 4, 4, 4, 4 + - 258, 237 + 315, 307 @@ -166,7 +175,7 @@ 0, 0 - 258, 25 + 315, 25 1 @@ -204,8 +213,11 @@ 0, 25 + + 4, 4, 4, 4 + - 516, 237 + 631, 307 1 @@ -229,7 +241,7 @@ 0, 0 - 516, 25 + 631, 25 0 @@ -262,10 +274,13 @@ 1 - 778, 262 + 951, 332 - 258 + 315 + + + 5 0 @@ -300,14 +315,20 @@ 0, 0 + + 4, 4, 4, 4 + Fill 0, 25 + + 4, 4, 4, 4 + - 258, 147 + 315, 194 1 @@ -331,7 +352,7 @@ 0, 0 - 258, 25 + 315, 25 0 @@ -369,8 +390,11 @@ 0, 25 + + 4, 4, 4, 4 + - 516, 147 + 631, 194 1 @@ -394,7 +418,7 @@ 0, 0 - 516, 25 + 631, 25 0 @@ -427,10 +451,13 @@ 1 - 778, 172 + 951, 219 - 258 + 315 + + + 5 0 @@ -460,10 +487,13 @@ 1 - 778, 438 + 951, 556 - 262 + 332 + + + 5 7 @@ -488,7 +518,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAZQBAwGUAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAZwBAwGcAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -551,19 +581,19 @@ Segoe UI, 9pt, style=Bold, Italic - 105, 22 + 131, 24 Übersicht-Profile - 6, 25 + 6, 27 Magenta - 23, 22 + 24, 24 ToolStripButton2 @@ -575,19 +605,19 @@ Magenta - 132, 22 + 153, 24 Grundeinstellungen - 6, 25 + 6, 27 Magenta - 141, 22 + 165, 24 Verwaltungs-Konsole @@ -599,7 +629,7 @@ Magenta - 95, 22 + 111, 24 Aktualisieren @@ -608,7 +638,7 @@ 0, 0 - 1023, 25 + 1250, 27 2 @@ -635,25 +665,25 @@ Tahoma, 9pt - 146, 20 + 170, 24 ToolStripStatusLabel1 - 116, 20 + 139, 24 Anzahl Lizenzen: - 133, 20 + 157, 24 Angemeldete User: - 130, 20 + 150, 24 ToolStripStatusLabel1 @@ -671,19 +701,22 @@ No - 159, 20 + 187, 24 Letzte Synchronisation: - 0, 20 + 0, 24 - 0, 502 + 0, 637 + + + 1, 0, 17, 0 - 1023, 25 + 1250, 29 3 @@ -713,7 +746,7 @@ 503, 134 - 87, 22 + 111, 29 von {0} Dateien @@ -739,7 +772,7 @@ True - 23, 22 + 24, 29 Erste verschieben @@ -757,13 +790,13 @@ True - 23, 22 + 24, 29 Vorherige verschieben - 6, 25 + 6, 32 Position @@ -772,7 +805,7 @@ False - 50, 23 + 60, 27 0 @@ -781,7 +814,7 @@ Aktuelle Position - 6, 25 + 6, 32 @@ -796,7 +829,7 @@ True - 23, 22 + 24, 29 Nächste verschieben @@ -816,19 +849,19 @@ True - 23, 22 + 24, 29 Letzte verschieben - 6, 25 + 6, 32 0, 0 - 778, 25 + 951, 32 9 @@ -849,10 +882,13 @@ 0 - 242, 45 + 296, 57 + + + 4, 4, 4, 4 - 778, 25 + 951, 32 10 @@ -876,17 +912,23 @@ 637, 95 - 265, 22 + 322, 26 Validierung für Gruppe/Profil starten - 265, 22 + 322, 26 Validierung für Datei starten + + 322, 26 + + + Tabellenlayout zurücksetzen + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -897,19 +939,13 @@ - 265, 22 + 322, 26 Massenabschluss markierte Dateien - - 265, 22 - - - Tabellenlayout zurücksetzen - - 266, 92 + 323, 136 ContextMenuGrid @@ -917,14 +953,20 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 4, 4, 4 + - 242, 73 + 296, 92 Aqua + + 4, 4, 4, 4 + - 778, 426 + 951, 541 8 @@ -948,10 +990,13 @@ Tahoma, 9.75pt - 239, 25 + 292, 32 + + + 4, 0, 4, 0 - 75, 16 + 98, 21 6 @@ -1027,13 +1072,13 @@ 786, 95 - 215, 22 + 261, 26 Starte Validierung für Profil - 216, 26 + 262, 30 cmsNavPane @@ -1203,13 +1248,16 @@ - 0, 25 + 0, 27 + + + 4, 4, 4, 4 - 233 + 285 - 233, 477 + 285, 610 5 @@ -1238,8 +1286,11 @@ 0, 0 + + 4, 4, 4, 4 + - 1023, 502 + 1250, 637 4 @@ -1799,10 +1850,10 @@ 208 - 9, 19 + 11, 24 - 1023, 527 + 1250, 666 Tahoma, 12pt @@ -2138,7 +2189,7 @@ - 4, 5, 4, 5 + 5, 6, 5, 6 Process Manager - Profil-Monitor diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index dc35a3b..516f1fb 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -742,7 +742,8 @@ Public Class frmMassValidator If resultDT.Rows.Count = 1 Then pnldesigner.Controls(displayboxname).Text = resultDT.Rows(0).Item(0).ToString Else - pnldesigner.Controls(displayboxname).Text = "RESULT = NOTHING or MORE THAN 1 ROW" + pnldesigner.Controls(displayboxname).Text = "RESULT = resultDT.Rows.Count <> 1" + ClassLogger.Add(">> Datatable-SQL: " & sqlCommand, False) End If End If End If diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 240ce2d..e33cd59 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1750,54 +1750,65 @@ Public Class frmValidator Case "System.Windows.Forms.ComboBox" controltype = "ComboBox" Dim cmb As ComboBox = inctrl - If idxname = "" Then - MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & inctrl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) - Exit For - End If - If idxname Is Nothing = False Then - If LoadIDX = False Or idxname = "DD PM-ONLY FOR DISPLAY" Then - If defaultValue = String.Empty Then - cmb.SelectedIndex = -1 + Try + If idxname = "" Then + MsgBox("Achtung fehlerhafte Konfiguration:" & vbNewLine & "Für das Control " & inctrl.Name & " wurde KEIN INDEX hinterlegt!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + Exit For + End If + If idxname Is Nothing = False Then + If LoadIDX = False Or idxname = "DD PM-ONLY FOR DISPLAY" Then + If defaultValue = String.Empty Then + cmb.SelectedIndex = -1 + Else + cmb.Text = defaultValue + End If + If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexwert soll nicht geladen werden.", False) + Exit Select + End If + Dim wertWD + If idxname.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then + wertWD = ReturnVektor_IndexValue(idxname) Else - cmb.Text = defaultValue + wertWD = aktivesDokument.GetVariableValue(idxname) End If - If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexwert soll nicht geladen werden.", False) - Exit Select - End If - Dim wertWD - If idxname.StartsWith("[%VKT") And PROFIL_VEKTORINDEX <> "" Then - wertWD = ReturnVektor_IndexValue(idxname) - Else - wertWD = aktivesDokument.GetVariableValue(idxname) - End If - If wertWD Is Nothing Then - If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert aus index {idxname}: Nothing", False) - If defaultValue = String.Empty Then - If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert-defaultValue wurde nicht gefunden", False) - cmb.SelectedIndex = -1 + If wertWD Is Nothing Then + If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert aus index {idxname}: Nothing", False) + If defaultValue = String.Empty Then + If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert-defaultValue wurde nicht gefunden", False) + cmb.SelectedIndex = -1 + Else + If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert-defaultValue wird geladen", False) + cmb.Text = defaultValue + 'cmb.SelectedIndex = cmb.FindStringExact(defaultValue) + End If Else - If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert-defaultValue wird geladen", False) - cmb.Text = defaultValue - 'cmb.SelectedIndex = cmb.FindStringExact(defaultValue) - End If - Else - If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert aus index {idxname}: {wertWD}", False) - If LogErrorsOnly = False Then ClassLogger.Add($" >> Items in Combobox: {cmb.Items.Count}", False) + If LogErrorsOnly = False Then ClassLogger.Add($" >> Indexwert aus index {idxname}: {wertWD}", False) + If LogErrorsOnly = False Then ClassLogger.Add($" >> Items in Combobox: {cmb.Items.Count}", False) - If LogErrorsOnly = False Then ClassLogger.Add($" >> Index Wert wurde gesetzt", False) - cmb.Text = wertWD + If LogErrorsOnly = False Then ClassLogger.Add($" >> Index Wert wurde gesetzt", False) + cmb.Text = wertWD - 'If cmb.Items.Count = 0 Then - ' If LogErrorsOnly = False Then ClassLogger.Add($" >> Index Wert wurde gesetzt", False) - ' cmb.Text = wertWD - 'Else - ' If LogErrorsOnly = False Then ClassLogger.Add($" >> Index Wert wurde ausgewählt", False) - ' cmb.SelectedIndex = cmb.FindStringExact(wertWD) - 'End If + 'If cmb.Items.Count = 0 Then + ' If LogErrorsOnly = False Then ClassLogger.Add($" >> Index Wert wurde gesetzt", False) + ' cmb.Text = wertWD + 'Else + ' If LogErrorsOnly = False Then ClassLogger.Add($" >> Index Wert wurde ausgewählt", False) + ' cmb.SelectedIndex = cmb.FindStringExact(wertWD) + 'End If + End If End If - End If + Catch ex As Exception + ClassLogger.Add(">> Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & cmb.Name & "): " & ex.Message, True) + ClassLogger.Add(">> Controltype: " & controltype, False) + ClassLogger.Add(">> Indexname windream: " & indexname, False) + errormessage = "Unvorhergesehener Fehler bei FillIndexValues(Combobox: " & cmb.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile" + My.Settings.Save() + frmError.ShowDialog() + + End Try + Case "System.Windows.Forms.DataGridView" controltype = "DataGridView" Dim dgv As DataGridView = inctrl