BugFix Vermerke

This commit is contained in:
2024-06-12 11:00:35 +02:00
parent 7f1ac079c0
commit d992bea15c
3 changed files with 19 additions and 15 deletions

View File

@@ -755,7 +755,6 @@ Public Class usrcntlAktDetails
picArrowDown.Visible = False
aktiv = Now 'Damit nicht neu geladedt wird (frmHauptfenster -> timer.tick)
gridVermerke.Columns.Clear()
lblInfoAviso.Visible = False
@@ -1040,7 +1039,8 @@ Public Class usrcntlAktDetails
If (dgvSendungen.SelectedRows.Count > 0) Then
tmpIndex = dgvSendungen.SelectedRows(0).Index
End If
gridVermerkeMouseClick(gridVermerke, e.ColumnIndex, e.RowIndex, AVISO, tmpIndex)
Dim init As Boolean = False
gridVermerkeMouseClick(gridVermerke, e.ColumnIndex, e.RowIndex, AVISO, tmpIndex, init)
loaded = False
' Dim tmpIndex = -1
If init Then
@@ -1054,13 +1054,13 @@ Public Class usrcntlAktDetails
'If tmpIndex > 0 And dgvSendungen.RowCount > tmpIndex Then
' dgvSendungen.Rows(tmpIndex).Selected = True
'End If
loaded = True
Vermerke_anzeigen(tmpIndex)
End If
loaded = True
Vermerke_anzeigen(tmpIndex)
End Sub
Shared Sub gridVermerkeMouseClick(gridVermerke, ColumnIndex, RowIndex, AVISO, sendungsId)
Shared Sub gridVermerkeMouseClick(gridVermerke, ColumnIndex, RowIndex, AVISO, sendungsId, ByRef init)
If gridVermerke.RowCount = 0 Then Exit Sub
Dim AvisoStatusFunctions As New AvisoStatusFunctions
If gridVermerke.Columns(ColumnIndex).Name = "VermerkeOptions" Then
@@ -1074,7 +1074,7 @@ Public Class usrcntlAktDetails
myVermerk.Datum = Now
myVermerk.Mitarbeiter = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter
myVermerk.MitarbeiterId = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.MitarbeiterID
Dim init As Boolean = False
init = False
Select Case CStr(gridVermerke.Rows(RowIndex).Cells("VermerkeCode").Value)
Case "1"
myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
@@ -1301,11 +1301,12 @@ Public Class usrcntlAktDetails
End Sub
Private Sub gridVermerke_Paint(sender As Object, e As PaintEventArgs) Handles gridVermerke.Paint
If painted Then Exit Sub
If dgvSendungen.RowCount = 0 Then Exit Sub
painted = True
gridVermerke_Paint(gridVermerke)
painted = False
painted = True
End Sub
Shared Sub gridVermerke_Paint(gridvermerke As DataGridView)