neu

2020-03-12 14:47:52 +01:00
parent a6964d7082
commit 3c0d99a279
44 changed files with 8275 additions and 437 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -34,6 +34,7 @@ Partial Class frmMitarbDetails
        Me.TabPage1 = New System.Windows.Forms.TabPage()
        Me.tbcntr = New System.Windows.Forms.TabControl()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
+        Me.cboDPFirma2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboDPFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label50 = New System.Windows.Forms.Label()
        Me.Label38 = New System.Windows.Forms.Label()
@@ -163,7 +164,9 @@ Partial Class frmMitarbDetails
        Me.PictureBox6 = New System.Windows.Forms.PictureBox()
        Me.cboAdminBer = New System.Windows.Forms.ComboBox()
        Me.Label7 = New System.Windows.Forms.Label()
-        Me.cboDPFirma2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboFirmaHaupt = New System.Windows.Forms.ComboBox()
+        Me.Label54 = New System.Windows.Forms.Label()
+        Me.cbxChatBenutzer = New System.Windows.Forms.CheckBox()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -320,6 +323,18 @@ Partial Class frmMitarbDetails
        Me.TabPage2.Text = "Zuordnung Intern"
        Me.TabPage2.UseVisualStyleBackColor = True
        '
+        'cboDPFirma2
+        '
+        Me.cboDPFirma2._allowedValuesFreiText = Nothing
+        Me.cboDPFirma2._allowFreiText = False
+        Me.cboDPFirma2._value = ""
+        Me.cboDPFirma2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboDPFirma2.FormattingEnabled = True
+        Me.cboDPFirma2.Location = New System.Drawing.Point(106, 151)
+        Me.cboDPFirma2.Name = "cboDPFirma2"
+        Me.cboDPFirma2.Size = New System.Drawing.Size(101, 21)
+        Me.cboDPFirma2.TabIndex = 108
+        '
        'cboDPFirma
        '
        Me.cboDPFirma._allowedValuesFreiText = Nothing
@@ -609,6 +624,8 @@ Partial Class frmMitarbDetails
        '
        'GroupBox2
        '
+        Me.GroupBox2.Controls.Add(Me.Label54)
+        Me.GroupBox2.Controls.Add(Me.cboFirmaHaupt)
        Me.GroupBox2.Controls.Add(Me.cboTeam)
        Me.GroupBox2.Controls.Add(Me.Label53)
        Me.GroupBox2.Controls.Add(Me.cboALIASDomain)
@@ -767,7 +784,7 @@ Partial Class frmMitarbDetails
        Me.cboFirma.FormattingEnabled = True
        Me.cboFirma.Location = New System.Drawing.Point(18, 76)
        Me.cboFirma.Name = "cboFirma"
-        Me.cboFirma.Size = New System.Drawing.Size(177, 21)
+        Me.cboFirma.Size = New System.Drawing.Size(114, 21)
        Me.cboFirma.TabIndex = 91
        '
        'Label36
@@ -982,6 +999,7 @@ Partial Class frmMitarbDetails
        '
        'GroupBox1
        '
+        Me.GroupBox1.Controls.Add(Me.cbxChatBenutzer)
        Me.GroupBox1.Controls.Add(Me.cbxTestaccount)
        Me.GroupBox1.Controls.Add(Me.cbxGebDat)
        Me.GroupBox1.Controls.Add(Me.txtGebDat)
@@ -1020,7 +1038,7 @@ Partial Class frmMitarbDetails
        '
        Me.cbxTestaccount.AutoSize = True
        Me.cbxTestaccount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxTestaccount.Location = New System.Drawing.Point(301, 174)
+        Me.cbxTestaccount.Location = New System.Drawing.Point(304, 174)
        Me.cbxTestaccount.Name = "cbxTestaccount"
        Me.cbxTestaccount.Size = New System.Drawing.Size(86, 17)
        Me.cbxTestaccount.TabIndex = 92
@@ -1754,17 +1772,39 @@ Partial Class frmMitarbDetails
        Me.Label7.TabIndex = 78
        Me.Label7.Text = "Berechtigung:"
        '
-        'cboDPFirma2
+        'cboFirmaHaupt
        '
-        Me.cboDPFirma2._allowedValuesFreiText = Nothing
-        Me.cboDPFirma2._allowFreiText = False
-        Me.cboDPFirma2._value = ""
-        Me.cboDPFirma2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboDPFirma2.FormattingEnabled = True
-        Me.cboDPFirma2.Location = New System.Drawing.Point(106, 151)
-        Me.cboDPFirma2.Name = "cboDPFirma2"
-        Me.cboDPFirma2.Size = New System.Drawing.Size(101, 21)
-        Me.cboDPFirma2.TabIndex = 108
+        Me.cboFirmaHaupt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboFirmaHaupt.Enabled = False
+        Me.cboFirmaHaupt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboFirmaHaupt.FormattingEnabled = True
+        Me.cboFirmaHaupt.Location = New System.Drawing.Point(138, 76)
+        Me.cboFirmaHaupt.Name = "cboFirmaHaupt"
+        Me.cboFirmaHaupt.Size = New System.Drawing.Size(57, 21)
+        Me.cboFirmaHaupt.TabIndex = 103
+        '
+        'Label54
+        '
+        Me.Label54.AutoSize = True
+        Me.Label54.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label54.Location = New System.Drawing.Point(135, 60)
+        Me.Label54.Name = "Label54"
+        Me.Label54.Size = New System.Drawing.Size(42, 13)
+        Me.Label54.TabIndex = 104
+        Me.Label54.Text = "Haupt.:"
+        '
+        'cbxChatBenutzer
+        '
+        Me.cbxChatBenutzer.AutoSize = True
+        Me.cbxChatBenutzer.Checked = True
+        Me.cbxChatBenutzer.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxChatBenutzer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxChatBenutzer.Location = New System.Drawing.Point(304, 194)
+        Me.cbxChatBenutzer.Name = "cbxChatBenutzer"
+        Me.cbxChatBenutzer.Size = New System.Drawing.Size(93, 17)
+        Me.cbxChatBenutzer.TabIndex = 93
+        Me.cbxChatBenutzer.Text = "Chat-Benutzer"
+        Me.cbxChatBenutzer.UseVisualStyleBackColor = True
        '
        'frmMitarbDetails
        '
@@ -1949,4 +1989,7 @@ Partial Class frmMitarbDetails
    Friend WithEvents cboTeam As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label53 As Label
    Friend WithEvents cboDPFirma2 As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label54 As Label
+    Friend WithEvents cboFirmaHaupt As ComboBox
+    Friend WithEvents cbxChatBenutzer As CheckBox
 End Class
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -88,6 +88,14 @@
        cboFirma.Items.Add("ALLE")


+        cboFirmaHaupt.Items.Clear()
+        cboFirmaHaupt.Items.Add("VERAG")
+        cboFirmaHaupt.Items.Add("ATILLA")
+        cboFirmaHaupt.Items.Add("IMEX")
+        cboFirmaHaupt.Items.Add("UNISPED")
+        cboFirmaHaupt.Items.Add("AMBAR")
+        cboFirmaHaupt.Items.Add("FRONTOFFICE")
+

        ZOLLDATENBEARB = False

@@ -224,15 +232,18 @@

        If mitarbeiter.mit_firma = "ALL" Then
            cboFirma.Text = "ALLE"
+            cboFirmaHaupt.Text = mitarbeiter.mit_FirmaHaupt
        Else
            cboFirma.Text = mitarbeiter.mit_firma
        End If

+        cbxChatBenutzer.Checked = mitarbeiter.mit_ChatBenutzer
        cboFirmaFMZOLL.changeItem(If(mitarbeiter.mit_firmaFMZoll, ""))

        cboTeam.changeItem(If(mitarbeiter.mit_teamId, ""))


+
        cboKasse.changeItem("")
        If mitarbeiter.mit_FMZollPersID IsNot Nothing Then
            cboKasse.changeItem(SQL.getValueTxtBySql("SELECT [Standard_RKSV_KasseId]  FROM [Personal] WHERE ID='" & mitarbeiter.mit_FMZollPersID & "'", "FMZOLL"))
@@ -461,6 +472,7 @@
        mitarbeiter.mit_teamId = If(cboTeam._value = "", Nothing, cboTeam._value)


+
        If IsNumeric(cboPersonal._value) AndAlso cboPersonal._value > 0 Then
            mitarbeiter.mit_FMZollPersID = cboPersonal._value
        Else
@@ -524,9 +536,11 @@

        If cboFirma.Text = "ALLE" Then
            mitarbeiter.mit_firma = "ALL"
+            mitarbeiter.mit_FirmaHaupt = cboFirmaHaupt.Text
        Else
            mitarbeiter.mit_firma = cboFirma.Text
        End If
+        mitarbeiter.mit_ChatBenutzer = cbxChatBenutzer.Checked

        If cbxEinsteigsDat.Checked Then mitarbeiter.mit_einstiegsdatum = datEinstiegsdatum.Text Else mitarbeiter.mit_einstiegsdatum = ""
        mitarbeiter.mit_gekuendigt = cbxGekuendigt.Checked
@@ -719,6 +733,6 @@
        If cboFirma.Text <> "" Then
            cboTeam.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & cboFirma.Text & "'", False, "ADMIN", True)
        End If
-
+        cboFirmaHaupt.Enabled = (cboFirma.Text = "ALLE")
    End Sub
 End Class