20200108

2020-01-08 15:01:48 +01:00
parent c860c222c7
commit e879fb6881
89 changed files with 8692 additions and 3571 deletions
--- a/Aviso/Auswertung/frmAuswertung.Designer.vb
+++ b/Aviso/Auswertung/frmAuswertung.Designer.vb
@@ -61,6 +61,7 @@ Partial Class frmAuswertung
        Me.Button10.TabIndex = 9
        Me.Button10.Text = "E-Mails in Fmzoll laden"
        Me.Button10.UseVisualStyleBackColor = True
+        Me.Button10.Visible = False
        '
        'PictureBox1
        '
--- a/Aviso/Auswertung/frmAuswertung.vb
+++ b/Aviso/Auswertung/frmAuswertung.vb
@@ -28,17 +28,21 @@ Public Class frmAuswertung
    End Sub

    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        clrPnlMain()
-        Dim usrCntl As New usrctStatistik
-        usrCntl.Dock = System.Windows.Forms.DockStyle.Fill
-        pnlMain.Controls.Add(usrCntl)
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_Statistik_Gesamt", Me) Then
+            clrPnlMain()
+            Dim usrCntl As New usrctStatistik
+            usrCntl.Dock = System.Windows.Forms.DockStyle.Fill
+            pnlMain.Controls.Add(usrCntl)
+        End If
    End Sub

    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
-        clrPnlMain()
-        Dim usrCntl As New usrctlMAUebersicht
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_Statistik_Mitarbeiter", Me) Then
+            clrPnlMain()
+            Dim usrCntl As New usrctlMAUebersicht
        usrCntl.Dock = System.Windows.Forms.DockStyle.Fill
-        pnlMain.Controls.Add(usrCntl)
+            pnlMain.Controls.Add(usrCntl)
+        End If
    End Sub


--- a/Aviso/Auswertung/frmStatFrima.vb
+++ b/Aviso/Auswertung/frmStatFrima.vb
@@ -146,6 +146,13 @@ Public Class frmStatFrima

   
    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        If DataGridView1.SelectedRows.Count > 0 Then
+            Dim frmLKWBericht As New frmLKWBericht(DataGridView1.SelectedRows(0).Cells("AvisoID").Value)
+            frmLKWBericht.ShowDialog(Me)
+
+        End If
+        Exit Sub
+
        Dim str As String = ""
        For Each r As DataGridViewRow In DataGridView1.Rows()
            If r.Selected Then
--- a/Aviso/Auswertung/usrctlAuswertung.Designer.vb
+++ b/Aviso/Auswertung/usrctlAuswertung.Designer.vb
@@ -22,12 +22,16 @@ Partial Class usrctlAuswertung
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.TabControl1 = New System.Windows.Forms.TabControl()
        Me.TabPage1 = New System.Windows.Forms.TabPage()
        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
        Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.cboFirmaIntern = New System.Windows.Forms.ComboBox()
+        Me.cboGrenzstelle = New System.Windows.Forms.ComboBox()
+        Me.Label19 = New System.Windows.Forms.Label()
        Me.Label18 = New System.Windows.Forms.Label()
        Me.txtDauerBis = New System.Windows.Forms.TextBox()
        Me.txtDauerVon = New System.Windows.Forms.TextBox()
@@ -132,7 +136,7 @@ Partial Class usrctlAuswertung
        Me.TabControl1.Location = New System.Drawing.Point(0, 0)
        Me.TabControl1.Name = "TabControl1"
        Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(931, 565)
+        Me.TabControl1.Size = New System.Drawing.Size(1138, 565)
        Me.TabControl1.TabIndex = 0
        '
        'TabPage1
@@ -143,24 +147,28 @@ Partial Class usrctlAuswertung
        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
        Me.TabPage1.Name = "TabPage1"
        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(923, 539)
+        Me.TabPage1.Size = New System.Drawing.Size(1130, 539)
        Me.TabPage1.TabIndex = 0
        Me.TabPage1.Text = "Kunden"
        Me.TabPage1.UseVisualStyleBackColor = True
        '
        'DataGridView1
        '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.Azure
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
        Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.DataGridView1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.DataGridView1.Location = New System.Drawing.Point(3, 61)
        Me.DataGridView1.Name = "DataGridView1"
-        Me.DataGridView1.Size = New System.Drawing.Size(811, 475)
+        Me.DataGridView1.Size = New System.Drawing.Size(1018, 475)
        Me.DataGridView1.TabIndex = 0
        '
        'Panel3
        '
+        Me.Panel3.Controls.Add(Me.Label20)
+        Me.Panel3.Controls.Add(Me.cboFirmaIntern)
+        Me.Panel3.Controls.Add(Me.cboGrenzstelle)
+        Me.Panel3.Controls.Add(Me.Label19)
        Me.Panel3.Controls.Add(Me.Label18)
        Me.Panel3.Controls.Add(Me.txtDauerBis)
        Me.Panel3.Controls.Add(Me.txtDauerVon)
@@ -180,13 +188,51 @@ Partial Class usrctlAuswertung
        Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel3.Location = New System.Drawing.Point(3, 3)
        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(811, 58)
+        Me.Panel3.Size = New System.Drawing.Size(1018, 58)
        Me.Panel3.TabIndex = 2
        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(742, 9)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(54, 13)
+        Me.Label20.TabIndex = 14
+        Me.Label20.Text = "Firma/NL:"
+        '
+        'cboFirmaIntern
+        '
+        Me.cboFirmaIntern.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboFirmaIntern.FormattingEnabled = True
+        Me.cboFirmaIntern.Items.AddRange(New Object() {"ALLE", "VERAG", "IMEX", "ATILLA", "UNISPED"})
+        Me.cboFirmaIntern.Location = New System.Drawing.Point(799, 6)
+        Me.cboFirmaIntern.Name = "cboFirmaIntern"
+        Me.cboFirmaIntern.Size = New System.Drawing.Size(99, 21)
+        Me.cboFirmaIntern.TabIndex = 13
+        '
+        'cboGrenzstelle
+        '
+        Me.cboGrenzstelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboGrenzstelle.FormattingEnabled = True
+        Me.cboGrenzstelle.Items.AddRange(New Object() {"ALLE", "SUB", "WAI", "SBG", "NKD", "SFD", "???"})
+        Me.cboGrenzstelle.Location = New System.Drawing.Point(904, 5)
+        Me.cboGrenzstelle.Name = "cboGrenzstelle"
+        Me.cboGrenzstelle.Size = New System.Drawing.Size(99, 21)
+        Me.cboGrenzstelle.TabIndex = 12
+        '
+        'Label19
+        '
+        Me.Label19.AutoSize = True
+        Me.Label19.Location = New System.Drawing.Point(238, 35)
+        Me.Label19.Name = "Label19"
+        Me.Label19.Size = New System.Drawing.Size(23, 13)
+        Me.Label19.TabIndex = 11
+        Me.Label19.Text = "min"
+        '
        'Label18
        '
        Me.Label18.AutoSize = True
-        Me.Label18.Location = New System.Drawing.Point(189, 36)
+        Me.Label18.Location = New System.Drawing.Point(183, 36)
        Me.Label18.Name = "Label18"
        Me.Label18.Size = New System.Drawing.Size(10, 13)
        Me.Label18.TabIndex = 10
@@ -194,7 +240,7 @@ Partial Class usrctlAuswertung
        '
        'txtDauerBis
        '
-        Me.txtDauerBis.Location = New System.Drawing.Point(205, 32)
+        Me.txtDauerBis.Location = New System.Drawing.Point(193, 32)
        Me.txtDauerBis.Name = "txtDauerBis"
        Me.txtDauerBis.Size = New System.Drawing.Size(45, 20)
        Me.txtDauerBis.TabIndex = 9
@@ -327,7 +373,7 @@ Partial Class usrctlAuswertung
        Me.Panel2.Controls.Add(Me.Button2)
        Me.Panel2.Controls.Add(Me.Button1)
        Me.Panel2.Dock = System.Windows.Forms.DockStyle.Right
-        Me.Panel2.Location = New System.Drawing.Point(814, 3)
+        Me.Panel2.Location = New System.Drawing.Point(1021, 3)
        Me.Panel2.Name = "Panel2"
        Me.Panel2.Size = New System.Drawing.Size(106, 533)
        Me.Panel2.TabIndex = 1
@@ -359,7 +405,7 @@ Partial Class usrctlAuswertung
        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(923, 539)
+        Me.TabPage2.Size = New System.Drawing.Size(1130, 539)
        Me.TabPage2.TabIndex = 1
        Me.TabPage2.Text = "Filter"
        Me.TabPage2.UseVisualStyleBackColor = True
@@ -383,7 +429,7 @@ Partial Class usrctlAuswertung
        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
        Me.Panel1.Location = New System.Drawing.Point(3, 3)
        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(917, 331)
+        Me.Panel1.Size = New System.Drawing.Size(1124, 331)
        Me.Panel1.TabIndex = 2
        '
        'GroupBox5
@@ -1006,13 +1052,13 @@ Partial Class usrctlAuswertung
        '
        'DataGridView2
        '
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure
-        Me.DataGridView2.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.Azure
+        Me.DataGridView2.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
        Me.DataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.DataGridView2.Dock = System.Windows.Forms.DockStyle.Fill
        Me.DataGridView2.Location = New System.Drawing.Point(3, 3)
        Me.DataGridView2.Name = "DataGridView2"
-        Me.DataGridView2.Size = New System.Drawing.Size(917, 533)
+        Me.DataGridView2.Size = New System.Drawing.Size(1124, 533)
        Me.DataGridView2.TabIndex = 1
        '
        'usrctlAuswertung
@@ -1022,7 +1068,7 @@ Partial Class usrctlAuswertung
        Me.AutoSize = True
        Me.Controls.Add(Me.TabControl1)
        Me.Name = "usrctlAuswertung"
-        Me.Size = New System.Drawing.Size(931, 565)
+        Me.Size = New System.Drawing.Size(1138, 565)
        Me.TabControl1.ResumeLayout(False)
        Me.TabPage1.ResumeLayout(False)
        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1131,5 +1177,8 @@ Partial Class usrctlAuswertung
    Friend WithEvents txtDauerVon As System.Windows.Forms.TextBox
    Friend WithEvents Label14 As System.Windows.Forms.Label
    Friend WithEvents Label18 As System.Windows.Forms.Label
-
+    Friend WithEvents Label19 As Label
+    Friend WithEvents Label20 As Label
+    Friend WithEvents cboFirmaIntern As ComboBox
+    Friend WithEvents cboGrenzstelle As ComboBox
 End Class
--- a/Aviso/Auswertung/usrctlAuswertung.vb
+++ b/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