MS
This commit is contained in:
Digital Data - Marlon Schreiber
@@ -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
|
||||
For Each element As System.Text.RegularExpressions.Match In elemente
|
||||
Try
|
||||
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)
|
||||
CTRL_ID = CTRL_ID.Replace("CTRLID", "")
|
||||
Dim value_from_control
|
||||
For Each inctrl As Control In Me.pnldesigner.Controls
|
||||
If IsNothing(inctrl.Tag) Then
|
||||
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)
|
||||
'####
|
||||
' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
|
||||
For Each element As System.Text.RegularExpressions.Match In elemente
|
||||
Try
|
||||
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)
|
||||
CTRL_ID = CTRL_ID.Replace("CTRLID", "")
|
||||
Dim value_from_control
|
||||
For Each inctrl As Control In Me.pnldesigner.Controls
|
||||
If IsNothing(inctrl.Tag) Then
|
||||
Continue For
|
||||
End If
|
||||
Catch ex As Exception
|
||||
ClassLogger.Add("Unexpected Error in Checking control values for WORK_HISTORY_ENTRY - ERROR: " & ex.Message)
|
||||
End Try
|
||||
Next
|
||||
Else
|
||||
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.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
|
||||
|
||||
Reference in New Issue
Block a user