From d992bea15ccdd4b28928afadee5ffa11821351e0 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 12 Jun 2024 11:00:35 +0200 Subject: [PATCH 1/2] BugFix Vermerke --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/rCntrlVermerke.vb | 11 +++++++---- Aviso/usrcntlAktDetails.vb | 19 ++++++++++--------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index e5dee9c..5940e68 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/rCntrlVermerke.vb b/Aviso/rCntrlVermerke.vb index ccbed8e..a6c5c2f 100644 --- a/Aviso/rCntrlVermerke.vb +++ b/Aviso/rCntrlVermerke.vb @@ -99,6 +99,7 @@ Public Class rCntrlVermerke gridVermerke.Rows(rowindex).Selected = True End If + painted = False ' timer.Enabled = True ' initDGVSendungenRows() End Sub @@ -109,17 +110,19 @@ Public Class rCntrlVermerke If (tblSnd_SendungID > 0) Then tmpIndex = tblSnd_SendungID End If - usrcntlAktDetails.gridVermerkeMouseClick(gridVermerke, e.ColumnIndex, e.RowIndex, AVISO, tmpIndex) + Dim init As Boolean = False - Vermerke_anzeigen2(tmpIndex, e.RowIndex) + usrcntlAktDetails.gridVermerkeMouseClick(gridVermerke, e.ColumnIndex, e.RowIndex, AVISO, tmpIndex, init) + + If init Then Vermerke_anzeigen2(tmpIndex, e.RowIndex) End Sub Private Sub gridVermerke_Paint(sender As Object, e As PaintEventArgs) Handles gridVermerke.Paint If painted Then Exit Sub - painted = True + 'If gridVermerke.Columns("VermerkeOptions") Is Nothing Then Exit Sub ' If dgvSendungen.RowCount = 0 Then Exit Sub usrcntlAktDetails.gridVermerke_Paint(gridVermerke) - painted = False + painted = True End Sub diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 9dde028..c57850b 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -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) From 46db09a2bb74915e370080a7c8041ba599ab6519 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 13 Jun 2024 10:55:44 +0200 Subject: [PATCH 2/2] Vers --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 5940e68..30acbb4 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +