20200108

Aviso/Auswertung/usrctlAuswertung.vb

@@ -10,11 +10,15 @@ Public Class usrctlAuswertung
 
     Private Sub usrctlStatistik_Load(sender As Object, e As EventArgs) Handles Me.Load
         txtCntVon.Text = "5"
+        cboFirma.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        cboGrenzstelle.Text = "ALLE"
+
         DataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect
         initFilter()
         initStat()
         grid_Aktiv = True
         showFirmen()
+
     End Sub
 
     Sub initStat()
@@ -22,6 +26,7 @@ Public Class usrctlAuswertung
         datStatBis.Format = DateTimePickerFormat.Short
         cboSrchAuftrFraecht.SelectedIndex = 0
     End Sub
+
     Sub initFilter()
         'AuswahlCombos mit Daten befüllen
         cboFirma.DataSource = Firmen.Anzeigen_cboFirmen("")
@@ -82,7 +87,11 @@ Public Class usrctlAuswertung
             If IsNumeric(txtDauerBis.Text) And txtDauerBis.Text.Trim <> "" Then where &= where_and & " Dauer <= '" & txtDauerBis.Text & "' " : where_and = " AND "
 
 
-            If where <> "" Then sqlstr &= "WHERE  Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND  ( " & where & " ) "
+            If cboGrenzstelle.Text <> "ALLE" Then where &= where_and & " Grenzstelle = '" & cboGrenzstelle.Text & "' " : where_and = " AND "
+            If cboFirmaIntern.Text <> "ALLE" Then where &= where_and & " FIRMA = '" & cboFirmaIntern.Text & "' " : where_and = " AND "
+
+
+            If where <> "" Then sqlstr &= "WHERE  1=1 AND  ( " & where & " ) " 'Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'
             sqlstr &= " GROUP BY " & srch & " "
             Dim having As String = ""
             Dim having_and As String = ""
@@ -447,5 +456,7 @@ Public Class usrctlAuswertung
         showFirmen()
     End Sub
 
-
+    Private Sub cboFirmaIntern_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirmaIntern.SelectedIndexChanged, cboGrenzstelle.SelectedIndexChanged
+        showFirmen()
+    End Sub
 End Class