Uerbestunden

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb

@@ -83,6 +83,7 @@ Partial Class frmUeberstundenauszahlen
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.cbxalle = New System.Windows.Forms.CheckBox()
         Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Label69 = New System.Windows.Forms.Label()
         CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -696,16 +697,28 @@ Partial Class frmUeberstundenauszahlen
         '
         'TabPage2
         '
+        Me.TabPage2.Controls.Add(Me.cbxalle)
         Me.TabPage2.Controls.Add(Me.dgvUberstundenauszahlungen)
         Me.TabPage2.Controls.Add(Me.Label69)
         Me.TabPage2.Location = New System.Drawing.Point(4, 22)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(691, 346)
+        Me.TabPage2.Size = New System.Drawing.Size(691, 371)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "bereits ausgezahlt"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
+        'cbxalle
+        '
+        Me.cbxalle.AutoSize = True
+        Me.cbxalle.Location = New System.Drawing.Point(643, 3)
+        Me.cbxalle.Name = "cbxalle"
+        Me.cbxalle.Size = New System.Drawing.Size(42, 17)
+        Me.cbxalle.TabIndex = 139
+        Me.cbxalle.Text = "alle"
+        Me.cbxalle.UseVisualStyleBackColor = True
+        Me.cbxalle.Visible = False
+        '
         'dgvUberstundenauszahlungen
         '
         Me.dgvUberstundenauszahlungen.AKTUALISIERUNGS_INTERVALL = -1
@@ -820,4 +833,5 @@ Partial Class frmUeberstundenauszahlen
     Friend WithEvents TabPage2 As Windows.Forms.TabPage
     Friend WithEvents dgvUberstundenauszahlungen As MyDatagridview
     Friend WithEvents Label69 As Windows.Forms.Label
+    Friend WithEvents cbxalle As Windows.Forms.CheckBox
 End Class

VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb

@@ -1,4 +1,5 @@
 
+Imports System.Drawing
 Imports System.Globalization
 Imports System.Text
 Imports System.Threading
@@ -45,6 +46,8 @@ Public Class frmUeberstundenauszahlen
 
         End Select
 
+        cbxalle.Visible = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "SDL")
+
 
         Dim dv = New DataView(dt)
         dv.RowFilter = "accountid = 65 Or accountid = 69 Or accountid = 70 Or accountid = 72 Or accountid = 73 Or accountid = 1209 Or accountid = 1235 Or accountid = 1550 Or accountid = 1551 Or accountid = 1553"
@@ -494,19 +497,38 @@ Public Class frmUeberstundenauszahlen
         Process.Start(webAddress)
     End Sub
 
-    Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged
+    Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged, cbxalle.CheckedChanged
         If TabControl1.SelectedIndex = 1 Then
             Try
 
                 Dim dtbereitsausgezahlteUE As DataTable
-                Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am 
+                Dim bereitsgezahlteueberstunden = "select uest_deleted as geloescht,  uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am 
                 FROM [ADMIN].[dbo].[tblUeberstunden] 
-                where uest_deleted = 0 and uest_timasId = " & MA.mit_timasId & "
+                where uest_timasId = " & MA.mit_timasId & IIf(Not cbxalle.Checked, " and uest_deleted = 0", "") & "
                 Order by uest_date"
 
                 dtbereitsausgezahlteUE = SQL.loadDgvBySql(bereitsgezahlteueberstunden, "ADMIN", 100, True)
 
-                dgvUberstundenauszahlungen.DataSource = dtbereitsausgezahlteUE
+                With dgvUberstundenauszahlungen
+
+                    .DataSource = dtbereitsausgezahlteUE
+                    .Columns("geloescht").Visible = False
+
+                    For Each row As DataGridViewRow In .Rows
+
+                        If Not IsDBNull(row.Cells("geloescht").Value) Then
+                            If Not row.Cells("geloescht").Value Then
+                                row.DefaultCellStyle.BackColor = Color.LightGreen
+                            Else
+                                row.DefaultCellStyle.BackColor = Color.IndianRed
+                            End If
+
+                        End If
+                    Next
+
+
+                End With
+
 
 
             Catch ex As Exception
@@ -515,6 +537,7 @@ Public Class frmUeberstundenauszahlen
         End If
     End Sub
 
+
     Private Sub txtAusz_hhmm_KeyPress(sender As Object, e As KeyPressEventArgs)
         Select Case Asc(e.KeyChar)
             Case 48 To 57, 8, 44, 46, 58
@@ -892,7 +915,7 @@ Public Class frmUeberstundenauszahlen
 
         If stundenlfdSaldo < 0 And cbxoverwrite.Checked Then txtAusz50vonSaldo.Text = 0 'Wenn Saldo negativ, dann nichts vom lfd Saldo vorschlagen!
 
-            If Not refresh Then refresh = Not refresh
+        If Not refresh Then refresh = Not refresh
 
     End Sub