diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 1755da8e..98d25f34 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -611,46 +611,46 @@ Public Class usrCntlUSTV Private Sub mnuItem_Clicked(sender As Object, e As EventArgs) - If dgvUSTV.SelectedRows.Count > 0 Then - ContextMenuStrip1.Hide() + + ContextMenuStrip1.Hide() Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem) - If item IsNot Nothing Then - If item.Name = "excel" Then - excelAuswertung() + If item IsNot Nothing Then + If item.Name = "excel" Then + If dgvUSTV.SelectedRows.Count > 0 Then excelAuswertung() - ElseIf item.Name = "mail" Then - mailmitExcelauswertung() - - ElseIf item.Name = "offeneAntraege" Then - If dgvUSTV.SelectedRows(0) IsNot Nothing AndAlso IsDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatVon").Value) AndAlso IsDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatBis").Value) Then - - If dgvUSTV.SelectedRows(0).Cells("UStVAn_KuNr").Value IsNot Nothing AndAlso dgvUSTV.SelectedRows(0).Cells("UStVAn_Name").Value IsNot Nothing Then - Dim frm As New frmUSTVoffeneAntraege(CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatVon").Value), CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatBis").Value), dgvUSTV.SelectedRows(0).Cells("UStVAn_KuNr").Value, IIf(IsDBNull(dgvUSTV.SelectedRows(0).Cells("UStVAn_Name").Value), "", dgvUSTV.SelectedRows(0).Cells("UStVAn_Name").Value)) - frm.Show() - - Else - Dim frm As New frmUSTVoffeneAntraege(CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatVon").Value), CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatBis").Value)) - frm.cbxAlleoffenen.Checked = True - frm.Show() - - End If + ElseIf item.Name = "mail" Then + If dgvUSTV.SelectedRows.Count > 0 Then mailmitExcelauswertung() + ElseIf item.Name = "offeneAntraege" Then + If dgvUSTV.SelectedRows.Count > 0 AndAlso dgvUSTV.SelectedRows(0) IsNot Nothing AndAlso IsDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatVon").Value) AndAlso IsDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatBis").Value) Then + If dgvUSTV.SelectedRows(0).Cells("UStVAn_KuNr").Value IsNot Nothing AndAlso dgvUSTV.SelectedRows(0).Cells("UStVAn_Name").Value IsNot Nothing Then + Dim frm As New frmUSTVoffeneAntraege(CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatVon").Value), CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatBis").Value), dgvUSTV.SelectedRows(0).Cells("UStVAn_KuNr").Value, IIf(IsDBNull(dgvUSTV.SelectedRows(0).Cells("UStVAn_Name").Value), "", dgvUSTV.SelectedRows(0).Cells("UStVAn_Name").Value)) + frm.Show() Else - Dim frm As New frmUSTVoffeneAntraege() + Dim frm As New frmUSTVoffeneAntraege(CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatVon").Value), CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatBis").Value)) + frm.cbxAlleoffenen.Checked = True frm.Show() + End If + + Else - MsgBox("Funktion nicht implementiert!") + Dim frm As New frmUSTVoffeneAntraege() + frm.Show() End If + Else + MsgBox("Funktion nicht implementiert!") End If + End If + End Sub