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

merge

Browse Source
This commit is contained in:
d.breimaier
2024-06-13 10:58:17 +02:00
parent 13a2aa365e 46db09a2bb
commit 0a2940c74d
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aviso/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("4.0.0.5")>
<Assembly: AssemblyFileVersion("4.0.0.5")>
<Assembly: AssemblyVersion("4.0.0.6")>
<Assembly: AssemblyFileVersion("4.0.0.6")>

11
Aviso/rCntrlVermerke.vb
View File

@@ -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

20
Aviso/usrcntlAktDetails.vb
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,16 +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
gridVermerke_Paint(gridVermerke)
painted = True
'painted = True
'gridVermerke_Paint(gridVermerke)
'painted = False
End Sub
Shared Sub gridVermerke_Paint(gridvermerke As DataGridView)