Kunednkontakte, Bereichitungsgruppen (Ansicht), StartOptions, etc.

2026-01-30 16:43:34 +01:00
parent 0b6a5c9956
commit f7bde33bb4
9 changed files with 1290 additions and 1040 deletions
--- a/UID/Programme/frmBerechtigungenUser.Designer.vb
+++ b/UID/Programme/frmBerechtigungenUser.Designer.vb
@@ -25,9 +25,12 @@ Partial Class frmBerechtigungenUser
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmBerechtigungenUser))
        Me.gdvGruppen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.lbl = New System.Windows.Forms.Label()
+        Me.cb_inaktivAusblenden = New System.Windows.Forms.CheckBox()
        Me.dgvGrp_id = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.dgvGrp_bez = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.lbl = New System.Windows.Forms.Label()
+        Me.Firma = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.inaktiv = New System.Windows.Forms.DataGridViewCheckBoxColumn()
        CType(Me.gdvGruppen, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@@ -40,7 +43,7 @@ Partial Class frmBerechtigungenUser
        Me.gdvGruppen.AllowUserToResizeRows = False
        Me.gdvGruppen.BackgroundColor = System.Drawing.Color.White
        Me.gdvGruppen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.gdvGruppen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.dgvGrp_id, Me.dgvGrp_bez})
+        Me.gdvGruppen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.dgvGrp_id, Me.dgvGrp_bez, Me.Firma, Me.inaktiv})
        Me.gdvGruppen.Location = New System.Drawing.Point(12, 33)
        Me.gdvGruppen.MultiSelect = False
        Me.gdvGruppen.Name = "gdvGruppen"
@@ -50,6 +53,25 @@ Partial Class frmBerechtigungenUser
        Me.gdvGruppen.Size = New System.Drawing.Size(302, 533)
        Me.gdvGruppen.TabIndex = 21
        '
+        'lbl
+        '
+        Me.lbl.AutoSize = True
+        Me.lbl.Location = New System.Drawing.Point(13, 14)
+        Me.lbl.Name = "lbl"
+        Me.lbl.Size = New System.Drawing.Size(119, 13)
+        Me.lbl.TabIndex = 22
+        Me.lbl.Text = "Benutzer in der Gruppe:"
+        '
+        'cb_inaktivAusblenden
+        '
+        Me.cb_inaktivAusblenden.AutoSize = True
+        Me.cb_inaktivAusblenden.Location = New System.Drawing.Point(233, 14)
+        Me.cb_inaktivAusblenden.Name = "cb_inaktivAusblenden"
+        Me.cb_inaktivAusblenden.Size = New System.Drawing.Size(81, 17)
+        Me.cb_inaktivAusblenden.TabIndex = 23
+        Me.cb_inaktivAusblenden.Text = "nur akt. MA"
+        Me.cb_inaktivAusblenden.UseVisualStyleBackColor = True
+        '
        'dgvGrp_id
        '
        Me.dgvGrp_id.HeaderText = "Id"
@@ -65,20 +87,25 @@ Partial Class frmBerechtigungenUser
        Me.dgvGrp_bez.Name = "dgvGrp_bez"
        Me.dgvGrp_bez.ReadOnly = True
        '
-        'lbl
+        'Firma
        '
-        Me.lbl.AutoSize = True
-        Me.lbl.Location = New System.Drawing.Point(13, 14)
-        Me.lbl.Name = "lbl"
-        Me.lbl.Size = New System.Drawing.Size(119, 13)
-        Me.lbl.TabIndex = 22
-        Me.lbl.Text = "Benutzer in der Gruppe:"
+        Me.Firma.HeaderText = "Firma"
+        Me.Firma.Name = "Firma"
+        Me.Firma.ReadOnly = True
+        '
+        'inaktiv
+        '
+        Me.inaktiv.HeaderText = "Inaktiv"
+        Me.inaktiv.Name = "inaktiv"
+        Me.inaktiv.ReadOnly = True
+        Me.inaktiv.Width = 50
        '
        'frmBerechtigungenUser
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(326, 576)
+        Me.Controls.Add(Me.cb_inaktivAusblenden)
        Me.Controls.Add(Me.lbl)
        Me.Controls.Add(Me.gdvGruppen)
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -92,7 +119,10 @@ Partial Class frmBerechtigungenUser
    End Sub

    Friend WithEvents gdvGruppen As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents lbl As Label
+    Friend WithEvents cb_inaktivAusblenden As CheckBox
    Friend WithEvents dgvGrp_id As DataGridViewTextBoxColumn
    Friend WithEvents dgvGrp_bez As DataGridViewTextBoxColumn
-    Friend WithEvents lbl As Label
+    Friend WithEvents Firma As DataGridViewTextBoxColumn
+    Friend WithEvents inaktiv As DataGridViewCheckBoxColumn
 End Class
--- a/UID/Programme/frmBerechtigungenUser.resx
+++ b/UID/Programme/frmBerechtigungenUser.resx
@@ -123,6 +123,12 @@
  <metadata name="dgvGrp_bez.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="Firma.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="inaktiv.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
--- a/UID/Programme/frmBerechtigungenUser.vb
+++ b/UID/Programme/frmBerechtigungenUser.vb
@@ -1,3 +1,27 @@
 Public Class frmBerechtigungenUser
+    Private Sub cb_inaktivAusblenden_CheckedChanged(sender As Object, e As EventArgs) Handles cb_inaktivAusblenden.CheckedChanged

+        If gdvGruppen IsNot Nothing AndAlso gdvGruppen.Rows.Count > 0 Then
+
+            If cb_inaktivAusblenden.Checked Then
+                For Each row In gdvGruppen.Rows
+
+                    If row.Cells("Inaktiv").Value Then
+                        row.Visible = False
+                    End If
+
+                Next
+
+            Else
+                For Each row In gdvGruppen.Rows
+
+                    row.Visible = True
+
+                Next
+
+            End If
+
+        End If
+
+    End Sub
 End Class
--- a/UID/Programme/frmBerechtigungsObjekte.vb
+++ b/UID/Programme/frmBerechtigungsObjekte.vb
@@ -249,11 +249,11 @@
        If gdvGruppen.SelectedRows.Count > 0 Then
            Dim f As New frmBerechtigungenUser()
            f.lbl.Text = "Benutzer in der Gruppe: " & gdvGruppen.SelectedRows(0).Cells("dgvGrp_bez").Value
-            Dim dt = sql.loadDgvBySql("SELECT [mit_id],mit_username  FROM [tblBerechtigungenBenutzerGruppenZuordnung] inner join tblMitarbeiter on mit_id=berbgz_mitId where [berbgz_bergrId]='" & gdvGruppen.SelectedRows(0).Cells("dgvGrp_id").Value & "' AND isnull(mit_username,'') <>'' ORDER BY mit_username", "ADMIN")
+            Dim dt = sql.loadDgvBySql("SELECT [mit_id],mit_username,mit_firma, mit_gekuendigt   FROM [tblBerechtigungenBenutzerGruppenZuordnung] inner join tblMitarbeiter on mit_id=berbgz_mitId where [berbgz_bergrId]='" & gdvGruppen.SelectedRows(0).Cells("dgvGrp_id").Value & "' AND isnull(mit_username,'') <>'' ORDER BY mit_username", "ADMIN")
            f.gdvGruppen.Rows.Clear()
            If dt IsNot Nothing Then
                For Each r In dt.Rows
-                    f.gdvGruppen.Rows.Add(r("mit_id"), r("mit_username"))
+                    f.gdvGruppen.Rows.Add(r("mit_id"), r("mit_username"), r("mit_firma"), r("mit_gekuendigt"))
                Next
                f.Show()
            Else
@@ -268,12 +268,12 @@
        Dim f As New frmBerechtigungenUser()
        f.lbl.Text = "Freigeschaltene Benutzer: " & Me.codename
        ' MsgBox(Me.progId)
-        Dim dt = sql.loadDgvBySql("SELECT [mit_id],[mit_username]  FROM [ADMIN].[dbo].[tblBerProg] INNER JOIN tblMitarbeiter on mit_id= bepr_userId WHERE bepr_programm='" & Me.codename & "' AND [ber_allowed]=1 AND isnull(mit_username,'') <>''ORDER BY mit_username", "ADMIN")
+        Dim dt = sql.loadDgvBySql("SELECT [mit_id],[mit_username],mit_firma, mit_gekuendigt  FROM [ADMIN].[dbo].[tblBerProg] INNER JOIN tblMitarbeiter on mit_id= bepr_userId WHERE bepr_programm='" & Me.codename & "' AND [ber_allowed]=1 AND isnull(mit_username,'') <>''ORDER BY mit_username", "ADMIN")
        f.gdvGruppen.Rows.Clear()

        If dt IsNot Nothing Then
            For Each r In dt.Rows
-                f.gdvGruppen.Rows.Add(r("mit_id"), r("mit_username"))
+                f.gdvGruppen.Rows.Add(r("mit_id"), r("mit_username"), r("mit_firma"), r("mit_gekuendigt"))
            Next
            f.Show()
        Else