Bugfix, optische Verbesserungen
This commit is contained in:
@@ -227,32 +227,37 @@ Public Class frmUeberstundenauszahlen
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Dim dv = New DataView(dt)
|
||||
dv.RowFilter = "accountid = 1550 Or accountid = 1551 Or accountid = 1553" 'Überstunden!
|
||||
dt = dv.ToTable
|
||||
|
||||
For Each row As DataRow In dt.Rows
|
||||
If dt.Columns.Contains("accountid") Then
|
||||
|
||||
Select Case row(0)
|
||||
|
||||
Case 1550 : If IsDBNull(row(1)) Then row(1) = CStr("ÜS 100%")
|
||||
Case 1551 : If IsDBNull(row(1)) Then row(1) = CStr("ÜS 50%")
|
||||
Case 1553 : If IsDBNull(row(1)) Then row(1) = CStr("ÜS 25%")
|
||||
Dim dv = New DataView(dt)
|
||||
dv.RowFilter = "accountid = 1550 Or accountid = 1551 Or accountid = 1553" 'Überstunden!
|
||||
dt = dv.ToTable
|
||||
|
||||
End Select
|
||||
Next
|
||||
For Each row As DataRow In dt.Rows
|
||||
|
||||
Select Case row(0)
|
||||
|
||||
Case 1550 : If IsDBNull(row(1)) Then row(1) = CStr("ÜS 100%")
|
||||
Case 1551 : If IsDBNull(row(1)) Then row(1) = CStr("ÜS 50%")
|
||||
Case 1553 : If IsDBNull(row(1)) Then row(1) = CStr("ÜS 25%")
|
||||
|
||||
End Select
|
||||
Next
|
||||
|
||||
If (dt.Columns.Contains("accountid")) Then
|
||||
dt.Columns.Remove("accountid")
|
||||
dt.AcceptChanges()
|
||||
End If
|
||||
|
||||
If (dt.Columns.Contains("accountid")) Then
|
||||
dt.Columns.Remove("accountid")
|
||||
dt.AcceptChanges()
|
||||
End If
|
||||
|
||||
|
||||
dgv.DataSource = dt
|
||||
|
||||
|
||||
|
||||
If dgv IsNot Nothing Then
|
||||
If dgv IsNot Nothing Then
|
||||
dgv.AutoSize = DataGridViewAutoSizeColumnMode.Fill
|
||||
dgv.Dock = DockStyle.Fill
|
||||
dgv.ReadOnly = True
|
||||
@@ -726,9 +731,9 @@ Public Class frmUeberstundenauszahlen
|
||||
|
||||
If row.Item("name") = "ÜS werden nicht auf lfd. Saldo hinzugezählt" Then
|
||||
If row.Item("value") = "true" Then
|
||||
MsgBox("ÜS werden nicht auf lfd. Saldo hinzugezählt")
|
||||
Label5.Text = "ÜS werden nicht auf lfd. Saldo hinzugezählt!"
|
||||
Else
|
||||
lblWarning.Text = ""
|
||||
Label5.Text = ""
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
Reference in New Issue
Block a user