diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb index f8b82fd..ea5fd22 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb @@ -77,6 +77,8 @@ Partial Class frmMitarbDetails Me.txtCSUser = New System.Windows.Forms.TextBox() Me.Label59 = New System.Windows.Forms.Label() Me.TabPage6 = New System.Windows.Forms.TabPage() + Me.Label63 = New System.Windows.Forms.Label() + Me.txtClientNr = New System.Windows.Forms.TextBox() Me.btnDelete = New System.Windows.Forms.Button() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.rtfInfoTimas = New System.Windows.Forms.RichTextBox() @@ -89,6 +91,15 @@ Partial Class frmMitarbDetails Me.lbSprachen = New VERAG_PROG_ALLGEMEIN.MyListBox() Me.Label4 = New System.Windows.Forms.Label() Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.cboDaysPerWeek = New System.Windows.Forms.ComboBox() + Me.lblTage = New System.Windows.Forms.Label() + Me.Label67 = New System.Windows.Forms.Label() + Me.txtWoStd = New System.Windows.Forms.TextBox() + Me.Label66 = New System.Windows.Forms.Label() + Me.txtaliquUA = New System.Windows.Forms.TextBox() + Me.txtUrlaubsabsp = New System.Windows.Forms.TextBox() + Me.Label65 = New System.Windows.Forms.Label() + Me.cbUrlaubInStund = New System.Windows.Forms.CheckBox() Me.txtTelNr = New System.Windows.Forms.TextBox() Me.btnUpdateAD = New System.Windows.Forms.Button() Me.txtEmailExtension = New System.Windows.Forms.TextBox() @@ -134,6 +145,8 @@ Partial Class frmMitarbDetails Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label9 = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.txtprivateEMail = New System.Windows.Forms.TextBox() + Me.Label64 = New System.Windows.Forms.Label() Me.cbxHO = New System.Windows.Forms.CheckBox() Me.cbxChatBenutzer = New System.Windows.Forms.CheckBox() Me.cbxTestaccount = New System.Windows.Forms.CheckBox() @@ -208,6 +221,9 @@ Partial Class frmMitarbDetails Me.cboAdminBer = New System.Windows.Forms.ComboBox() Me.Label7 = New System.Windows.Forms.Label() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.lblHoursOrDays1 = New System.Windows.Forms.Label() + Me.lblHoursOrDays2 = New System.Windows.Forms.Label() + Me.cbabwJahresurlaub = New System.Windows.Forms.CheckBox() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.TabControl2.SuspendLayout() @@ -832,6 +848,8 @@ Partial Class frmMitarbDetails ' 'TabPage6 ' + Me.TabPage6.Controls.Add(Me.Label63) + Me.TabPage6.Controls.Add(Me.txtClientNr) Me.TabPage6.Controls.Add(Me.btnDelete) Me.TabPage6.Controls.Add(Me.TabControl1) Me.TabPage6.Controls.Add(Me.rtfInfoTimas) @@ -847,6 +865,23 @@ Partial Class frmMitarbDetails Me.TabPage6.Text = "Zeiterfassung" Me.TabPage6.UseVisualStyleBackColor = True ' + 'Label63 + ' + Me.Label63.AutoSize = True + Me.Label63.Location = New System.Drawing.Point(232, 7) + Me.Label63.Name = "Label63" + Me.Label63.Size = New System.Drawing.Size(12, 13) + Me.Label63.TabIndex = 125 + Me.Label63.Text = "/" + ' + 'txtClientNr + ' + Me.txtClientNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtClientNr.Location = New System.Drawing.Point(248, 3) + Me.txtClientNr.Name = "txtClientNr" + Me.txtClientNr.Size = New System.Drawing.Size(56, 20) + Me.txtClientNr.TabIndex = 124 + ' 'btnDelete ' Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -895,9 +930,9 @@ Partial Class frmMitarbDetails Me.cbxTimasAngelegt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cbxTimasAngelegt.Location = New System.Drawing.Point(2, 5) Me.cbxTimasAngelegt.Name = "cbxTimasAngelegt" - Me.cbxTimasAngelegt.Size = New System.Drawing.Size(181, 17) + Me.cbxTimasAngelegt.Size = New System.Drawing.Size(157, 17) Me.cbxTimasAngelegt.TabIndex = 116 - Me.cbxTimasAngelegt.Text = "Account - PersonalNr (Lohnverr.)" + Me.cbxTimasAngelegt.Text = "Account - PNr (Lohn)/Client" Me.cbxTimasAngelegt.UseVisualStyleBackColor = True ' 'txtLohnNr @@ -905,7 +940,7 @@ Partial Class frmMitarbDetails Me.txtLohnNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtLohnNr.Location = New System.Drawing.Point(189, 3) Me.txtLohnNr.Name = "txtLohnNr" - Me.txtLohnNr.Size = New System.Drawing.Size(47, 20) + Me.txtLohnNr.Size = New System.Drawing.Size(37, 20) Me.txtLohnNr.TabIndex = 114 ' 'btnMAanlegen @@ -963,6 +998,18 @@ Partial Class frmMitarbDetails ' 'GroupBox2 ' + Me.GroupBox2.Controls.Add(Me.cbabwJahresurlaub) + Me.GroupBox2.Controls.Add(Me.lblHoursOrDays2) + Me.GroupBox2.Controls.Add(Me.lblHoursOrDays1) + Me.GroupBox2.Controls.Add(Me.cboDaysPerWeek) + Me.GroupBox2.Controls.Add(Me.lblTage) + Me.GroupBox2.Controls.Add(Me.Label67) + Me.GroupBox2.Controls.Add(Me.txtWoStd) + Me.GroupBox2.Controls.Add(Me.Label66) + Me.GroupBox2.Controls.Add(Me.txtaliquUA) + Me.GroupBox2.Controls.Add(Me.txtUrlaubsabsp) + Me.GroupBox2.Controls.Add(Me.Label65) + Me.GroupBox2.Controls.Add(Me.cbUrlaubInStund) Me.GroupBox2.Controls.Add(Me.txtTelNr) Me.GroupBox2.Controls.Add(Me.btnUpdateAD) Me.GroupBox2.Controls.Add(Me.txtEmailExtension) @@ -1015,6 +1062,90 @@ Partial Class frmMitarbDetails Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Firmendaten" ' + 'cboDaysPerWeek + ' + Me.cboDaysPerWeek.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboDaysPerWeek.FormattingEnabled = True + Me.cboDaysPerWeek.Items.AddRange(New Object() {"", "1", "2", "3", "4", "5"}) + Me.cboDaysPerWeek.Location = New System.Drawing.Point(406, 254) + Me.cboDaysPerWeek.Name = "cboDaysPerWeek" + Me.cboDaysPerWeek.Size = New System.Drawing.Size(47, 21) + Me.cboDaysPerWeek.TabIndex = 119 + ' + 'lblTage + ' + Me.lblTage.AutoSize = True + Me.lblTage.Location = New System.Drawing.Point(324, 262) + Me.lblTage.Name = "lblTage" + Me.lblTage.Size = New System.Drawing.Size(77, 13) + Me.lblTage.TabIndex = 117 + Me.lblTage.Text = "Tagewoche:" + ' + 'Label67 + ' + Me.Label67.AutoSize = True + Me.Label67.Location = New System.Drawing.Point(324, 239) + Me.Label67.Name = "Label67" + Me.Label67.Size = New System.Drawing.Size(77, 13) + Me.Label67.TabIndex = 116 + Me.Label67.Text = "WochenStd:" + ' + 'txtWoStd + ' + Me.txtWoStd.Location = New System.Drawing.Point(402, 232) + Me.txtWoStd.Name = "txtWoStd" + Me.txtWoStd.Size = New System.Drawing.Size(51, 20) + Me.txtWoStd.TabIndex = 118 + ' + 'Label66 + ' + Me.Label66.AutoSize = True + Me.Label66.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label66.Location = New System.Drawing.Point(580, 261) + Me.Label66.Name = "Label66" + Me.Label66.Size = New System.Drawing.Size(72, 13) + Me.Label66.TabIndex = 115 + Me.Label66.Text = "aliqu. Urlaub.:" + ' + 'txtaliquUA + ' + Me.txtaliquUA.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtaliquUA.Location = New System.Drawing.Point(658, 258) + Me.txtaliquUA.Name = "txtaliquUA" + Me.txtaliquUA.Size = New System.Drawing.Size(34, 20) + Me.txtaliquUA.TabIndex = 114 + Me.txtaliquUA.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtUrlaubsabsp + ' + Me.txtUrlaubsabsp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtUrlaubsabsp.Location = New System.Drawing.Point(656, 232) + Me.txtUrlaubsabsp.Name = "txtUrlaubsabsp" + Me.txtUrlaubsabsp.Size = New System.Drawing.Size(35, 20) + Me.txtUrlaubsabsp.TabIndex = 97 + Me.txtUrlaubsabsp.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label65 + ' + Me.Label65.AutoSize = True + Me.Label65.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label65.Location = New System.Drawing.Point(580, 238) + Me.Label65.Name = "Label65" + Me.Label65.Size = New System.Drawing.Size(70, 13) + Me.Label65.TabIndex = 98 + Me.Label65.Text = "Jahresanspr.:" + ' + 'cbUrlaubInStund + ' + Me.cbUrlaubInStund.AutoSize = True + Me.cbUrlaubInStund.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbUrlaubInStund.Location = New System.Drawing.Point(462, 258) + Me.cbUrlaubInStund.Name = "cbUrlaubInStund" + Me.cbUrlaubInStund.Size = New System.Drawing.Size(100, 17) + Me.cbUrlaubInStund.TabIndex = 97 + Me.cbUrlaubInStund.Text = "Urlaub in Std" + Me.cbUrlaubInStund.UseVisualStyleBackColor = True + ' 'txtTelNr ' Me.txtTelNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -1469,6 +1600,8 @@ Partial Class frmMitarbDetails ' 'GroupBox1 ' + Me.GroupBox1.Controls.Add(Me.txtprivateEMail) + Me.GroupBox1.Controls.Add(Me.Label64) Me.GroupBox1.Controls.Add(Me.cbxHO) Me.GroupBox1.Controls.Add(Me.cbxChatBenutzer) Me.GroupBox1.Controls.Add(Me.cbxTestaccount) @@ -1505,11 +1638,29 @@ Partial Class frmMitarbDetails Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Person" ' + 'txtprivateEMail + ' + Me.txtprivateEMail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtprivateEMail.Location = New System.Drawing.Point(304, 155) + Me.txtprivateEMail.Name = "txtprivateEMail" + Me.txtprivateEMail.Size = New System.Drawing.Size(175, 20) + Me.txtprivateEMail.TabIndex = 95 + ' + 'Label64 + ' + Me.Label64.AutoSize = True + Me.Label64.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label64.Location = New System.Drawing.Point(301, 139) + Me.Label64.Name = "Label64" + Me.Label64.Size = New System.Drawing.Size(141, 13) + Me.Label64.TabIndex = 96 + Me.Label64.Text = "private EMail (für ZE-Daten):" + ' 'cbxHO ' Me.cbxHO.AutoSize = True Me.cbxHO.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxHO.Location = New System.Drawing.Point(304, 199) + Me.cbxHO.Location = New System.Drawing.Point(295, 202) Me.cbxHO.Name = "cbxHO" Me.cbxHO.Size = New System.Drawing.Size(80, 17) Me.cbxHO.TabIndex = 94 @@ -1522,7 +1673,7 @@ Partial Class frmMitarbDetails 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, 179) + Me.cbxChatBenutzer.Location = New System.Drawing.Point(295, 182) Me.cbxChatBenutzer.Name = "cbxChatBenutzer" Me.cbxChatBenutzer.Size = New System.Drawing.Size(93, 17) Me.cbxChatBenutzer.TabIndex = 93 @@ -1533,7 +1684,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(304, 159) + Me.cbxTestaccount.Location = New System.Drawing.Point(389, 199) Me.cbxTestaccount.Name = "cbxTestaccount" Me.cbxTestaccount.Size = New System.Drawing.Size(86, 17) Me.cbxTestaccount.TabIndex = 92 @@ -1574,7 +1725,7 @@ Partial Class frmMitarbDetails ' Me.cbxAnrufen.AutoSize = True Me.cbxAnrufen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxAnrufen.Location = New System.Drawing.Point(304, 142) + Me.cbxAnrufen.Location = New System.Drawing.Point(389, 182) Me.cbxAnrufen.Name = "cbxAnrufen" Me.cbxAnrufen.Size = New System.Drawing.Size(133, 17) Me.cbxAnrufen.TabIndex = 9 @@ -2299,6 +2450,37 @@ Partial Class frmMitarbDetails Me.ContextMenuStrip1.Name = "ContextMenuStrip1" Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) ' + 'lblHoursOrDays1 + ' + Me.lblHoursOrDays1.AutoSize = True + Me.lblHoursOrDays1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblHoursOrDays1.Location = New System.Drawing.Point(695, 238) + Me.lblHoursOrDays1.Name = "lblHoursOrDays1" + Me.lblHoursOrDays1.Size = New System.Drawing.Size(0, 13) + Me.lblHoursOrDays1.TabIndex = 120 + Me.lblHoursOrDays1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'lblHoursOrDays2 + ' + Me.lblHoursOrDays2.AutoSize = True + Me.lblHoursOrDays2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblHoursOrDays2.Location = New System.Drawing.Point(695, 262) + Me.lblHoursOrDays2.Name = "lblHoursOrDays2" + Me.lblHoursOrDays2.Size = New System.Drawing.Size(0, 13) + Me.lblHoursOrDays2.TabIndex = 121 + Me.lblHoursOrDays2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'cbabwJahresurlaub + ' + Me.cbabwJahresurlaub.AutoSize = True + Me.cbabwJahresurlaub.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbabwJahresurlaub.Location = New System.Drawing.Point(462, 232) + Me.cbabwJahresurlaub.Name = "cbabwJahresurlaub" + Me.cbabwJahresurlaub.Size = New System.Drawing.Size(86, 17) + Me.cbabwJahresurlaub.TabIndex = 122 + Me.cbabwJahresurlaub.Text = "abw.JahrU" + Me.cbabwJahresurlaub.UseVisualStyleBackColor = True + ' 'frmMitarbDetails ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2531,4 +2713,20 @@ Partial Class frmMitarbDetails Friend WithEvents Label62 As Label Friend WithEvents cboEZOLL_SB_UNISPED As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cbxHO As CheckBox + Friend WithEvents Label63 As Label + Friend WithEvents txtClientNr As TextBox + Friend WithEvents txtprivateEMail As TextBox + Friend WithEvents Label64 As Label + Friend WithEvents Label66 As Label + Friend WithEvents txtaliquUA As TextBox + Friend WithEvents txtUrlaubsabsp As TextBox + Friend WithEvents Label65 As Label + Friend WithEvents cbUrlaubInStund As CheckBox + Friend WithEvents cboDaysPerWeek As ComboBox + Friend WithEvents lblTage As Label + Friend WithEvents Label67 As Label + Friend WithEvents txtWoStd As TextBox + Friend WithEvents lblHoursOrDays2 As Label + Friend WithEvents lblHoursOrDays1 As Label + Friend WithEvents cbabwJahresurlaub As CheckBox End Class diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 53cf3a1..212c1a7 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -1185,7 +1185,7 @@ Public Class frmMitarbDetails If checkMandatoryFields() Then - timas.createEmployee(mitarbeiter, rtfInfoTimas.Text, dtTimas) + timas.createEmployee(mitarbeiter, rtfInfoTimas.Text, txtClientNr.Text, dtTimas) If rtfInfoTimas.Visible = False AndAlso rtfInfoTimas.Text <> "" Then MsgBox(rtfInfoTimas.Text) tbcntr_TabIndexChanged(sender, e) End If @@ -1221,6 +1221,11 @@ Public Class frmMitarbDetails Return False End If + If txtLohnNr.Text = "" AndAlso txtClientNr.Text = "" Then + MsgBox("LohnNr und ClientNr prüfen!") + Return False + End If + If CDate(mitarbeiter.mit_einstiegsdatum).ToShortDateString <= DateTime.Parse("01/01/2000") Then MsgBox("Einstiegsdatum darf nicht vor 01.01.2000 liegen!") Return False @@ -1247,23 +1252,6 @@ Public Class frmMitarbDetails Sub initDGV(dt As DataTable) - 'dgvData.DataSource = dt - - 'If dgvData.Columns.Count > 0 Then - ' With dgvData - ' .RowHeadersWidth = 10 - ' .Columns("id").Visible = False - ' .Columns("groupType").Visible = False - ' .Columns("name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - ' .Columns("info").Width = 200 - ' .Columns("set").Width = 20 - ' .Columns("set").HeaderText = "X" - - ' End With - - 'End If - - If dtTimas.Columns.Count > 0 Then If TabControl1.TabCount = 0 Then @@ -1341,5 +1329,71 @@ Public Class frmMitarbDetails End If End Sub + + + + Private Sub datEinstiegsdatum_ValueChanged(sender As Object, e As EventArgs) Handles datEinstiegsdatum.ValueChanged, cbUrlaubInStund.CheckedChanged, txtUrlaubsabsp.TextChanged + + If cbxEinsteigsDat.Checked And mitarbeiter.mit_einstiegsdatum <> "" Then + + If CDate(mitarbeiter.mit_einstiegsdatum).ToShortDateString >= DateTime.Parse("01/01/2000") Then + + + If txtWoStd.Text <> "" AndAlso IsNumeric(txtWoStd.Text) AndAlso cboDaysPerWeek.Text <> "" AndAlso IsNumeric(cboDaysPerWeek.Text) Then + Dim einstiegsdat As Date = CDate(mitarbeiter.mit_einstiegsdatum) + Dim endOfCurrentYear = New DateTime(einstiegsdat.Year, 12, 31) + Dim span = endOfCurrentYear - einstiegsdat + + Dim days As Double = span.TotalDays + Dim uansp As Double = 0 + Dim aliquU As Double = 0 + If IsNumeric(txtUrlaubsabsp.Text) Then uansp = txtUrlaubsabsp.Text + + If days > 0 AndAlso uansp > 0 Then + calcUrlaubsabspruch(cbUrlaubInStund.Checked) + If Not cbUrlaubInStund.Checked Then + aliquU = Math.Round((uansp / 365) * span.TotalDays, 2, MidpointRounding.AwayFromZero) + txtaliquUA.Text = aliquU + lblHoursOrDays2.Text = "D" + Else + aliquU = Math.Round((uansp / 365) * span.TotalDays, 2, MidpointRounding.AwayFromZero) + txtaliquUA.Text = aliquU + lblHoursOrDays2.Text = "H" + End If + + + End If + + + End If + End If + + End If + End Sub + + Private Sub cboDaysPerWeek_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboDaysPerWeek.SelectedIndexChanged + + calcUrlaubsabspruch(cbUrlaubInStund.Checked) + + End Sub + + Private Sub calcUrlaubsabspruch(UrlaubInStunden As Boolean) + If Not UrlaubInStunden Then + If cboDaysPerWeek.SelectedItem <> "" Then + If Not cbabwJahresurlaub.Checked Then + txtUrlaubsabsp.Text = 5 * cboDaysPerWeek.SelectedItem + End If + lblHoursOrDays1.Text = "D" + End If + Else + If cboDaysPerWeek.SelectedItem <> "" AndAlso IsNumeric(txtWoStd.Text) AndAlso txtWoStd.Text > 0 Then + If Not cbabwJahresurlaub.Checked Then + txtUrlaubsabsp.Text = (txtWoStd.Text / cboDaysPerWeek.SelectedItem) * cboDaysPerWeek.SelectedItem * 5 + End If + lblHoursOrDays1.Text = "H" + End If + End If + + End Sub End Class diff --git a/UID/Mitarbeiter/frmMitarbTimas.Designer.vb b/UID/Mitarbeiter/frmMitarbTimas.Designer.vb index 7f6c51d..9d9d25f 100644 --- a/UID/Mitarbeiter/frmMitarbTimas.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbTimas.Designer.vb @@ -33,6 +33,7 @@ Partial Class frmMitarbTimas Me.btnOK = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.Button1 = New System.Windows.Forms.Button() Me.txtLohn = New System.Windows.Forms.TextBox() Me.lblLohnNr = New System.Windows.Forms.Label() Me.cbxAccount = New System.Windows.Forms.CheckBox() @@ -78,7 +79,8 @@ Partial Class frmMitarbTimas Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.TabControl1 = New System.Windows.Forms.TabControl() - Me.Button1 = New System.Windows.Forms.Button() + Me.txtMandantenNr = New System.Windows.Forms.TextBox() + Me.Label4 = New System.Windows.Forms.Label() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.GroupBox2.SuspendLayout() @@ -174,6 +176,8 @@ Partial Class frmMitarbTimas ' 'GroupBox2 ' + Me.GroupBox2.Controls.Add(Me.txtMandantenNr) + Me.GroupBox2.Controls.Add(Me.Label4) Me.GroupBox2.Controls.Add(Me.Button1) Me.GroupBox2.Controls.Add(Me.txtLohn) Me.GroupBox2.Controls.Add(Me.lblLohnNr) @@ -206,12 +210,24 @@ Partial Class frmMitarbTimas Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Timas - User" ' + 'Button1 + ' + Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button1.BackColor = System.Drawing.Color.White + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Location = New System.Drawing.Point(418, 15) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(128, 23) + Me.Button1.TabIndex = 88 + Me.Button1.Text = "aus AVISO laden" + Me.Button1.UseVisualStyleBackColor = False + ' 'txtLohn ' Me.txtLohn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtLohn.Location = New System.Drawing.Point(207, 141) Me.txtLohn.Name = "txtLohn" - Me.txtLohn.Size = New System.Drawing.Size(179, 20) + Me.txtLohn.Size = New System.Drawing.Size(110, 20) Me.txtLohn.TabIndex = 127 ' 'lblLohnNr @@ -240,7 +256,7 @@ Partial Class frmMitarbTimas Me.TextBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextBox2.Location = New System.Drawing.Point(16, 96) Me.TextBox2.Name = "TextBox2" - Me.TextBox2.Size = New System.Drawing.Size(179, 20) + Me.TextBox2.Size = New System.Drawing.Size(96, 20) Me.TextBox2.TabIndex = 124 ' 'Label7 @@ -256,16 +272,16 @@ Partial Class frmMitarbTimas 'txtCard ' Me.txtCard.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtCard.Location = New System.Drawing.Point(205, 96) + Me.txtCard.Location = New System.Drawing.Point(121, 96) Me.txtCard.Name = "txtCard" - Me.txtCard.Size = New System.Drawing.Size(179, 20) + Me.txtCard.Size = New System.Drawing.Size(96, 20) Me.txtCard.TabIndex = 122 ' 'lblCard ' Me.lblCard.AutoSize = True Me.lblCard.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblCard.Location = New System.Drawing.Point(202, 80) + Me.lblCard.Location = New System.Drawing.Point(118, 80) Me.lblCard.Name = "lblCard" Me.lblCard.Size = New System.Drawing.Size(55, 13) Me.lblCard.TabIndex = 123 @@ -654,17 +670,23 @@ Partial Class frmMitarbTimas Me.TabControl1.Size = New System.Drawing.Size(546, 242) Me.TabControl1.TabIndex = 123 ' - 'Button1 + 'txtMandantenNr ' - Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Button1.BackColor = System.Drawing.Color.White - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(418, 15) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(128, 23) - Me.Button1.TabIndex = 88 - Me.Button1.Text = "aus AVISO laden" - Me.Button1.UseVisualStyleBackColor = False + Me.txtMandantenNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtMandantenNr.Location = New System.Drawing.Point(226, 96) + Me.txtMandantenNr.Name = "txtMandantenNr" + Me.txtMandantenNr.Size = New System.Drawing.Size(91, 20) + Me.txtMandantenNr.TabIndex = 129 + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label4.Location = New System.Drawing.Point(223, 80) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(78, 13) + Me.Label4.TabIndex = 130 + Me.Label4.Text = "Mandanten-Nr:" ' 'frmMitarbTimas ' @@ -749,4 +771,6 @@ Partial Class frmMitarbTimas Friend WithEvents TabControl1 As TabControl Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents Button1 As Button + Friend WithEvents txtMandantenNr As TextBox + Friend WithEvents Label4 As Label End Class diff --git a/UID/Mitarbeiter/frmMitarbTimas.vb b/UID/Mitarbeiter/frmMitarbTimas.vb index 2a4bf40..b072518 100644 --- a/UID/Mitarbeiter/frmMitarbTimas.vb +++ b/UID/Mitarbeiter/frmMitarbTimas.vb @@ -1,22 +1,4 @@  -Imports System.DirectoryServices -Imports System.Globalization -Imports System.IO -Imports System.Net -Imports System.Net.Http -Imports System.Net.WebRequestMethods -Imports System.Security.Cryptography -Imports System.Security.Policy -Imports System.Text -Imports System.Text.RegularExpressions -Imports System.Windows -Imports System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel -Imports DAKOSY_Worker.DEERRE -Imports DocumentFormat.OpenXml.Spreadsheet -Imports GrapeCity.ActiveReports.ReportsCore.Tools -Imports itextsharp.text.pdf.codec.wmf -Imports Microsoft.VisualBasic.ApplicationServices -Imports Newtonsoft.Json Imports VERAG_PROG_ALLGEMEIN Public Class frmMitarbTimas @@ -91,6 +73,7 @@ Public Class frmMitarbTimas txtTelNr.Text = emp.phone1 txtEmail.Text = emp.email txtMobiltel.Text = emp.phone2 + txtMandantenNr.Text = emp.clientNumber 'txtPersonalNr.Text = emp.pnr1 @@ -152,6 +135,7 @@ Public Class frmMitarbTimas emp.phone2 = txtMobiltel.Text emp.info = txtInfo.Text emp.card = txtCard.Text + emp.clientNumber = txtMandantenNr.Text If cbxEinsteigsDat.Checked Then emp.entryDate = datEinstiegsdatum.Text Else emp.entryDate = "null" diff --git a/initATLASAufschubkonten/cAsfinag.vb b/initATLASAufschubkonten/cAsfinag.vb index 5bf7c15..948f02b 100644 --- a/initATLASAufschubkonten/cAsfinag.vb +++ b/initATLASAufschubkonten/cAsfinag.vb @@ -1056,7 +1056,7 @@ Public Class cAsfinag FTP_PFAD = cAsfinag.Paramter.GET_PARAM_ByName("SERVER_Path_Out", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) If Not IO.Directory.Exists(VERARBEITUNG_PFAD) Then IO.Directory.CreateDirectory(VERARBEITUNG_PFAD) - If Not IO.Directory.Exists(FTP_PFAD_TEST) Then IO.Directory.CreateDirectory(FTP_PFAD_TEST) + 'If Not IO.Directory.Exists(FTP_PFAD_TEST) Then IO.Directory.CreateDirectory(FTP_PFAD_TEST) End Function diff --git a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb index 33346a6..e8fda72 100644 --- a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb @@ -230,6 +230,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung End If End Sub + Private Sub pnl_Paint(sender As Object, e As PaintEventArgs) Handles pnl.Paint End Sub diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index f6ad977..1b602e9 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -498,10 +498,10 @@ Public Class frmStartOptions Dim autoclose As Boolean = True Dim testFTP As Boolean = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Dim fmCLF As New frmAsfinag_NachrichtenVerabeitung("CLF", testFTP, autoclose) - fmCLF.Show() + fmCLF.ShowDialog() AddHandler fmCLF.FormClosed, AddressOf closeMe Dim fmTTR As New frmAsfinag_NachrichtenVerabeitung("TTR", testFTP, autoclose) - fmTTR.Show() + fmTTR.ShowDialog() AddHandler fmTTR.FormClosed, AddressOf closeMe closeMe()