edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-10-02 09:09:16 +02:00
parent 600a5fb8f7 3071728208
commit c402a240c6
10 changed files with 1613 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
UID/Mitarbeiter/frmMitarbDetails.Designer.vb generated
View File

@@ -202,7 +202,7 @@ Partial Class frmMitarbDetails
Me.cboAdminBer = New System.Windows.Forms.ComboBox()
Me.Label7 = New System.Windows.Forms.Label()
Me.TabPage8 = New System.Windows.Forms.TabPage()
Me.cbxClient = New System.Windows.Forms.ComboBox()
Me.cbxClientTimas = New System.Windows.Forms.ComboBox()
Me.cbxTimasMehrereFirmen = New System.Windows.Forms.CheckBox()
Me.clbTimasMehreFirmen = New System.Windows.Forms.CheckedListBox()
Me.lblName1 = New System.Windows.Forms.TextBox()
@@ -2260,7 +2260,7 @@ Partial Class frmMitarbDetails
'
'TabPage8
'
Me.TabPage8.Controls.Add(Me.cbxClient)
Me.TabPage8.Controls.Add(Me.cbxClientTimas)
Me.TabPage8.Controls.Add(Me.cbxTimasMehrereFirmen)
Me.TabPage8.Controls.Add(Me.clbTimasMehreFirmen)
Me.TabPage8.Controls.Add(Me.lblName1)
@@ -2303,16 +2303,17 @@ Partial Class frmMitarbDetails
Me.TabPage8.Text = "Zeiterfassung"
Me.TabPage8.UseVisualStyleBackColor = True
'
'cbxClient
'cbxClientTimas
'
Me.cbxClient.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbxClient.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxClient.FormattingEnabled = True
Me.cbxClient.Items.AddRange(New Object() {"", "1", "2", "3", "4", "5"})
Me.cbxClient.Location = New System.Drawing.Point(253, 144)
Me.cbxClient.Name = "cbxClient"
Me.cbxClient.Size = New System.Drawing.Size(54, 21)
Me.cbxClient.TabIndex = 159
Me.cbxClientTimas.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbxClientTimas.DropDownWidth = 100
Me.cbxClientTimas.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxClientTimas.FormattingEnabled = True
Me.cbxClientTimas.Items.AddRange(New Object() {"", "1", "2", "3", "4", "5"})
Me.cbxClientTimas.Location = New System.Drawing.Point(253, 144)
Me.cbxClientTimas.Name = "cbxClientTimas"
Me.cbxClientTimas.Size = New System.Drawing.Size(54, 21)
Me.cbxClientTimas.TabIndex = 159
'
'cbxTimasMehrereFirmen
'
@@ -2937,7 +2938,7 @@ Partial Class frmMitarbDetails
Friend WithEvents lblName1 As TextBox
Friend WithEvents cbxTimasMehrereFirmen As CheckBox
Friend WithEvents clbTimasMehreFirmen As CheckedListBox
Friend WithEvents cbxClient As ComboBox
Friend WithEvents cbxClientTimas As ComboBox
Friend WithEvents tabParameter As TabPage
Friend WithEvents dgvUserParameter As VERAG_PROG_ALLGEMEIN.MyDatagridview
End Class

24
UID/Mitarbeiter/frmMitarbDetails.vb
View File

@@ -149,15 +149,15 @@ Public Class frmMitarbDetails
clbTimasMehreFirmen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
clbTimasMehreFirmen.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
cbxClient.Items.Clear()
cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FO"))
cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG AG", "VERAG AG"))
cbxClient.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG GMBH", "VERAG GMBH"))
cbxClientTimas.Items.Clear()
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FO"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG AG", "VERAG AG"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG GMBH", "VERAG GMBH"))
cbxClient.SelectedIndex = 0
cbxClientTimas.SelectedIndex = 0
cboFirma.Items.Clear()
@@ -1287,7 +1287,7 @@ Public Class frmMitarbDetails
If checkMandatoryFields() Then
timas.createEmployee(mitarbeiter, rtfInfoTimas.Text, cbxClient.SelectedItem.Text, dtTimas)
timas.createEmployee(mitarbeiter, rtfInfoTimas.Text, cbxClientTimas.SelectedItem.Text, dtTimas)
If rtfInfoTimas.Visible = False AndAlso rtfInfoTimas.Text <> "" Then MsgBox(rtfInfoTimas.Text)
tbcntr_TabIndexChanged(sender, e)
End If
@@ -1309,7 +1309,7 @@ Public Class frmMitarbDetails
btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked
txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked
txtClientNr.Enabled = Not cbxTimasAngelegt.Checked
cbxClient.Enabled = Not cbxTimasAngelegt.Checked
cbxClientTimas.Enabled = Not cbxTimasAngelegt.Checked
dgvData.Visible = Not cbxTimasAngelegt.Checked
rtfInfoTimas.Visible = cbxTimasAngelegt.Checked
btngetInfo.Visible = cbxTimasAngelegt.Checked
@@ -1331,7 +1331,7 @@ Public Class frmMitarbDetails
' Return False
'End If
If cbxClient.SelectedItem.Text = "" Then
If cbxClientTimas.SelectedItem.Text = "" Then
MsgBox("ClientNr prüfen!")
Return False
End If
@@ -1533,7 +1533,7 @@ Public Class frmMitarbDetails
btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked
txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked
txtClientNr.Enabled = Not cbxTimasAngelegt.Checked
cbxClient.Enabled = Not cbxTimasAngelegt.Checked
cbxClientTimas.Enabled = Not cbxTimasAngelegt.Checked
dgvData.Visible = Not cbxTimasAngelegt.Checked
TabControl3.Visible = Not cbxTimasAngelegt.Checked
rtfInfoTimas.Visible = cbxTimasAngelegt.Checked