This commit is contained in:
2019-09-10 14:15:44 +02:00
parent 189a2ac284
commit c7ff55bbae
29 changed files with 3557 additions and 220 deletions

View File

@@ -176,6 +176,9 @@ Public Class usrcntlAktDetails
btnVorbereitet.Visible = True
End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME <> "ADMIN" Then
tbcntlVermerke.TabPages.Remove(tbAnhang)
End If
If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "WAI" Then
Button8.Text = "Gest.Liste"
@@ -475,6 +478,64 @@ Public Class usrcntlAktDetails
' If setAkive_AuswahlID() = -1 Then Exit Sub
If AvisoID <= 0 Then Exit Sub
Select Case tbcntlVermerke.SelectedIndex
Case 0, 1, 2 : Vermerke_anzeigen2(rowindex)
Case 3
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],[anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge]
WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0
order by [anh_Reihenfolge],[anh_id]"
gridVermerke.DataSource = VermerkeDAL.Anzeigen_Vermerke(hSQL)
If gridVermerke.RowCount = 0 Then gridVermerke.Columns.Clear() : Exit Sub
With gridVermerke
.RowTemplate.MinimumHeight = 20
.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells
.Columns("anh_id").Visible = False 'VermerkID nicht anzeigen
.Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen
.Columns("anh_Name").MinimumWidth = 150
.Columns("anh_Name").HeaderText = "Name"
.Columns("anh_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("anh_Art").MinimumWidth = 50
.Columns("anh_Art").HeaderText = "Art"
.Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
.Columns("anh_Typ").Width = 60
.Columns("anh_Typ").HeaderText = "Typ"
.Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter
End With
End Select
End Sub
Private Sub Vermerke_anzeigen2(Optional rowindex As Integer = -1)
If Not loaded Then Exit Sub
aktiv = Now 'Damit nicht neu geladedt wird (frmHauptfenster -> timer.tick)
gridVermerke.Columns.Clear()
lblInfoAviso.Visible = False
infotxt = ""
' If setAkive_AuswahlID() = -1 Then Exit Sub
If AvisoID <= 0 Then Exit Sub
Select Case tbcntlVermerke.SelectedIndex
Case 0, 1
Case 2
End Select
'Hier werden die passenden Vermerke zum Aviso angezeigt
Dim sendwhere = ""
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then
@@ -540,6 +601,7 @@ Public Class usrcntlAktDetails
End Sub
Private Sub gridVermerkeMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellEventArgs) Handles gridVermerke.CellContentClick
If gridVermerke.RowCount = 0 Then Exit Sub
@@ -658,6 +720,7 @@ Public Class usrcntlAktDetails
Private Sub gridVermerke_Paint(sender As Object, e As PaintEventArgs) Handles gridVermerke.Paint
If dgvSendungen.RowCount = 0 Then Exit Sub
Try
If gridVermerke.Columns("VermerkeOptions") Is Nothing Then Exit Sub
For Each r As DataGridViewRow In gridVermerke.Rows
' If r.Cells("VermerkeOptions").GetType.Name = "DataGridViewLinkCell" Then
Dim optionCell As DataGridViewLinkCell = DirectCast(r.Cells("VermerkeOptions"), DataGridViewLinkCell)
@@ -739,7 +802,7 @@ Public Class usrcntlAktDetails
Next
Catch ex As Exception
MsgBox(ex.Message)
MsgBox(ex.Message & ex.StackTrace)
End Try
End Sub
@@ -898,6 +961,19 @@ Public Class usrcntlAktDetails
End Sub
Private Sub gridVermerke_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles gridVermerke.CellDoubleClick
Try
If tbcntlVermerke.SelectedTab Is tbAnhang Then
If gridVermerke.SelectedRows.Count > 0 Then
Process.Start(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(gridVermerke.SelectedRows(0).Cells("anh_docId").Value))
End If
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
End Sub
Public Sub openSnd(sendId)
Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
@@ -1425,9 +1501,7 @@ Public Class usrcntlAktDetails
Catch ex As Exception
MsgBox(ex.Message)
MsgBox(ex.StackTrace)
MsgBox(ex.Message & ex.StackTrace)
End Try
End Sub
@@ -1516,7 +1590,7 @@ Public Class usrcntlAktDetails
reload(AvisoID)
Catch ex As Exception
MsgBox(ex.Message)
MsgBox(ex.Message & ex.StackTrace)
MsgBox(ex.StackTrace)
End Try