MS

app/DD_PM_WINDREAM/frmMain.Designer.vb

@@ -24,8 +24,8 @@ Partial Class frmMain
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
-        Dim GridFormatRule1 As DevExpress.XtraGrid.GridFormatRule = New DevExpress.XtraGrid.GridFormatRule()
+        Dim GridFormatRule2 As DevExpress.XtraGrid.GridFormatRule = New DevExpress.XtraGrid.GridFormatRule()
-        Dim FormatConditionRuleValue1 As DevExpress.XtraEditors.FormatConditionRuleValue = New DevExpress.XtraEditors.FormatConditionRuleValue()
+        Dim FormatConditionRuleValue2 As DevExpress.XtraEditors.FormatConditionRuleValue = New DevExpress.XtraEditors.FormatConditionRuleValue()
         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.components)
@@ -405,9 +405,9 @@ Partial Class frmMain
         Me.GridViewProfile.Appearance.GroupRow.Options.UseFont = True
         Me.GridViewProfile.Appearance.Row.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.GridViewProfile.Appearance.Row.Options.UseFont = True
-        GridFormatRule1.Name = "Format0"
+        GridFormatRule2.Name = "Format0"
-        GridFormatRule1.Rule = FormatConditionRuleValue1
+        GridFormatRule2.Rule = FormatConditionRuleValue2
-        Me.GridViewProfile.FormatRules.Add(GridFormatRule1)
+        Me.GridViewProfile.FormatRules.Add(GridFormatRule2)
         Me.GridViewProfile.GridControl = Me.GridControlProfile
         Me.GridViewProfile.GroupPanelText = "Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu la" &
     "ssen"

app/DD_PM_WINDREAM/frmMain.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
-        CAAAAk1TRnQBSQFMAgEBAgEAAdgBAgHYAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAeABAgHgAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -246,51 +246,6 @@
   <metadata name="cmsNavPane.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>541, 95</value>
   </metadata>
-  <data name="NavBarGroupMore.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-        QmCC
-</value>
-  </data>
   <data name="NavBarItemOverview.Appearance.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0
@@ -393,6 +348,51 @@
         ozk0xzFyplk+zeIZP5OBrU5e8ruu/jlwZa4EstkB2XBhB7n4ZcHFl+GThdM+d+BMeDMuKODkrYAji4SD
         V6aAZwbsPYh02LP8FIuc8+mwI9zlHJvTCfeYNn8b0r/m9GlE9yTtSoKcvQo/fgV+wqDfMHGLLf8BKVH4
         p8+ug0MAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="NavBarGroupMore.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        QmCC
 </value>
   </data>
   <metadata name="ContextMenuGrid.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

app/DD_PM_WINDREAM/frmMain.vb

@@ -288,7 +288,11 @@ Public Class frmMain
                             ' Select Current Chart
                             chart = Select_Chart(groupIndex)
                             chart = charts.Item(groupIndex)
+                            Try
+                                chart.Series.Clear()
+                            Catch ex As Exception
 
+                            End Try
                             ' Set DataSource
                             chart.DataSource = DATA_DT
 
@@ -326,7 +330,11 @@ Public Class frmMain
 
                         ' Select Current Chart
                         chart = Select_Chart(chartIndex)
+                        Try
+                            chart.Series.Clear()
+                        Catch ex As Exception
 
+                        End Try
                         ' Set DataSource
                         chart.DataSource = DATA_DT
 
@@ -340,6 +348,7 @@ Public Class frmMain
 
                         ' Show Data
                         chart.Series.Add(series)
+
                     Next
                 End If
             End If

app/DD_PM_WINDREAM/frmValidator.vb

@@ -1164,7 +1164,7 @@ Public Class frmValidator
         End If
 
         pnlpdf.Visible = visible
-        SplitContainer1.Panel2Collapsed = False
+
     End Sub
     Sub Load_Next_Document(first As Boolean)
 
@@ -1328,6 +1328,7 @@ Public Class frmValidator
             If Document_Path.ToLower.EndsWith(".pdf") And vpdfviewer <> "none" Then
                 Select Case vpdfviewer
                     Case "internal"
+                        SplitContainer1.Panel2Collapsed = False
                         PdfViewer1.LoadDocument(Document_Path)
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Internal Viewer Path: " & Document_Path, False)
                         PdfControls_visible(True)
@@ -1336,18 +1337,21 @@ Public Class frmValidator
                         pdfxchange = False
                         sumatra = False
                     Case "pdfxchange"
+                        SplitContainer1.Panel2Collapsed = True
                         Open_PDFXCHANGE(Document_Path)
                         pdfxchange = True
                         sumatra = False
                         System.Threading.Thread.Sleep(1000)
                         Me.Size = My.Settings.frmValidatorSize
                     Case "sumatra"
+                        SplitContainer1.Panel2Collapsed = True
                         Open_Sumatra(Document_Path)
                         sumatra = True
                         pdfxchange = False
                         System.Threading.Thread.Sleep(1000)
                         Me.Size = My.Settings.frmValidatorSize
                     Case "system"
+                        SplitContainer1.Panel2Collapsed = True
                         sumatra = False
                         pdfxchange = False
                         Open_PDF_withStandard()
@@ -1357,6 +1361,7 @@ Public Class frmValidator
             ElseIf Document_Path.ToLower.EndsWith(".msg") Then
                 Show_Email()
             Else
+                SplitContainer1.Panel2Collapsed = True
                 Me.Size = My.Settings.frmValidatorSize
                 pdfxchange = False
                 sumatra = False
@@ -1367,6 +1372,7 @@ Public Class frmValidator
                 DocView.ViewFile(viewer_string)
             End If
         Else
+            SplitContainer1.Panel2Collapsed = True
             PdfControls_visible(False)
             Me.Size = My.Settings.frmValidatorSize
             pdfxchange = False
@@ -2001,63 +2007,69 @@ Public Class frmValidator
                             Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
                             ' die Vorkommen im SQL-String auslesen
                             Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(WORK_HISTORY_ENTRY)
-                            '####
+                        '####
-                            ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
+                        ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
-                            For Each element As System.Text.RegularExpressions.Match In elemente
+                        For Each element As System.Text.RegularExpressions.Match In elemente
-                                Try
+                            Try
-                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX WORK_HISTORY_ENTRY: " & element.Value, False)
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX WORK_HISTORY_ENTRY: " & element.Value, False)
-                                    Dim CTRL_ID = element.Value.Substring(2, element.Value.Length - 3)
+                                Dim CTRL_ID = element.Value.Substring(2, element.Value.Length - 3)
-                                    CTRL_ID = CTRL_ID.Replace("CTRLID", "")
+                                CTRL_ID = CTRL_ID.Replace("CTRLID", "")
-                                    Dim value_from_control
+                                Dim value_from_control
-                                    For Each inctrl As Control In Me.pnldesigner.Controls
+                                For Each inctrl As Control In Me.pnldesigner.Controls
-                                        If IsNothing(inctrl.Tag) Then
+                                    If IsNothing(inctrl.Tag) Then
-                                            Continue For
+                                        Continue For
-                                        End If
-                                        If inctrl.Tag = CTRL_ID Then
-                                            '######
-                                            Dim Type As String = inctrl.GetType.ToString
-                                            Select Case Type
-                                                Case "System.Windows.Forms.TextBox"
-                                                    Try
-                                                        value_from_control = inctrl.Text
-                                                    Catch ex As Exception
-                                                        value_from_control = String.Empty
-                                                    End Try
-
-                                                Case "System.Windows.Forms.ComboBox"
-                                                    Dim cmb As ComboBox = inctrl
-                                                    Try
-                                                        value_from_control = cmb.SelectedValue
-                                                    Catch ex As Exception
-                                                        value_from_control = String.Empty
-                                                    End Try
-                                                Case "System.Windows.Forms.DateTimePicker"
-                                                    Dim dtp As DateTimePicker = inctrl
-                                                    Try
-                                                        value_from_control = dtp.Value.ToString
-                                                    Catch ex As Exception
-                                                        value_from_control = String.Empty
-                                                    End Try
-
-                                                Case "System.Windows.Forms.CheckBox"
-                                                    Dim chk As CheckBox = inctrl
-                                                    Try
-                                                        value_from_control = chk.Checked
-                                                    Catch ex As Exception
-                                                        value_from_control = String.Empty
-                                                    End Try
-                                            End Select
-
-                                        End If
-                                    Next
-                                    If Not IsNothing(value_from_control) And value_from_control <> String.Empty Then
-                                        WORK_HISTORY_ENTRY = WORK_HISTORY_ENTRY.ToString.Replace(element.Value, value_from_control)
                                     End If
-                                Catch ex As Exception
+                                    If inctrl.Tag = CTRL_ID Then
-                                    ClassLogger.Add("Unexpected Error in Checking control values for WORK_HISTORY_ENTRY - ERROR: " & ex.Message)
+                                        '######
-                                End Try
+                                        Dim Type As String = inctrl.GetType.ToString
-                            Next
+                                        Select Case Type
-                        Else
+                                            Case "System.Windows.Forms.TextBox"
+                                                Try
+                                                    value_from_control = inctrl.Text
+                                                Catch ex As Exception
+                                                    value_from_control = String.Empty
+                                                End Try
+
+                                            Case "System.Windows.Forms.ComboBox"
+                                                Dim cmb As ComboBox = inctrl
+                                                Try
+                                                    value_from_control = cmb.Text
+                                                Catch ex As Exception
+                                                    value_from_control = String.Empty
+                                                End Try
+                                            Case "System.Windows.Forms.DateTimePicker"
+                                                Dim dtp As DateTimePicker = inctrl
+                                                Try
+                                                    value_from_control = dtp.Value.ToString
+                                                Catch ex As Exception
+                                                    value_from_control = String.Empty
+                                                End Try
+
+                                            Case "System.Windows.Forms.CheckBox"
+                                                Dim chk As CheckBox = inctrl
+                                                Try
+                                                    value_from_control = chk.Checked
+                                                Catch ex As Exception
+                                                    value_from_control = String.Empty
+                                                End Try
+                                        End Select
+
+                                    End If
+                                Next
+                                If Not IsNothing(value_from_control) And value_from_control <> String.Empty Then
+                                    WORK_HISTORY_ENTRY = WORK_HISTORY_ENTRY.ToString.Replace(element.Value, value_from_control)
+                                End If
+                            Catch ex As Exception
+                                ClassLogger.Add("Unexpected Error in Checking control values for WORK_HISTORY_ENTRY - ERROR: " & ex.Message)
+                            End Try
+                        Next
+                        If WORK_HISTORY_ENTRY.ToString.Contains("@DATE") Then
+                            WORK_HISTORY_ENTRY.ToString.Replace("@DATE", Now.ToShortDateString)
+                        End If
+                        If WORK_HISTORY_ENTRY.ToString.Contains("@USERNAME") Then
+                            WORK_HISTORY_ENTRY.ToString.Replace("@USERNAME", Environment.UserName)
+                        End If
+                    Else
                             WORK_HISTORY_ENTRY = ""
                         End If
                     End If
@@ -2079,7 +2091,7 @@ Public Class frmValidator
                         End If
                         Dim value = DTPROFIL.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
                         If CBool(value) = True Then
-                            sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
+                            sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
                             Dim DT_ENTRIES As DataTable = ClassDatabase.Return_Datatable(sql, True)
                             If Not IsNothing(DT_ENTRIES) Then
                                 If DT_ENTRIES.Rows.Count > 0 Then