diff --git a/app/DD-Record-Organiser/ClassControlCommands.vb b/app/DD-Record-Organiser/ClassControlCommands.vb
index 80ae576..2a0347e 100644
--- a/app/DD-Record-Organiser/ClassControlCommands.vb
+++ b/app/DD-Record-Organiser/ClassControlCommands.vb
@@ -49,6 +49,28 @@
' +++ Public Functions +++
+ Public Shared Function GetParentRecordId(RecordId As Integer) As Integer
+ Try
+ Dim parentId = ClassDatabase.Execute_Scalar("SELECT RECORD1_ID FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & RecordId)
+ If IsNothing(parentId) Then
+ Return 0
+ Else
+ Return parentId
+ End If
+ Catch ex As Exception
+ MsgBox("Error in GetFormId:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+ End Try
+ End Function
+
+ Public Shared Function GetFormId(RecordId As Integer) As Integer
+ Try
+ Dim FormId = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM VWPMO_VALUES WHERE RECORD_ID = " & RecordId)
+ Return FormId
+ Catch ex As Exception
+ MsgBox("Error in GetFormId:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+ End Try
+ End Function
+
Public Shared Function GetControlGuid(name As String)
Try
Dim sql = "SELECT GUID FROM TBPMO_CONTROL WHERE UPPER(NAME) = UPPER('" & name & "')"
diff --git a/app/DD-Record-Organiser/ClassRecordView.vb b/app/DD-Record-Organiser/ClassRecordView.vb
index 5ba7082..ea45377 100644
--- a/app/DD-Record-Organiser/ClassRecordView.vb
+++ b/app/DD-Record-Organiser/ClassRecordView.vb
@@ -2,9 +2,10 @@
Imports System.Text.RegularExpressions
Public Class ClassRecordView
+ Public RecordId As Integer
+
Private DTControls As DataTable
Private DTValues As DataTable
- Private RecordId As Integer
Private FormId As Integer
Private Panel As Panel
@@ -23,8 +24,11 @@ Public Class ClassRecordView
'''
Public Sub LoadRecord(recordId As Integer)
Me.RecordId = recordId
- Me.LoadControls(Me.Panel)
+ Me.LoadControls()
Me.LoadValues(Me.Panel.Controls)
+ Me.PreventControlValueChanges()
+
+ JUMP_RECORD_ID = 0
End Sub
#Region "Helper Functions"
@@ -94,16 +98,29 @@ Public Class ClassRecordView
End Function
Private Function ReplaceStaticPlaceholders(sqlcommand As String) As String
- If (New Regex(STATIC_PATTERN).IsMatch(sqlcommand)) Then
+ Try
+ If (New Regex(STATIC_PATTERN).IsMatch(sqlcommand)) Then
- sqlcommand = sqlcommand _
- .Replace("@RECORD_ID", Me.RecordId) _
- .Replace("@RECORDID", Me.RecordId)
- ' TODO: Add more placeholders
+ Dim FormId As Integer = ClassControlCommands.GetFormId(Me.RecordId)
+ Dim ParentRecordId As Integer = ClassControlCommands.GetParentRecordId(Me.RecordId)
- End If
+ sqlcommand = sqlcommand _
+ .Replace("@RECORD_ID", Me.RecordId) _
+ .Replace("@RECORDID", Me.RecordId) _
+ .Replace("@FORM_ID", FormId) _
+ .Replace("@ENTITY_ID", FormId)
- Return sqlcommand
+ If ParentRecordId > 0 Then
+ sqlcommand = sqlcommand _
+ .Replace("@PARENTRECORDID", ParentRecordId) _
+ .Replace("@PARENTRECORD_ID", ParentRecordId)
+ End If
+
+ End If
+ Return sqlcommand
+ Catch ex As Exception
+ Return sqlcommand
+ End Try
End Function
Private Function LoadSQLList(props As ControlProps) As DataTable
@@ -156,7 +173,7 @@ Public Class ClassRecordView
#End Region
- Private Sub LoadControls(panel As Panel)
+ Private Sub LoadControls()
Dim controls As New List(Of Control)
DTControls = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM VWPMO_CONTROL_SCREEN WHERE FORM_ID = {0}", GetFormId()))
@@ -183,6 +200,8 @@ Public Class ClassRecordView
control = LoadCheckBox(props)
Case "Radiobutton"
control = LoadRadioButton(props)
+ Case "Picturebox"
+ control = LoadPictureBox(props)
End Select
If control IsNot Nothing Then
@@ -190,8 +209,24 @@ Public Class ClassRecordView
End If
Next
- panel.Controls.Clear()
- panel.Controls.AddRange(controls.ToArray())
+ Me.Panel.Controls.Clear()
+ Me.Panel.Controls.AddRange(controls.ToArray())
+ End Sub
+
+ Private Sub PreventControlValueChanges()
+
+ For Each c As Control In Me.Panel.Controls
+ Dim type As String = DirectCast(c.Tag, ControlProps).Type
+
+ If type = "CheckedListBox" Then
+ Dim checklistbox = DirectCast(c, CheckedListBoxControl)
+ AddHandler checklistbox.ItemChecking, Sub(sender As Object, e As DevExpress.XtraEditors.Controls.ItemCheckingEventArgs)
+ e.Cancel = True
+ End Sub
+ End If
+
+ Next
+
End Sub
Private Sub LoadValues(controlCollection As Control.ControlCollection)
@@ -203,13 +238,14 @@ Public Class ClassRecordView
For Each control As Control In controls
Dim controlId As Integer = DirectCast(control.Tag, ControlProps).Id
+ Dim controlType As String = DirectCast(control.Tag, ControlProps).Type
Dim values As List(Of Object) = (From row In DTValues.AsEnumerable()
Where row.Item("CONTROL_ID") = controlId
Select row.Item("VALUE")).ToList()
' Wenn kein Wert existiert, keinen Wert laden
- If values.Count = 0 Then
+ If values.Count = 0 And Not controlType = "Picturebox" Then
Continue For
Else
LoadValue(control, values)
@@ -222,8 +258,6 @@ Public Class ClassRecordView
Dim value = Nothing
If values.Count > 0 Then
value = values(0)
- Else
- Exit Sub
End If
Select Case controlType
@@ -235,24 +269,27 @@ Public Class ClassRecordView
Case "Combobox"
DirectCast(control, TextBox).Text = value.ToString()
Case "Datepicker"
+ Dim dtp As TextBox = DirectCast(control, TextBox)
Try
- DirectCast(control, TextBox).Text = DateTime.Parse(value).ToShortDateString()
+ dtp.Text = DateTime.Parse(value).ToShortDateString()
Catch ex As Exception
-
+ dtp.text = "Invalid Date"
End Try
Case "Checkbox"
+ Dim checkbox = DirectCast(control, CheckBox)
Try
- DirectCast(control, CheckBox).Checked = Boolean.Parse(value)
+ checkbox.Checked = Boolean.Parse(value)
Catch ex As Exception
- DirectCast(control, CheckBox).Checked = False
+ checkbox.Checked = False
End Try
Case "RadioButton"
+ Dim radio = DirectCast(control, RadioButton)
Try
- DirectCast(control, RadioButton).Checked = Boolean.Parse(value)
+ radio.Checked = Boolean.Parse(value)
Catch ex As Exception
- DirectCast(control, RadioButton).Checked = False
+ radio.Checked = False
End Try
Case "Datagridview"
@@ -260,17 +297,17 @@ Public Class ClassRecordView
Dim datagridview As ListBoxControl = DirectCast(control, ListBoxControl)
datagridview.Items.AddRange(values.ToArray())
Catch ex As Exception
-
+ ' Keine Items hinzufügen
End Try
-
+
Case "ListBox"
Try
Dim listbox As ListBoxControl = DirectCast(control, ListBoxControl)
listbox.Items.AddRange(values.ToArray())
Catch ex As Exception
-
+ ' Keine Items hinzufügen
End Try
-
+
Case "CheckedListBox"
Try
Dim checkedlist As CheckedListBoxControl = DirectCast(control, CheckedListBoxControl)
@@ -290,9 +327,25 @@ Public Class ClassRecordView
End While
Next
Catch ex As Exception
-
+ ' Keine Items anchecken
+ End Try
+ Case "Picturebox"
+ Try
+ Dim pb As PictureBox = DirectCast(control, PictureBox)
+ Dim controlId As Integer = DirectCast(control.Tag, ControlProps).Id
+ Dim sql = String.Format("SELECT IMG FROM TBPMO_CONTROL_IMAGE WHERE RECORD_ID = {0} AND CONTROL_ID = {1}", Me.RecordId, controlId)
+ Dim bimg() As Byte = ClassDatabase.Execute_Scalar(sql)
+
+ If Not IsNothing(bimg) Then
+ Dim img As Bitmap = ByteArrayToBitmap(bimg)
+
+ pb.BackgroundImage = img
+ pb.BackgroundImageLayout = ImageLayout.Zoom
+ End If
+ Catch ex As Exception
+ ' Kein Bild laden
+ MsgBox(ex.Message)
End Try
-
End Select
End Sub
@@ -303,24 +356,26 @@ Public Class ClassRecordView
Public Name As String
Public Type As String
Public Caption As String
+
' Position/Size Props
Public X As Integer
Public Y As Integer
Public Height As Integer
Public Width As Integer
+
' Font/Color Props
Public FontColor As Color
Public FontSize As Integer
Public FontStyle As FontStyle
Public FontFamily As String
Public Font As Font
-
Public BackColor As Color
' Flag Props
Public IsRequired As Boolean
Public IsReadOnly As Boolean
Public IsMultiline As Boolean
+
' Data Props
Public SqlCommand1 As String
Public SqlCommand2 As String
@@ -339,7 +394,8 @@ Public Class ClassRecordView
label.Text = props.Caption
label.Font = props.Font
label.ForeColor = props.FontColor
- label.BackColor = props.BackColor
+ 'label.BackColor = props.BackColor
+ label.BackColor = Color.White
label.AutoSize = True
props = LoadDataSource(props)
@@ -364,7 +420,8 @@ Public Class ClassRecordView
textbox.BorderStyle = BorderStyle.FixedSingle
textbox.Font = props.Font
textbox.ForeColor = props.FontColor
- textbox.BackColor = props.BackColor
+ 'textbox.BackColor = props.BackColor
+ textbox.BackColor = Color.White
textbox.ReadOnly = True
Return textbox
@@ -377,7 +434,8 @@ Public Class ClassRecordView
combo.BorderStyle = BorderStyle.FixedSingle
combo.Font = props.Font
combo.ForeColor = props.FontColor
- combo.BackColor = props.BackColor
+ 'combo.BackColor = props.BackColor
+ combo.BackColor = Color.White
combo.ReadOnly = True
Return combo
@@ -390,7 +448,8 @@ Public Class ClassRecordView
dtp.BorderStyle = BorderStyle.FixedSingle
dtp.Font = props.Font
dtp.ForeColor = props.FontColor
- dtp.BackColor = props.BackColor
+ 'dtp.BackColor = props.BackColor
+ dtp.BackColor = Color.White
dtp.ReadOnly = True
Return dtp
@@ -400,7 +459,7 @@ Public Class ClassRecordView
Dim check As CheckBox = SetBaseProps(New CheckBox, props)
check.Text = props.Caption
- check.Enabled = False
+ check.AutoCheck = False
Return check
End Function
@@ -409,7 +468,7 @@ Public Class ClassRecordView
Dim radio As RadioButton = SetBaseProps(New RadioButton, props)
radio.Text = props.Caption
- radio.Enabled = False
+ radio.AutoCheck = False
Return radio
End Function
@@ -431,6 +490,10 @@ Public Class ClassRecordView
props = LoadDataSource(props)
+ If Not IsNothing(props.StaticList) Then
+ checklistbox.DataSource = props.StaticList
+ End If
+
If Not IsNothing(props.DataSource) Then
If props.DataSource.GetType() Is GetType(DataTable) Then
Dim dt As DataTable = props.DataSource
@@ -451,5 +514,13 @@ Public Class ClassRecordView
Return checklistbox
End Function
+ Private Function LoadPictureBox(props As ControlProps) As PictureBox
+ Dim pb As PictureBox = SetBaseProps(New PictureBox, props)
+
+ pb.BorderStyle = BorderStyle.FixedSingle
+
+ Return pb
+ End Function
+
#End Region
End Class
diff --git a/app/DD-Record-Organiser/frmRecordView.Designer.vb b/app/DD-Record-Organiser/frmRecordView.Designer.vb
index 5e8aa17..b7230cf 100644
--- a/app/DD-Record-Organiser/frmRecordView.Designer.vb
+++ b/app/DD-Record-Organiser/frmRecordView.Designer.vb
@@ -73,6 +73,14 @@ Partial Class frmRecordView
Me.TabControl1 = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
+ Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
+ Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
+ Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator()
+ Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator()
+ Me.PropertiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GridViewDoc_Search = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.ToolStrip2 = New System.Windows.Forms.ToolStrip()
Me.tslblWindreamView = New System.Windows.Forms.ToolStripLabel()
@@ -98,14 +106,6 @@ Partial Class frmRecordView
Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
Me.TBPMO_WORKFLOW_TASK_STATETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_WORKFLOW_TASK_STATETableAdapter()
- Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
- Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
- Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator()
- Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator()
- Me.PropertiesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Label4 = New System.Windows.Forms.Label()
TITLELabel = New System.Windows.Forms.Label()
COMMENTLabel = New System.Windows.Forms.Label()
@@ -131,6 +131,7 @@ Partial Class frmRecordView
Me.TabControl1.SuspendLayout()
Me.XtraTabPage2.SuspendLayout()
CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.ContextMenuStripResultFiles.SuspendLayout()
CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit()
Me.ToolStrip2.SuspendLayout()
Me.XtraTabPage1.SuspendLayout()
@@ -143,7 +144,6 @@ Partial Class frmRecordView
Me.SplitContainer1.Panel1.SuspendLayout()
Me.SplitContainer1.Panel2.SuspendLayout()
Me.SplitContainer1.SuspendLayout()
- Me.ContextMenuStripResultFiles.SuspendLayout()
Me.SuspendLayout()
'
'Label4
@@ -265,7 +265,7 @@ Partial Class frmRecordView
Me.TabDetails.Controls.Add(Me.pnlDetails)
Me.TabDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD
Me.TabDetails.Name = "TabDetails"
- Me.TabDetails.Size = New System.Drawing.Size(799, 358)
+ Me.TabDetails.Size = New System.Drawing.Size(795, 355)
Me.TabDetails.Text = "Detailansicht"
'
'pnlDetails
@@ -275,7 +275,7 @@ Partial Class frmRecordView
Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill
Me.pnlDetails.Location = New System.Drawing.Point(0, 0)
Me.pnlDetails.Name = "pnlDetails"
- Me.pnlDetails.Size = New System.Drawing.Size(799, 358)
+ Me.pnlDetails.Size = New System.Drawing.Size(795, 355)
Me.pnlDetails.TabIndex = 0
'
'TabFollowUp
@@ -285,7 +285,7 @@ Partial Class frmRecordView
Me.TabFollowUp.Controls.Add(Me.Label5)
Me.TabFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD
Me.TabFollowUp.Name = "TabFollowUp"
- Me.TabFollowUp.Size = New System.Drawing.Size(791, 315)
+ Me.TabFollowUp.Size = New System.Drawing.Size(795, 355)
Me.TabFollowUp.Text = "Wiedervorlage"
'
'ListViewFollowUps
@@ -297,7 +297,7 @@ Partial Class frmRecordView
Me.ListViewFollowUps.HideSelection = False
Me.ListViewFollowUps.Location = New System.Drawing.Point(14, 36)
Me.ListViewFollowUps.Name = "ListViewFollowUps"
- Me.ListViewFollowUps.Size = New System.Drawing.Size(263, 140)
+ Me.ListViewFollowUps.Size = New System.Drawing.Size(263, 180)
Me.ListViewFollowUps.TabIndex = 5
Me.ListViewFollowUps.UseCompatibleStateImageBehavior = False
Me.ListViewFollowUps.View = System.Windows.Forms.View.Details
@@ -323,7 +323,7 @@ Partial Class frmRecordView
Me.grpbxFU_Profile.Controls.Add(Me.lblWiedervorlage_Control)
Me.grpbxFU_Profile.Location = New System.Drawing.Point(283, 28)
Me.grpbxFU_Profile.Name = "grpbxFU_Profile"
- Me.grpbxFU_Profile.Size = New System.Drawing.Size(774, 148)
+ Me.grpbxFU_Profile.Size = New System.Drawing.Size(774, 188)
Me.grpbxFU_Profile.TabIndex = 4
Me.grpbxFU_Profile.TabStop = False
'
@@ -340,7 +340,7 @@ Partial Class frmRecordView
Me.GroupBox4.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold)
Me.GroupBox4.Location = New System.Drawing.Point(177, 20)
Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Size = New System.Drawing.Size(594, 122)
+ Me.GroupBox4.Size = New System.Drawing.Size(594, 162)
Me.GroupBox4.TabIndex = 4
Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "Individuelle Empfänger für diesen Datensatz:"
@@ -399,7 +399,7 @@ Partial Class frmRecordView
Me.ListBoxUser2Profile.FormattingEnabled = True
Me.ListBoxUser2Profile.Location = New System.Drawing.Point(9, 50)
Me.ListBoxUser2Profile.Name = "ListBoxUser2Profile"
- Me.ListBoxUser2Profile.Size = New System.Drawing.Size(230, 43)
+ Me.ListBoxUser2Profile.Size = New System.Drawing.Size(230, 82)
Me.ListBoxUser2Profile.TabIndex = 1
'
'Label7
@@ -472,7 +472,7 @@ Partial Class frmRecordView
Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image)
Me.TabPos.Name = "TabPos"
Me.TabPos.PageVisible = False
- Me.TabPos.Size = New System.Drawing.Size(791, 315)
+ Me.TabPos.Size = New System.Drawing.Size(795, 355)
Me.TabPos.Text = "Positionen"
'
'Panel1
@@ -481,7 +481,7 @@ Partial Class frmRecordView
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel1.Location = New System.Drawing.Point(0, 25)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(791, 290)
+ Me.Panel1.Size = New System.Drawing.Size(795, 330)
Me.Panel1.TabIndex = 2
'
'GridControlPos
@@ -490,7 +490,7 @@ Partial Class frmRecordView
Me.GridControlPos.Location = New System.Drawing.Point(0, 0)
Me.GridControlPos.MainView = Me.grvwGridPos
Me.GridControlPos.Name = "GridControlPos"
- Me.GridControlPos.Size = New System.Drawing.Size(791, 290)
+ Me.GridControlPos.Size = New System.Drawing.Size(795, 330)
Me.GridControlPos.TabIndex = 0
Me.GridControlPos.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGridPos})
'
@@ -517,7 +517,7 @@ Partial Class frmRecordView
Me.BindingNavigatorPOS.MovePreviousItem = Me.BindingNavigatorMovePreviousItem
Me.BindingNavigatorPOS.Name = "BindingNavigatorPOS"
Me.BindingNavigatorPOS.PositionItem = Me.BindingNavigatorPositionItem
- Me.BindingNavigatorPOS.Size = New System.Drawing.Size(791, 25)
+ Me.BindingNavigatorPOS.Size = New System.Drawing.Size(795, 25)
Me.BindingNavigatorPOS.TabIndex = 1
Me.BindingNavigatorPOS.Text = "BindingNavigator1"
'
@@ -628,7 +628,7 @@ Partial Class frmRecordView
Me.XtraTabPage2.Controls.Add(Me.ToolStrip2)
Me.XtraTabPage2.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954
Me.XtraTabPage2.Name = "XtraTabPage2"
- Me.XtraTabPage2.Size = New System.Drawing.Size(799, 318)
+ Me.XtraTabPage2.Size = New System.Drawing.Size(795, 315)
Me.XtraTabPage2.Text = "windream-Dateien"
'
'GridControlDocSearch
@@ -639,10 +639,58 @@ Partial Class frmRecordView
Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 25)
Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
Me.GridControlDocSearch.Name = "GridControlDocSearch"
- Me.GridControlDocSearch.Size = New System.Drawing.Size(799, 293)
+ Me.GridControlDocSearch.Size = New System.Drawing.Size(795, 290)
Me.GridControlDocSearch.TabIndex = 7
Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
'
+ 'ContextMenuStripResultFiles
+ '
+ Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.ToolStripSeparator7, Me.CopyToolStripMenuItem, Me.ToolStripSeparator8, Me.DeleteToolStripMenuItem, Me.ToolStripSeparator9, Me.PropertiesToolStripMenuItem})
+ Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles"
+ Me.ContextMenuStripResultFiles.Size = New System.Drawing.Size(149, 110)
+ '
+ 'DateiÖffnenToolStripMenuItem
+ '
+ Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem"
+ Me.DateiÖffnenToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+ Me.DateiÖffnenToolStripMenuItem.Text = "Datei Öffnen"
+ '
+ 'ToolStripSeparator7
+ '
+ Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
+ Me.ToolStripSeparator7.Size = New System.Drawing.Size(145, 6)
+ '
+ 'CopyToolStripMenuItem
+ '
+ Me.CopyToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Copy_6524
+ Me.CopyToolStripMenuItem.Name = "CopyToolStripMenuItem"
+ Me.CopyToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+ Me.CopyToolStripMenuItem.Text = "Kopieren"
+ '
+ 'ToolStripSeparator8
+ '
+ Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
+ Me.ToolStripSeparator8.Size = New System.Drawing.Size(145, 6)
+ '
+ 'DeleteToolStripMenuItem
+ '
+ Me.DeleteToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
+ Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"
+ Me.DeleteToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+ Me.DeleteToolStripMenuItem.Text = "Löschen"
+ '
+ 'ToolStripSeparator9
+ '
+ Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
+ Me.ToolStripSeparator9.Size = New System.Drawing.Size(145, 6)
+ '
+ 'PropertiesToolStripMenuItem
+ '
+ Me.PropertiesToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.PropertyGridEditorPart_6041
+ Me.PropertiesToolStripMenuItem.Name = "PropertiesToolStripMenuItem"
+ Me.PropertiesToolStripMenuItem.Size = New System.Drawing.Size(148, 22)
+ Me.PropertiesToolStripMenuItem.Text = "Eigenschaften"
+ '
'GridViewDoc_Search
'
Me.GridViewDoc_Search.Appearance.OddRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
@@ -663,7 +711,7 @@ Partial Class frmRecordView
Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.ToolStripDropDownButton1})
Me.ToolStrip2.Location = New System.Drawing.Point(0, 0)
Me.ToolStrip2.Name = "ToolStrip2"
- Me.ToolStrip2.Size = New System.Drawing.Size(799, 25)
+ Me.ToolStrip2.Size = New System.Drawing.Size(795, 25)
Me.ToolStrip2.TabIndex = 2
Me.ToolStrip2.Text = "ToolStrip2"
'
@@ -713,7 +761,7 @@ Partial Class frmRecordView
Me.XtraTabPage1.Controls.Add(STATE_IDLabel)
Me.XtraTabPage1.Controls.Add(Me.STATE_IDComboBox)
Me.XtraTabPage1.Name = "XtraTabPage1"
- Me.XtraTabPage1.Size = New System.Drawing.Size(791, 335)
+ Me.XtraTabPage1.Size = New System.Drawing.Size(795, 315)
Me.XtraTabPage1.Text = "Workflows/Tasks"
'
'WF_IDTextBox
@@ -921,54 +969,6 @@ Partial Class frmRecordView
'
Me.TBPMO_WORKFLOW_TASK_STATETableAdapter.ClearBeforeFill = True
'
- 'ContextMenuStripResultFiles
- '
- Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.ToolStripSeparator7, Me.CopyToolStripMenuItem, Me.ToolStripSeparator8, Me.DeleteToolStripMenuItem, Me.ToolStripSeparator9, Me.PropertiesToolStripMenuItem})
- Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles"
- Me.ContextMenuStripResultFiles.Size = New System.Drawing.Size(149, 110)
- '
- 'DateiÖffnenToolStripMenuItem
- '
- Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem"
- Me.DateiÖffnenToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
- Me.DateiÖffnenToolStripMenuItem.Text = "Datei Öffnen"
- '
- 'ToolStripSeparator7
- '
- Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
- Me.ToolStripSeparator7.Size = New System.Drawing.Size(145, 6)
- '
- 'CopyToolStripMenuItem
- '
- Me.CopyToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Copy_6524
- Me.CopyToolStripMenuItem.Name = "CopyToolStripMenuItem"
- Me.CopyToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
- Me.CopyToolStripMenuItem.Text = "Kopieren"
- '
- 'ToolStripSeparator8
- '
- Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
- Me.ToolStripSeparator8.Size = New System.Drawing.Size(145, 6)
- '
- 'DeleteToolStripMenuItem
- '
- Me.DeleteToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
- Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"
- Me.DeleteToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
- Me.DeleteToolStripMenuItem.Text = "Löschen"
- '
- 'ToolStripSeparator9
- '
- Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
- Me.ToolStripSeparator9.Size = New System.Drawing.Size(145, 6)
- '
- 'PropertiesToolStripMenuItem
- '
- Me.PropertiesToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.PropertyGridEditorPart_6041
- Me.PropertiesToolStripMenuItem.Name = "PropertiesToolStripMenuItem"
- Me.PropertiesToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
- Me.PropertiesToolStripMenuItem.Text = "Eigenschaften"
- '
'frmRecordView
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1002,6 +1002,7 @@ Partial Class frmRecordView
Me.XtraTabPage2.ResumeLayout(False)
Me.XtraTabPage2.PerformLayout()
CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.ContextMenuStripResultFiles.ResumeLayout(False)
CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
Me.ToolStrip2.ResumeLayout(False)
Me.ToolStrip2.PerformLayout()
@@ -1016,7 +1017,6 @@ Partial Class frmRecordView
Me.SplitContainer1.Panel2.ResumeLayout(False)
CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainer1.ResumeLayout(False)
- Me.ContextMenuStripResultFiles.ResumeLayout(False)
Me.ResumeLayout(False)
Me.PerformLayout()
diff --git a/app/DD-Record-Organiser/frmRecordView.resx b/app/DD-Record-Organiser/frmRecordView.resx
index 4a7da25..921ba6a 100644
--- a/app/DD-Record-Organiser/frmRecordView.resx
+++ b/app/DD-Record-Organiser/frmRecordView.resx
@@ -147,18 +147,7 @@
17, 17
-
- 667, 134
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa
- SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY
- wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII=
-
-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
@@ -241,6 +230,14 @@
kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa
+ SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY
+ wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII=
@@ -265,18 +262,9 @@
17, 173
-
- 17, 173
-
928, 134
-
- 928, 134
-
-
- 672, 173
-
672, 173
diff --git a/app/DD-Record-Organiser/frmRecordView.vb b/app/DD-Record-Organiser/frmRecordView.vb
index 83ab81f..6ca8990 100644
--- a/app/DD-Record-Organiser/frmRecordView.vb
+++ b/app/DD-Record-Organiser/frmRecordView.vb
@@ -30,6 +30,7 @@ Public Class frmRecordView
Public hIcon As IntPtr
Public hProcess As IntPtr
End Structure
+
Private Sub frmRecordView_Load(sender As Object, e As EventArgs) Handles MyBase.Load
If USER_LANGUAGE <> "de-DE" Then
Me.Text = "Detailview Record"
@@ -38,6 +39,10 @@ Public Class frmRecordView
End If
recordView = New ClassRecordView(pnlDetails)
recordView.LoadRecord(JUMP_RECORD_ID)
+
+ 'Titel updaten
+ Me.Text &= " " + recordView.RecordId.ToString()
+
RUN_WDSEARCH_GRID()
Load_Tasks()
End Sub