Sendungsvermerke
This commit is contained in:
27
Aviso/usrcntlAktDetails.Designer.vb
generated
27
Aviso/usrcntlAktDetails.Designer.vb
generated
@@ -153,11 +153,12 @@ Partial Class usrcntlAktDetails
|
||||
Me.pnlStatus = New System.Windows.Forms.Panel()
|
||||
Me.lblStatus = New System.Windows.Forms.Label()
|
||||
Me.conMenuVermerke = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.conVermerkLöschen = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.conVermerkEntgLöschen = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.HervorhebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.ToolUeberweisungsBeleg = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.toolVkReminder = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.MitarbeiterAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.conVermerkLöschenNew = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cntxtFormulare = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.DispolisteTRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.DispolisteENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
|
||||
@@ -1978,16 +1979,16 @@ Partial Class usrcntlAktDetails
|
||||
'conMenuVermerke
|
||||
'
|
||||
Me.conMenuVermerke.ImageScalingSize = New System.Drawing.Size(24, 24)
|
||||
Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder, Me.MitarbeiterAnzeigenToolStripMenuItem})
|
||||
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.Name = "conMenuVermerke"
|
||||
Me.conMenuVermerke.Size = New System.Drawing.Size(252, 154)
|
||||
Me.conMenuVermerke.Size = New System.Drawing.Size(252, 206)
|
||||
'
|
||||
'conVermerkLöschen
|
||||
'conVermerkEntgLöschen
|
||||
'
|
||||
Me.conVermerkLöschen.Image = Global.AVISO.My.Resources.Resources.del
|
||||
Me.conVermerkLöschen.Name = "conVermerkLöschen"
|
||||
Me.conVermerkLöschen.Size = New System.Drawing.Size(251, 30)
|
||||
Me.conVermerkLöschen.Text = "Vermerk löschen"
|
||||
Me.conVermerkEntgLöschen.Image = Global.AVISO.My.Resources.Resources.del
|
||||
Me.conVermerkEntgLöschen.Name = "conVermerkEntgLöschen"
|
||||
Me.conVermerkEntgLöschen.Size = New System.Drawing.Size(251, 30)
|
||||
Me.conVermerkEntgLöschen.Text = "Vermerk entgültig löschen"
|
||||
'
|
||||
'HervorhebenToolStripMenuItem
|
||||
'
|
||||
@@ -2018,6 +2019,13 @@ Partial Class usrcntlAktDetails
|
||||
Me.MitarbeiterAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(251, 30)
|
||||
Me.MitarbeiterAnzeigenToolStripMenuItem.Text = "Mitarbeiter anzeigen"
|
||||
'
|
||||
'conVermerkLöschenNew
|
||||
'
|
||||
Me.conVermerkLöschenNew.Image = Global.AVISO.My.Resources.Resources.del
|
||||
Me.conVermerkLöschenNew.Name = "conVermerkLöschenNew"
|
||||
Me.conVermerkLöschenNew.Size = New System.Drawing.Size(251, 30)
|
||||
Me.conVermerkLöschenNew.Text = "Vermerk löschen"
|
||||
'
|
||||
'cntxtFormulare
|
||||
'
|
||||
Me.cntxtFormulare.ImageScalingSize = New System.Drawing.Size(24, 24)
|
||||
@@ -2332,7 +2340,7 @@ Partial Class usrcntlAktDetails
|
||||
Friend WithEvents pnl As System.Windows.Forms.Panel
|
||||
Friend WithEvents txtLKW_Nr As System.Windows.Forms.TextBox
|
||||
Friend WithEvents conMenuVermerke As System.Windows.Forms.ContextMenuStrip
|
||||
Friend WithEvents conVermerkLöschen As System.Windows.Forms.ToolStripMenuItem
|
||||
Friend WithEvents conVermerkEntgLöschen As System.Windows.Forms.ToolStripMenuItem
|
||||
Friend WithEvents pnlStatus As System.Windows.Forms.Panel
|
||||
Friend WithEvents lblStatus As System.Windows.Forms.Label
|
||||
Friend WithEvents btnOptionen As System.Windows.Forms.Button
|
||||
@@ -2435,4 +2443,5 @@ Partial Class usrcntlAktDetails
|
||||
Friend WithEvents picAVISOMessenger As PictureBox
|
||||
Friend WithEvents lblSNDChat_MsgCnt As Label
|
||||
Friend WithEvents picAVISOMessengerSNDChat As PictureBox
|
||||
Friend WithEvents conVermerkLöschenNew As ToolStripMenuItem
|
||||
End Class
|
||||
|
||||
@@ -269,6 +269,13 @@ Public Class usrcntlAktDetails
|
||||
Button2.Visible = True
|
||||
End If
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Vermerke_löschen", "SDL") Then
|
||||
|
||||
conVermerkEntgLöschen.Visible = True
|
||||
Else
|
||||
conVermerkEntgLöschen.Visible = False
|
||||
End If
|
||||
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME <> "ADMIN" Then
|
||||
' tbcntlVermerke.TabPages.Remove(tbAnhang)
|
||||
'End If
|
||||
@@ -423,6 +430,7 @@ Public Class usrcntlAktDetails
|
||||
.Columns("Hinweis_Vermerk").Visible = False 'Hinweis_Vermerk nicht anzeigen
|
||||
.Columns("tblSnd_Empfaenger").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
.Columns("Hervorheben").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
.Columns("Geloescht").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
.Columns("VorauskasseId").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
.Columns("SMSId").Visible = False 'tblSnd_Empfaengernicht anzeigen
|
||||
|
||||
@@ -957,7 +965,7 @@ Public Class usrcntlAktDetails
|
||||
' Dim hSQL As String = "SELECT [VermerkID],[AvisoID],[Datum],[Mitarbeiter],[Hinweis_Vermerk],[VermerkeCode],[MitarbeiterId] FROM Vermerke WHERE AvisoID = " & AvisoID & " " & sendwhere & " ORDER BY Datum DESC"
|
||||
|
||||
|
||||
Dim hSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben," &
|
||||
Dim hSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," &
|
||||
" CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47,94) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId" &
|
||||
" FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " &
|
||||
" LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " &
|
||||
@@ -1240,6 +1248,9 @@ Public Class usrcntlAktDetails
|
||||
'r.DefaultCellStyle.ForeColor = Color.White
|
||||
r.DefaultCellStyle.BackColor = Color.Yellow
|
||||
End If
|
||||
If CBool(r.Cells("Geloescht").Value) Then
|
||||
r.DefaultCellStyle.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Strikeout)
|
||||
End If
|
||||
If (r.Cells("VermerkeCode").Value) IsNot DBNull.Value Then
|
||||
|
||||
Select Case CInt(r.Cells("VermerkeCode").Value)
|
||||
@@ -1487,9 +1498,13 @@ Public Class usrcntlAktDetails
|
||||
|
||||
|
||||
|
||||
Private Sub conMenu_Click(sender As Object, e As System.EventArgs) Handles conVermerkLöschen.Click
|
||||
Private Sub conMenu_Click(sender As Object, e As System.EventArgs) Handles conVermerkEntgLöschen.Click, conVermerkLöschenNew.Click
|
||||
|
||||
If gridVermerke.SelectedRows.Count = 0 Then Exit Sub
|
||||
If vbNo = MsgBox("Wollen Sie den ausgewählten Vermerk löschen?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle), "Vermerk löschen") Then
|
||||
|
||||
If sender Is conVermerkEntgLöschen Then
|
||||
|
||||
If vbNo = MsgBox("Wollen Sie den ausgewählten entgültig Vermerk löschen?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle), "Vermerk löschen") Then
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
@@ -1501,10 +1516,21 @@ Public Class usrcntlAktDetails
|
||||
VermerkeDAL.LöschenVermerk(CInt(gridVermerke.SelectedRows(0).Cells("VermerkID").Value))
|
||||
Vermerke_anzeigen(index)
|
||||
|
||||
ElseIf sender Is conVermerkLöschenNew Then
|
||||
|
||||
If vbNo = MsgBox("Wollen Sie den ausgewählten Vermerk löschen?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle), "Vermerk löschen") Then
|
||||
Exit Sub
|
||||
End If
|
||||
Dim index As Integer = -1
|
||||
If (dgvSendungen.SelectedRows.Count > 0) Then index = dgvSendungen.SelectedRows(0).Index
|
||||
VermerkeDAL.togglegeloescht(CInt(gridVermerke.SelectedRows(0).Cells("VermerkID").Value))
|
||||
Vermerke_anzeigen(index)
|
||||
End If
|
||||
|
||||
|
||||
If sender Is conVermerkLöschen Then
|
||||
|
||||
|
||||
If False Then 'sender Is conVermerkEntgLöschen Then
|
||||
If IsNothing(gridVermerke.CurrentRow) Then Exit Sub
|
||||
' cGlobal.Aktive_ID = CInt(gridVermerke.Rows(gridVermerke.CurrentRow.Index).Cells("VermerkID").Value)
|
||||
|
||||
@@ -1530,6 +1556,13 @@ Public Class usrcntlAktDetails
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub vermerkeLöschen()
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
|
||||
Private Sub grid_CellMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellMouseEventArgs) Handles gridVermerke.CellMouseClick
|
||||
If e.RowIndex < 0 Then Exit Sub 'Es wurde außerhalb einer gültigen Datenzeile geklickt
|
||||
|
||||
Reference in New Issue
Block a user