Mitarbeiter, MDM-SummenBerechnen

This commit is contained in:
2024-10-31 16:14:32 +01:00
parent c7af2878d6
commit 769cac91a9
6 changed files with 706 additions and 624 deletions

View File

@@ -200,6 +200,9 @@ 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.cbxTimasNichtStempeln1 = New System.Windows.Forms.CheckBox()
Me.cbxBeiBeendenAusstempeln = New System.Windows.Forms.CheckBox()
Me.cbxHO = New System.Windows.Forms.CheckBox()
Me.Button7 = New System.Windows.Forms.Button()
Me.TabControl3 = New System.Windows.Forms.TabControl()
Me.rtfInfoTimas = New System.Windows.Forms.RichTextBox()
@@ -213,7 +216,6 @@ Partial Class frmMitarbDetails
Me.btnMAanlegen = New System.Windows.Forms.Button()
Me.lblEintrittsdatum = New System.Windows.Forms.Label()
Me.Label70 = New System.Windows.Forms.Label()
Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Label69 = New System.Windows.Forms.Label()
Me.Label68 = New System.Windows.Forms.Label()
Me.cbabwJahresurlaub = New System.Windows.Forms.CheckBox()
@@ -230,9 +232,8 @@ Partial Class frmMitarbDetails
Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Label66 = New System.Windows.Forms.Label()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.cbxHO = New System.Windows.Forms.CheckBox()
Me.cbxBeiBeendenAusstempeln = New System.Windows.Forms.CheckBox()
Me.cbxTimasNichtStempeln1 = New System.Windows.Forms.CheckBox()
Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.lblName1 = New System.Windows.Forms.TextBox()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.TabControl2.SuspendLayout()
@@ -254,8 +255,8 @@ Partial Class frmMitarbDetails
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage8.SuspendLayout()
CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'PictureBox1
@@ -2230,6 +2231,8 @@ Partial Class frmMitarbDetails
'
'TabPage8
'
Me.TabPage8.Controls.Add(Me.lblName1)
Me.TabPage8.Controls.Add(Me.dgvUberstundenauszahlungen)
Me.TabPage8.Controls.Add(Me.cbxTimasNichtStempeln1)
Me.TabPage8.Controls.Add(Me.cbxBeiBeendenAusstempeln)
Me.TabPage8.Controls.Add(Me.cbxHO)
@@ -2246,7 +2249,6 @@ Partial Class frmMitarbDetails
Me.TabPage8.Controls.Add(Me.btnMAanlegen)
Me.TabPage8.Controls.Add(Me.lblEintrittsdatum)
Me.TabPage8.Controls.Add(Me.Label70)
Me.TabPage8.Controls.Add(Me.dgvUberstundenauszahlungen)
Me.TabPage8.Controls.Add(Me.Label69)
Me.TabPage8.Controls.Add(Me.Label68)
Me.TabPage8.Controls.Add(Me.cbabwJahresurlaub)
@@ -2269,6 +2271,39 @@ Partial Class frmMitarbDetails
Me.TabPage8.Text = "Zeiterfassung"
Me.TabPage8.UseVisualStyleBackColor = True
'
'cbxTimasNichtStempeln1
'
Me.cbxTimasNichtStempeln1.AutoSize = True
Me.cbxTimasNichtStempeln1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxTimasNichtStempeln1.Location = New System.Drawing.Point(569, 55)
Me.cbxTimasNichtStempeln1.Name = "cbxTimasNichtStempeln1"
Me.cbxTimasNichtStempeln1.Size = New System.Drawing.Size(164, 17)
Me.cbxTimasNichtStempeln1.TabIndex = 153
Me.cbxTimasNichtStempeln1.Text = "Zeiterfassung: Kein Stempeln"
Me.cbxTimasNichtStempeln1.UseVisualStyleBackColor = True
'
'cbxBeiBeendenAusstempeln
'
Me.cbxBeiBeendenAusstempeln.AutoSize = True
Me.cbxBeiBeendenAusstempeln.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxBeiBeendenAusstempeln.Location = New System.Drawing.Point(569, 32)
Me.cbxBeiBeendenAusstempeln.Name = "cbxBeiBeendenAusstempeln"
Me.cbxBeiBeendenAusstempeln.Size = New System.Drawing.Size(144, 17)
Me.cbxBeiBeendenAusstempeln.TabIndex = 152
Me.cbxBeiBeendenAusstempeln.Text = "Bei Beenden austempeln"
Me.cbxBeiBeendenAusstempeln.UseVisualStyleBackColor = True
'
'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(569, 9)
Me.cbxHO.Name = "cbxHO"
Me.cbxHO.Size = New System.Drawing.Size(80, 17)
Me.cbxHO.TabIndex = 151
Me.cbxHO.Text = "Homeoffice"
Me.cbxHO.UseVisualStyleBackColor = True
'
'Button7
'
Me.Button7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
@@ -2400,21 +2435,6 @@ Partial Class frmMitarbDetails
Me.Label70.TabIndex = 137
Me.Label70.Text = "Eintrittsdatum:"
'
'dgvUberstundenauszahlungen
'
Me.dgvUberstundenauszahlungen.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvUberstundenauszahlungen.AllowUserToAddRows = False
Me.dgvUberstundenauszahlungen.AllowUserToDeleteRows = False
Me.dgvUberstundenauszahlungen.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.ColumnHeader
Me.dgvUberstundenauszahlungen.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllHeaders
Me.dgvUberstundenauszahlungen.BackgroundColor = System.Drawing.Color.White
Me.dgvUberstundenauszahlungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvUberstundenauszahlungen.Location = New System.Drawing.Point(6, 489)
Me.dgvUberstundenauszahlungen.Name = "dgvUberstundenauszahlungen"
Me.dgvUberstundenauszahlungen.ReadOnly = True
Me.dgvUberstundenauszahlungen.Size = New System.Drawing.Size(741, 255)
Me.dgvUberstundenauszahlungen.TabIndex = 136
'
'Label69
'
Me.Label69.AutoSize = True
@@ -2569,38 +2589,26 @@ Partial Class frmMitarbDetails
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
'
'cbxHO
'dgvUberstundenauszahlungen
'
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(569, 9)
Me.cbxHO.Name = "cbxHO"
Me.cbxHO.Size = New System.Drawing.Size(80, 17)
Me.cbxHO.TabIndex = 151
Me.cbxHO.Text = "Homeoffice"
Me.cbxHO.UseVisualStyleBackColor = True
Me.dgvUberstundenauszahlungen.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvUberstundenauszahlungen.AllowUserToAddRows = False
Me.dgvUberstundenauszahlungen.AllowUserToDeleteRows = False
Me.dgvUberstundenauszahlungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvUberstundenauszahlungen.Location = New System.Drawing.Point(16, 489)
Me.dgvUberstundenauszahlungen.Name = "dgvUberstundenauszahlungen"
Me.dgvUberstundenauszahlungen.Size = New System.Drawing.Size(731, 255)
Me.dgvUberstundenauszahlungen.TabIndex = 155
'
'cbxBeiBeendenAusstempeln
'lblName1
'
Me.cbxBeiBeendenAusstempeln.AutoSize = True
Me.cbxBeiBeendenAusstempeln.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxBeiBeendenAusstempeln.Location = New System.Drawing.Point(569, 32)
Me.cbxBeiBeendenAusstempeln.Name = "cbxBeiBeendenAusstempeln"
Me.cbxBeiBeendenAusstempeln.Size = New System.Drawing.Size(144, 17)
Me.cbxBeiBeendenAusstempeln.TabIndex = 152
Me.cbxBeiBeendenAusstempeln.Text = "Bei Beenden austempeln"
Me.cbxBeiBeendenAusstempeln.UseVisualStyleBackColor = True
'
'cbxTimasNichtStempeln1
'
Me.cbxTimasNichtStempeln1.AutoSize = True
Me.cbxTimasNichtStempeln1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxTimasNichtStempeln1.Location = New System.Drawing.Point(569, 55)
Me.cbxTimasNichtStempeln1.Name = "cbxTimasNichtStempeln1"
Me.cbxTimasNichtStempeln1.Size = New System.Drawing.Size(164, 17)
Me.cbxTimasNichtStempeln1.TabIndex = 153
Me.cbxTimasNichtStempeln1.Text = "Zeiterfassung: Kein Stempeln"
Me.cbxTimasNichtStempeln1.UseVisualStyleBackColor = True
Me.lblName1.BorderStyle = System.Windows.Forms.BorderStyle.None
Me.lblName1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblName1.Location = New System.Drawing.Point(191, 12)
Me.lblName1.Name = "lblName1"
Me.lblName1.Size = New System.Drawing.Size(133, 13)
Me.lblName1.TabIndex = 156
Me.lblName1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'frmMitarbDetails
'
@@ -2646,8 +2654,8 @@ Partial Class frmMitarbDetails
CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage8.ResumeLayout(False)
Me.TabPage8.PerformLayout()
CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@@ -2843,7 +2851,6 @@ Partial Class frmMitarbDetails
Friend WithEvents cbUrlaubInStund As CheckBox
Friend WithEvents lblEintrittsdatum As Label
Friend WithEvents Label70 As Label
Friend WithEvents dgvUberstundenauszahlungen As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents Label69 As Label
Friend WithEvents Label72 As Label
Friend WithEvents Label71 As Label
@@ -2860,4 +2867,6 @@ Partial Class frmMitarbDetails
Friend WithEvents cbxTimasNichtStempeln1 As CheckBox
Friend WithEvents cbxBeiBeendenAusstempeln As CheckBox
Friend WithEvents cbxHO As CheckBox
Friend WithEvents dgvUberstundenauszahlungen As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents lblName1 As TextBox
End Class

View File

@@ -1436,6 +1436,7 @@ Public Class frmMitarbDetails
cbxTimasAngelegt.Checked = True
End If
lblName1.Text = mitarbeiter.mit_vname & " " & mitarbeiter.mit_nname
btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked
txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked
@@ -1448,14 +1449,48 @@ Public Class frmMitarbDetails
Dim dtbereitsausgezahlteUE As DataTable
Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end as bit) ignoreAuszahlungsdatum
Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end as bit) as ignoreAuszahlungsdatum, uest_deleted as geloescht
FROM [ADMIN].[dbo].[tblUeberstunden]
where uest_deleted = 0 and uest_maId = " & mitarbeiter.mit_id & "
Order by uest_date"
dtbereitsausgezahlteUE = SQL.loadDgvBySql(bereitsgezahlteueberstunden, "ADMIN", 100, True)
dgvUberstundenauszahlungen.DataSource = dtbereitsausgezahlteUE
dgvUberstundenauszahlungen.SET_SQL(bereitsgezahlteueberstunden, "ADMIN")
dgvUberstundenauszahlungen.LOAD()
Dim cell As DataGridViewCell = New DataGridViewCheckBoxCell()
With dgvUberstundenauszahlungen
'.AutoGenerateColumns = False
'.Columns("ignoreAuszahlungsdatum").CellTemplate = cell
.Columns("ignoreAuszahlungsdatum").Width = 70
.Columns("ignoreAuszahlungsdatum").HeaderText = "zu spät eingetragen"
.Columns("ignoreAuszahlungsdatum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("Datum").Width = 70
.Columns("ÜS100").Width = 70
.Columns("ÜS100").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
.Columns("ÜS50").Width = 70
.Columns("ÜS50").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
.Columns("ÜS25").Width = 70
.Columns("ÜS25").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
.Columns("ÜS50_Saldo").Width = 70
.Columns("ÜS50_Saldo").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
.Columns("ausbezahlt").Width = 70
.Columns("ausbezahlt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
End With
'dtbereitsausgezahlteUE = SQL.loadDgvBySql(bereitsgezahlteueberstunden, "ADMIN", 100, True)
'dgvUberstundenauszahlungen.DataSource = dtbereitsausgezahlteUE
Catch ex As Exception
@@ -1475,12 +1510,5 @@ Public Class frmMitarbDetails
End Sub
Private Sub cbxBeiBeendenAusstempeln_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBeiBeendenAusstempeln.CheckedChanged
End Sub
Private Sub cbxHO_CheckedChanged(sender As Object, e As EventArgs) Handles cbxHO.CheckedChanged
End Sub
End Class

View File

@@ -47,6 +47,7 @@ Partial Class usrCntlMitarbeiter
Me.TabPage8 = New System.Windows.Forms.TabPage()
Me.dgvTimasNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel1 = New System.Windows.Forms.Panel()
Me.cbxDakosy = New System.Windows.Forms.CheckBox()
Me.cbxZE = New System.Windows.Forms.CheckBox()
Me.cbx = New System.Windows.Forms.CheckBox()
Me.txtSuche = New System.Windows.Forms.TextBox()
@@ -58,7 +59,6 @@ Partial Class usrCntlMitarbeiter
Me.UserKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.BerechtigungenSetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.cbxDakosy = New System.Windows.Forms.CheckBox()
Me.Panel2.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
@@ -349,6 +349,19 @@ Partial Class usrCntlMitarbeiter
Me.Panel1.Size = New System.Drawing.Size(889, 36)
Me.Panel1.TabIndex = 26
'
'cbxDakosy
'
Me.cbxDakosy.AutoSize = True
Me.cbxDakosy.Checked = True
Me.cbxDakosy.CheckState = System.Windows.Forms.CheckState.Indeterminate
Me.cbxDakosy.Location = New System.Drawing.Point(798, 13)
Me.cbxDakosy.Name = "cbxDakosy"
Me.cbxDakosy.Size = New System.Drawing.Size(62, 17)
Me.cbxDakosy.TabIndex = 52
Me.cbxDakosy.Text = "Dakosy"
Me.cbxDakosy.ThreeState = True
Me.cbxDakosy.UseVisualStyleBackColor = True
'
'cbxZE
'
Me.cbxZE.AutoSize = True
@@ -439,19 +452,6 @@ Partial Class usrCntlMitarbeiter
Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
'
'cbxDakosy
'
Me.cbxDakosy.AutoSize = True
Me.cbxDakosy.Checked = True
Me.cbxDakosy.CheckState = System.Windows.Forms.CheckState.Indeterminate
Me.cbxDakosy.Location = New System.Drawing.Point(798, 13)
Me.cbxDakosy.Name = "cbxDakosy"
Me.cbxDakosy.Size = New System.Drawing.Size(62, 17)
Me.cbxDakosy.TabIndex = 52
Me.cbxDakosy.Text = "Dakosy"
Me.cbxDakosy.ThreeState = True
Me.cbxDakosy.UseVisualStyleBackColor = True
'
'usrCntlMitarbeiter
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

View File

@@ -5,6 +5,7 @@ Imports DAKOSY_Worker
Imports DocumentFormat.OpenXml
Imports DocumentFormat.OpenXml.Spreadsheet
Imports iTextSharp.text.pdf
Imports VERAG_PROG_ALLGEMEIN
Public Class cWorker_Verwahrung
Public Shared Dateiname = ""
@@ -56,6 +57,12 @@ Public Class cWorker_Verwahrung
'Verwahrung ANSCHREIBUNG
'Dim ANSCHREIBUNG As New cSicherheiten()
'With ANSCHREIBUNG
'End With
'----------------------------------------------------------------

File diff suppressed because it is too large Load Diff

View File

@@ -3,8 +3,7 @@ Imports System.IO
Imports System.Net
Imports System.Text
Imports System.Xml
Imports com.esendex.sdk
Imports com.sun.xml.internal.rngom
Imports com.sun.corba.se.spi.orb
Imports Renci.SshNet
Imports VERAG_PROG_ALLGEMEIN
@@ -719,7 +718,7 @@ Public Class frmStartOptions
End If
Case "USTVA_SUMMEM_BERECHNEN"
Case "USTVA_SUMMEN_BERECHNEN"
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
Dim ok As Boolean = False
If cMDMFunctionsAllgemein.Update_UStVASummenNeuBerechnen() Then
@@ -5106,7 +5105,7 @@ Public Class frmStartOptions
End Sub
Private Sub Button23_Click(sender As Object, e As EventArgs) Handles Button23.Click
Private Sub Button23_Click(sender As Object, e As EventArgs) Handles Button23.Click, Button25.Click
Dim ok = False
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked
@@ -5124,18 +5123,40 @@ Public Class frmStartOptions
Exit Sub
End If
If sender Is Button23 Then
If cMDMFunctionsAllgemein.Update_UStVASummenNeuBerechnen(ad.AdressenNr) Then
ok = cMDMFunctionsAllgemein.UStVAKunden_SummenNeuBerechnen(ad.AdressenNr)
End If
Else
Dim dt As New DataTable
cMDMFunctionsAllgemein.UStVAKunden_SummenNeuBerechnen(ad.AdressenNr, False, dt)
If dt.Rows.Count = 1 Then
Dim rowData
'dt is the name of the data table
For Each row As DataRow In dt.Rows
For Each column As DataColumn In dt.Columns
rowData = rowData & column.ColumnName & & row(column) & vbNewLine
Next
rowData = rowData & vbNewLine & vbNewLine
Next
MessageBox.Show(rowData)
End If
End If
Else
'ansonsten alle Kunden
If sender Is Button23 Then
If cMDMFunctionsAllgemein.Update_UStVASummenNeuBerechnen() Then
ok = cMDMFunctionsAllgemein.UStVAKunden_SummenNeuBerechnen()
End If
End If
End If
showPic(ok, PictureBox25)
End Sub
@@ -5223,4 +5244,6 @@ Public Class frmStartOptions
Next
End Sub
End Class