edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: edv:8a31bc0d02e5e132d53acaa31c95729d7fbe84d6
Branches Tags
edv:master edv:essensbestellungen edv:change_VM_logic edv:SDL
...
compare: edv:99c2dff94ed6d415c01feb766e6713dfd22f77af
Branches Tags
edv:master edv:essensbestellungen edv:change_VM_logic edv:SDL

2 Commits
8a31bc0d02 ... 99c2dff94e

Author SHA1 Message Date
Andreas Luxbauer
99c2dff94e Merge branch 'master' of https://git.it.verag.ag/edv/AVISO 2026-03-10 15:21:57 +01:00
Andreas Luxbauer
bb7ebb671f ANzeige Vermerke 2026-03-10 15:21:52 +01:00
2 changed files with 115 additions and 85 deletions
Expand all files Collapse all files

176
Aviso/usrcntlAktDetails.Designer.vb generated
View File

@@ -23,16 +23,16 @@ Partial Class usrcntlAktDetails
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetails)) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetails))
Me.pnlDetailsRechts = New System.Windows.Forms.Panel() Me.pnlDetailsRechts = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel()
@@ -64,6 +64,7 @@ Partial Class usrcntlAktDetails
Me.Panel7 = New System.Windows.Forms.Panel() Me.Panel7 = New System.Windows.Forms.Panel()
Me.picArrowDown = New System.Windows.Forms.PictureBox() Me.picArrowDown = New System.Windows.Forms.PictureBox()
Me.Panel4 = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel()
Me.Button12 = New System.Windows.Forms.Button()
Me.Button11 = New System.Windows.Forms.Button() Me.Button11 = New System.Windows.Forms.Button()
Me.Button9 = New System.Windows.Forms.Button() Me.Button9 = New System.Windows.Forms.Button()
Me.cbxLZDeFisk = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.cbxLZDeFisk = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components)
@@ -187,7 +188,7 @@ Partial Class usrcntlAktDetails
Me.btnÄndern = New System.Windows.Forms.Button() Me.btnÄndern = New System.Windows.Forms.Button()
Me.btnTV = New System.Windows.Forms.Button() Me.btnTV = New System.Windows.Forms.Button()
Me.Button10 = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button()
Me.Button12 = New System.Windows.Forms.Button() Me.VermerkTextAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.pnlDetailsRechts.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout()
Me.Panel3.SuspendLayout() Me.Panel3.SuspendLayout()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -619,46 +620,46 @@ Partial Class usrcntlAktDetails
Me.dgvSendungen.AllowUserToAddRows = False Me.dgvSendungen.AllowUserToAddRows = False
Me.dgvSendungen.AllowUserToDeleteRows = False Me.dgvSendungen.AllowUserToDeleteRows = False
Me.dgvSendungen.AllowUserToResizeRows = False Me.dgvSendungen.AllowUserToResizeRows = False
DataGridViewCellStyle21.BackColor = System.Drawing.Color.Azure DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21 Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White
DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle22.BackColor = System.Drawing.Color.LightBlue DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue
DataGridViewCellStyle22.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2
Me.dgvSendungen.ColumnHeadersHeight = 34 Me.dgvSendungen.ColumnHeadersHeight = 34
Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle23 Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle3
Me.dgvSendungen.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSendungen.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvSendungen.Location = New System.Drawing.Point(0, 0) Me.dgvSendungen.Location = New System.Drawing.Point(0, 0)
Me.dgvSendungen.MultiSelect = False Me.dgvSendungen.MultiSelect = False
Me.dgvSendungen.Name = "dgvSendungen" Me.dgvSendungen.Name = "dgvSendungen"
Me.dgvSendungen.ReadOnly = True Me.dgvSendungen.ReadOnly = True
DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle24 Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
Me.dgvSendungen.RowHeadersVisible = False Me.dgvSendungen.RowHeadersVisible = False
Me.dgvSendungen.RowHeadersWidth = 62 Me.dgvSendungen.RowHeadersWidth = 62
Me.dgvSendungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing Me.dgvSendungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle25 Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle5
Me.dgvSendungen.RowTemplate.Height = 20 Me.dgvSendungen.RowTemplate.Height = 20
Me.dgvSendungen.RowTemplate.ReadOnly = True Me.dgvSendungen.RowTemplate.ReadOnly = True
Me.dgvSendungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.dgvSendungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -724,6 +725,21 @@ Partial Class usrcntlAktDetails
Me.Panel4.TabIndex = 102 Me.Panel4.TabIndex = 102
Me.Panel4.Visible = False Me.Panel4.Visible = False
' '
'Button12
'
Me.Button12.BackColor = System.Drawing.Color.White
Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button12.ForeColor = System.Drawing.Color.Black
Me.Button12.Image = Global.AVISO.My.Resources.Resources.pdf11
Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button12.Location = New System.Drawing.Point(3, 131)
Me.Button12.Margin = New System.Windows.Forms.Padding(0)
Me.Button12.Name = "Button12"
Me.Button12.Size = New System.Drawing.Size(37, 36)
Me.Button12.TabIndex = 121
Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button12.UseVisualStyleBackColor = False
'
'Button11 'Button11
' '
Me.Button11.BackColor = System.Drawing.Color.White Me.Button11.BackColor = System.Drawing.Color.White
@@ -1015,46 +1031,46 @@ Partial Class usrcntlAktDetails
Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToAddRows = False
Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToDeleteRows = False
Me.gridVermerke.AllowUserToResizeRows = False Me.gridVermerke.AllowUserToResizeRows = False
DataGridViewCellStyle26.BackColor = System.Drawing.Color.Azure DataGridViewCellStyle6.BackColor = System.Drawing.Color.Azure
DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle26 Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
Me.gridVermerke.BackgroundColor = System.Drawing.Color.White Me.gridVermerke.BackgroundColor = System.Drawing.Color.White
DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle27.BackColor = System.Drawing.Color.LightBlue DataGridViewCellStyle7.BackColor = System.Drawing.Color.LightBlue
DataGridViewCellStyle27.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle7.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
Me.gridVermerke.ColumnHeadersHeight = 34 Me.gridVermerke.ColumnHeadersHeight = 34
Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle28 Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle8
Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill
Me.gridVermerke.Location = New System.Drawing.Point(0, 30) Me.gridVermerke.Location = New System.Drawing.Point(0, 30)
Me.gridVermerke.MultiSelect = False Me.gridVermerke.MultiSelect = False
Me.gridVermerke.Name = "gridVermerke" Me.gridVermerke.Name = "gridVermerke"
Me.gridVermerke.ReadOnly = True Me.gridVermerke.ReadOnly = True
DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle29 Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersVisible = False
Me.gridVermerke.RowHeadersWidth = 62 Me.gridVermerke.RowHeadersWidth = 62
Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle30 Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle10
Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.Height = 20
Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.ReadOnly = True
Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
@@ -2159,9 +2175,9 @@ Partial Class usrcntlAktDetails
'conMenuVermerke 'conMenuVermerke
' '
Me.conMenuVermerke.ImageScalingSize = New System.Drawing.Size(24, 24) Me.conMenuVermerke.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkEntgLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder, Me.MitarbeiterAnzeigenToolStripMenuItem, Me.conVermerkLöschenNew}) Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkEntgLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder, Me.VermerkTextAnzeigenToolStripMenuItem, Me.MitarbeiterAnzeigenToolStripMenuItem, Me.conVermerkLöschenNew})
Me.conMenuVermerke.Name = "conMenuVermerke" Me.conMenuVermerke.Name = "conMenuVermerke"
Me.conMenuVermerke.Size = New System.Drawing.Size(252, 184) Me.conMenuVermerke.Size = New System.Drawing.Size(252, 236)
' '
'conVermerkEntgLöschen 'conVermerkEntgLöschen
' '
@@ -2455,20 +2471,11 @@ Partial Class usrcntlAktDetails
Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button10.UseVisualStyleBackColor = False Me.Button10.UseVisualStyleBackColor = False
' '
'Button12 'VermerkTextAnzeigenToolStripMenuItem
' '
Me.Button12.BackColor = System.Drawing.Color.White Me.VermerkTextAnzeigenToolStripMenuItem.Name = "VermerkTextAnzeigenToolStripMenuItem"
Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.VermerkTextAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(251, 30)
Me.Button12.ForeColor = System.Drawing.Color.Black Me.VermerkTextAnzeigenToolStripMenuItem.Text = "Vermerk-Text anzeigen"
Me.Button12.Image = Global.AVISO.My.Resources.Resources.pdf11
Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button12.Location = New System.Drawing.Point(3, 131)
Me.Button12.Margin = New System.Windows.Forms.Padding(0)
Me.Button12.Name = "Button12"
Me.Button12.Size = New System.Drawing.Size(37, 36)
Me.Button12.TabIndex = 121
Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button12.UseVisualStyleBackColor = False
' '
'usrcntlAktDetails 'usrcntlAktDetails
' '
@@ -2692,4 +2699,5 @@ Partial Class usrcntlAktDetails
Friend WithEvents pnlMaDetails As Panel Friend WithEvents pnlMaDetails As Panel
Friend WithEvents Button11 As Button Friend WithEvents Button11 As Button
Friend WithEvents Button12 As Button Friend WithEvents Button12 As Button
Friend WithEvents VermerkTextAnzeigenToolStripMenuItem As ToolStripMenuItem
End Class End Class

24
Aviso/usrcntlAktDetails.vb
View File

@@ -883,7 +883,18 @@ Public Class usrcntlAktDetails
End Sub End Sub
Public Shared vermerkehSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," & Public Shared vermerkehSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," &
" CASE WHEN VermerkeCode IS NULL OR VermerkBezeichnungFixAnzeigen = 1 THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben, Datum as DatumValue, Kategorie" & "
CASE WHEN VermerkeCode IS NULL OR VermerkBezeichnungFixAnzeigen = 1
THEN
CASE
WHEN LEN(Hinweis_Vermerk) > 200
THEN LEFT(Hinweis_Vermerk, 200) + '...'
ELSE Hinweis_Vermerk
END
ELSE
VermerkeCodes.Bezeichnung
END as [Hinweis_Vermerk_Anzeige]
,[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben, Datum as DatumValue, Kategorie" &
" FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " & " FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " &
" LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " & " LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " &
" WHERE AvisoID = [[AvisoId]] [[sendwhere]] AND HintergrundVermerk =0 " & " WHERE AvisoID = [[AvisoId]] [[sendwhere]] AND HintergrundVermerk =0 " &
@@ -3994,5 +4005,16 @@ Public Class usrcntlAktDetails
Private Sub Button12_Click_1(sender As Object, e As EventArgs) Handles Button12.Click Private Sub Button12_Click_1(sender As Object, e As EventArgs) Handles Button12.Click
openAlleMarkierte(AvisoID) openAlleMarkierte(AvisoID)
End Sub End Sub
Private Sub VermerkTextAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VermerkTextAnzeigenToolStripMenuItem.Click
If gridVermerke.SelectedRows.Count = 0 Then Exit Sub
Dim index As Integer = -1
If (dgvSendungen.SelectedRows.Count > 0) Then index = dgvSendungen.SelectedRows(0).Index
If gridVermerke.SelectedRows(0).Cells("Hinweis_Vermerk").Value Is DBNull.Value Then
MsgBox("Kein Vermerktext hinterlegt!")
Else
MsgBox(gridVermerke.SelectedRows(0).Cells("Hinweis_Vermerk").Value)
End If
End Sub
End Class End Class