neu

SDL/Administration/Auswertungen/frmZollUserStat.Designer.vb

@@ -38,6 +38,7 @@ Partial Class frmZollUserStat
         Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
         Me.DataGridView1 = New System.Windows.Forms.DataGridView()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Button9 = New System.Windows.Forms.Button()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Button8 = New System.Windows.Forms.Button()
@@ -45,7 +46,7 @@ Partial Class frmZollUserStat
         Me.Label5 = New System.Windows.Forms.Label()
         Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.Button9 = New System.Windows.Forms.Button()
+        Me.cbxgekuendigt = New System.Windows.Forms.CheckBox()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
@@ -221,6 +222,7 @@ Partial Class frmZollUserStat
         '
         'Panel1
         '
+        Me.Panel1.Controls.Add(Me.cbxgekuendigt)
         Me.Panel1.Controls.Add(Me.Button9)
         Me.Panel1.Controls.Add(Me.Label4)
         Me.Panel1.Controls.Add(Me.MyComboBox1)
@@ -244,6 +246,16 @@ Partial Class frmZollUserStat
         Me.Panel1.Size = New System.Drawing.Size(841, 186)
         Me.Panel1.TabIndex = 10
         '
+        'Button9
+        '
+        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button9.Location = New System.Drawing.Point(427, 132)
+        Me.Button9.Name = "Button9"
+        Me.Button9.Size = New System.Drawing.Size(174, 40)
+        Me.Button9.TabIndex = 13
+        Me.Button9.Text = "AUSWERTUNG QS"
+        Me.Button9.UseVisualStyleBackColor = True
+        '
         'Label4
         '
         Me.Label4.AutoSize = True
@@ -319,15 +331,18 @@ Partial Class frmZollUserStat
         Me.Panel2.Size = New System.Drawing.Size(234, 716)
         Me.Panel2.TabIndex = 11
         '
-        'Button9
+        'cbxgekuendigt
         '
-        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button9.Location = New System.Drawing.Point(427, 132)
-        Me.Button9.Name = "Button9"
-        Me.Button9.Size = New System.Drawing.Size(174, 40)
-        Me.Button9.TabIndex = 13
-        Me.Button9.Text = "AUSWERTUNG QS"
-        Me.Button9.UseVisualStyleBackColor = True
+        Me.cbxgekuendigt.AutoSize = True
+        Me.cbxgekuendigt.Checked = True
+        Me.cbxgekuendigt.CheckState = System.Windows.Forms.CheckState.Indeterminate
+        Me.cbxgekuendigt.Location = New System.Drawing.Point(427, 108)
+        Me.cbxgekuendigt.Name = "cbxgekuendigt"
+        Me.cbxgekuendigt.Size = New System.Drawing.Size(73, 17)
+        Me.cbxgekuendigt.TabIndex = 14
+        Me.cbxgekuendigt.Text = "gekündigt"
+        Me.cbxgekuendigt.ThreeState = True
+        Me.cbxgekuendigt.UseVisualStyleBackColor = True
         '
         'frmZollUserStat
         '
@@ -371,4 +386,5 @@ Partial Class frmZollUserStat
     Friend WithEvents Label4 As System.Windows.Forms.Label
     Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents Button9 As Button
+    Friend WithEvents cbxgekuendigt As CheckBox
 End Class

SDL/Administration/Auswertungen/frmZollUserStat.vb

@@ -26,7 +26,12 @@ Public Class frmZollUserStat
             sql &= " FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblMitarbeiter " 'left join " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblDienstMitarb ON [dstma_mitId]=mit_id"
             sql &= " WHERE 1=1  "
             sql &= " and mit_abteilung IN ('ZOLL','QS') and mit_pseudoUser=0"
-            sql &= " and mit_gekuendigt = 0"
+
+            Select Case cbxgekuendigt.CheckState
+                Case CheckState.Unchecked : sql &= " and mit_gekuendigt = 0 "
+                Case CheckState.Checked : sql &= " and mit_gekuendigt = 1 "
+            End Select
+            ' sql &= " and mit_gekuendigt = 0 "
             Dim filter As String = ""
             '    If MyTextBox1.Text <> "" And MyTextBox3.Text <> "" Then
             'filter += " Abfertigungsdatum BETWEEN '" & MyTextBox1.Text & "' AND '" & MyTextBox3.Text & "' "
@@ -35,7 +40,9 @@ Public Class frmZollUserStat
 
             'If MyComboBox1.Text <> "" Then filter += " AND FilialenNr IN (" & DirectCast(MyComboBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & ") "
             If MyComboBox2.Text <> "" Then filter += " AND mit_niederlassung IN ('" & DirectCast(MyComboBox2.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & "') "
-            If MyComboBox1.Text <> "" Then filter += " AND mit_firma IN ('" & DirectCast(MyComboBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & "') "
+            If MyComboBox1.Text <> "" Then
+                filter += " AND (mit_firma IN ('" & DirectCast(MyComboBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & "')  OR (mit_firma='ALL' AND mit_firmaHaupt  IN ('" & DirectCast(MyComboBox1.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value & "') )) "
+            End If
 
 
             ' filter += " AND [Personalnummer] is not null "