diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb index fb538ad..94e3906 100644 --- a/app/DD_PM_WINDREAM/ClassControlCreator.vb +++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb @@ -366,9 +366,13 @@ Public Class ClassControlCreator If FilteredRows.Count = 1 Then For Each row As DataRow In FilteredRows CURRENT_CONTROL_ID = row("GUID") - CURR_CON_ID = row("CONNECTION_ID") - CURR_SELECT_CONTROL = row("SQL_UEBERPRUEFUNG") - CURR_CHOICE_LIST = row("CHOICE_LIST") + CURR_CON_ID = IIf(IsDBNull(row("CONNECTION_ID")), 0, row("CONNECTION_ID")) + If CURR_CON_ID = 0 Then + ClassLogger.Add(" >> CONNECTION NOT DEFINED - CTRL_GUID:" & CURRENT_CONTROL_ID, False) + End If + + CURR_SELECT_CONTROL = IIf(IsDBNull(row("SQL_UEBERPRUEFUNG")), "", row("SQL_UEBERPRUEFUNG")) + CURR_CHOICE_LIST = IIf(IsDBNull(row("CHOICE_LIST")), "", row("CHOICE_LIST")) Next Return 1 Else diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index a3e9e1d..7794ac5 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -22,7 +22,6 @@ 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() @@ -35,9 +34,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.components) + Me.ImageListProfile = New System.Windows.Forms.ImageList() Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() - Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource() 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() @@ -57,8 +56,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.components) - Me.bindsourcegrid = New System.Windows.Forms.BindingSource(Me.components) + Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator() + Me.bindsourcegrid = New System.Windows.Forms.BindingSource() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton() @@ -69,7 +68,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.components) + Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip() Me.CMGroupStart = New System.Windows.Forms.ToolStripMenuItem() Me.CMFileStart = New System.Windows.Forms.ToolStripMenuItem() Me.MarkierteDateienAbschliessenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -78,20 +77,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.components) + Me.cmsNavPane = New System.Windows.Forms.ContextMenuStrip() 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.components) - Me.TimerRefresh = New System.Windows.Forms.Timer(Me.components) - Me.TBPM_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon() + Me.TimerRefresh = New System.Windows.Forms.Timer() + Me.TBPM_USERBindingSource = New System.Windows.Forms.BindingSource() Me.TBPM_USERTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter() - Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource() Me.TBPM_KONFIGURATIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() - Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource() Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() - Me.TimerReminder = New System.Windows.Forms.Timer(Me.components) + Me.TimerReminder = New System.Windows.Forms.Timer() CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerDashboard.Panel1.SuspendLayout() Me.SplitContainerDashboard.Panel2.SuspendLayout() @@ -513,6 +512,7 @@ Partial Class frmMain 'NavBarGroupProfiles ' resources.ApplyResources(Me.NavBarGroupProfiles, "NavBarGroupProfiles") + Me.NavBarGroupProfiles.Expanded = True Me.NavBarGroupProfiles.GroupStyle = DevExpress.XtraNavBar.NavBarGroupStyle.LargeIconsText Me.NavBarGroupProfiles.Name = "NavBarGroupProfiles" ' diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 2921c41..c65500c 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAYwBAwGMAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAZQBAwGUAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 1b107dc..6b76cbe 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -475,6 +475,7 @@ Public Class frmMain lblViewType.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE Dim sql = foundRows(0)("SQL_VIEW") sql = sql.Replace("@USER", Environment.UserName) + sql = sql.Replace("@USER_ID", CURRENT_USER_ID) sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) sql = sql.Replace("@DATE", Now.ToShortDateString) sql = sql.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index f14a33b..743b064 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -21,6 +21,9 @@ Public Class frmMassValidator Private _windream As New ClassWindream_allgemein Private _windreamPM As New ClassPMWindream Private _allgFunk As New ClassAllgemeineFunktionen + Dim viewer_string As String + Dim pdfxchange As Boolean = False + Dim sumatra As Boolean = False Dim WMObject As WMObject Private Sub frmMassValidator_Load(sender As Object, e As EventArgs) Handles Me.Load FORM_Shown = False @@ -1549,4 +1552,20 @@ Public Class frmMassValidator Private Sub frmMassValidator_Shown(sender As Object, e As EventArgs) Handles Me.Shown FORM_Shown = True End Sub + + Private Sub frmMassValidator_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + 'If Viewer = "docview" Then + ' CloseWDDocview() + 'End If + + 'If vpdfviewer = "system" Then + ' Kill_PDFAcrobat() + 'Else + ' If pdfxchange = True Or sumatra = True Then + ' Close_PDF_Viewer(Document_Path) + ' End If + ' KillU_Viewer() + 'End If + End Sub + End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 15cf529..aaa148f 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -629,7 +629,7 @@ Public Class frmValidator Else connectionString = "Data Source=" & drConnection.Item("SERVER") & ";Initial Catalog= " & drConnection.Item("DATENBANK") & ";User Id=" & drConnection.Item("USERNAME") & ";Password=" & drConnection.Item("PASSWORD") & ";" End If - If LogErrorsOnly = False Then ClassLogger.Add(" >> ConnString Sql-Server: " & connectionString) + If LogErrorsOnly = False Then ClassLogger.Add(" >> ConnString Sql-Server: " & connectionString, False) Case "oracle" Dim conn As New OracleConnectionStringBuilder Dim connstr As String