This commit is contained in:
2019-11-26 14:42:17 +01:00
parent d4dfcd1744
commit de1d935624
13 changed files with 450 additions and 78 deletions

View File

@@ -161,6 +161,8 @@ 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.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label53 = New System.Windows.Forms.Label()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.TabControl2.SuspendLayout()
@@ -605,6 +607,8 @@ Partial Class frmMitarbDetails
'
'GroupBox2
'
Me.GroupBox2.Controls.Add(Me.cboTeam)
Me.GroupBox2.Controls.Add(Me.Label53)
Me.GroupBox2.Controls.Add(Me.cboALIASDomain)
Me.GroupBox2.Controls.Add(Me.txtALIASUser)
Me.GroupBox2.Controls.Add(Me.Label52)
@@ -785,7 +789,7 @@ Partial Class frmMitarbDetails
Me.cboPosition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboPosition.FormattingEnabled = True
Me.cboPosition.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
Me.cboPosition.Location = New System.Drawing.Point(409, 116)
Me.cboPosition.Location = New System.Drawing.Point(406, 76)
Me.cboPosition.Name = "cboPosition"
Me.cboPosition.Size = New System.Drawing.Size(136, 21)
Me.cboPosition.TabIndex = 5
@@ -794,7 +798,7 @@ Partial Class frmMitarbDetails
'
Me.Label29.AutoSize = True
Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label29.Location = New System.Drawing.Point(406, 100)
Me.Label29.Location = New System.Drawing.Point(403, 60)
Me.Label29.Name = "Label29"
Me.Label29.Size = New System.Drawing.Size(47, 13)
Me.Label29.TabIndex = 87
@@ -1724,6 +1728,30 @@ Partial Class frmMitarbDetails
Me.Label7.TabIndex = 78
Me.Label7.Text = "Berechtigung:"
'
'cboTeam
'
Me.cboTeam._allowedValuesFreiText = Nothing
Me.cboTeam._allowFreiText = False
Me.cboTeam._value = ""
Me.cboTeam.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboTeam.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboTeam.FormattingEnabled = True
Me.cboTeam.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
Me.cboTeam.Location = New System.Drawing.Point(406, 116)
Me.cboTeam.Name = "cboTeam"
Me.cboTeam.Size = New System.Drawing.Size(136, 21)
Me.cboTeam.TabIndex = 101
'
'Label53
'
Me.Label53.AutoSize = True
Me.Label53.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label53.Location = New System.Drawing.Point(403, 100)
Me.Label53.Name = "Label53"
Me.Label53.Size = New System.Drawing.Size(37, 13)
Me.Label53.TabIndex = 102
Me.Label53.Text = "Team:"
'
'frmMitarbDetails
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1904,4 +1932,6 @@ Partial Class frmMitarbDetails
Friend WithEvents cboALIASDomain As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents txtALIASUser As TextBox
Friend WithEvents Label52 As Label
Friend WithEvents cboTeam As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Label53 As Label
End Class

View File

@@ -44,6 +44,7 @@
cboDP.fillWithSQL("SELECT [dpset_niederlassung] FROM [tblDienstSettings] ORDER BY dpset_niederlassung", False, "ADMIN", True)
MyListBox1.fillWithSQL("SELECT [Firma_ID],[Firma_Bez] FROM [VERAG].[dbo].[tblFirma]", False, "FMZOLL")
MyListBox1.Items.Insert(0, New VERAG_PROG_ALLGEMEIN.MyListItem("Alle", "A"))
@@ -210,7 +211,6 @@
txtALIASUser.Text = mitarbeiter.mit_AliasAD_Username
If mitarbeiter.mit_firma = "ALL" Then
cboFirma.Text = "ALLE"
Else
@@ -219,6 +219,9 @@
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"))
@@ -443,6 +446,7 @@
mitarbeiter.mit_TELOTEC_SB = txtTelotecSB.Text
mitarbeiter.mit_AliasAD_Domain = cboALIASDomain._value
mitarbeiter.mit_AliasAD_Username = txtALIASUser.Text
mitarbeiter.mit_teamId = If(cboTeam._value = "", Nothing, cboTeam._value)
If IsNumeric(cboPersonal._value) AndAlso cboPersonal._value > 0 Then
@@ -697,4 +701,11 @@
End If
End Sub
Private Sub cboFirma_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged
cboTeam.Items.Clear()
If cboFirma.Text <> "" Then
cboTeam.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & cboFirma.Text & "'", False, "ADMIN", True)
End If
End Sub
End Class