APIZugange, Mitarbeiter, StartOptions, UTA.

This commit is contained in:
2024-08-27 10:11:30 +02:00
parent 2535a268a7
commit 6f3dbaa305
16 changed files with 6976 additions and 97 deletions

View File

@@ -225,12 +225,12 @@ Partial Class frmMitarbDetails
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.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Label66 = New System.Windows.Forms.Label()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
@@ -288,7 +288,7 @@ Partial Class frmMitarbDetails
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
Me.Panel1.Location = New System.Drawing.Point(0, 0)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(747, 57)
Me.Panel1.Size = New System.Drawing.Size(782, 57)
Me.Panel1.TabIndex = 23
'
'btnADladen
@@ -357,7 +357,7 @@ Partial Class frmMitarbDetails
Me.TabControl2.Location = New System.Drawing.Point(12, 63)
Me.TabControl2.Name = "TabControl2"
Me.TabControl2.SelectedIndex = 0
Me.TabControl2.Size = New System.Drawing.Size(723, 773)
Me.TabControl2.Size = New System.Drawing.Size(758, 773)
Me.TabControl2.TabIndex = 0
'
'TabPage1
@@ -370,7 +370,7 @@ Partial Class frmMitarbDetails
Me.TabPage1.Location = New System.Drawing.Point(4, 22)
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage1.Size = New System.Drawing.Size(715, 747)
Me.TabPage1.Size = New System.Drawing.Size(750, 747)
Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = "Daten"
Me.TabPage1.UseVisualStyleBackColor = True
@@ -1792,7 +1792,7 @@ Partial Class frmMitarbDetails
Me.TabPage3.Location = New System.Drawing.Point(4, 22)
Me.TabPage3.Name = "TabPage3"
Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage3.Size = New System.Drawing.Size(715, 747)
Me.TabPage3.Size = New System.Drawing.Size(750, 747)
Me.TabPage3.TabIndex = 1
Me.TabPage3.Text = "Programme"
Me.TabPage3.UseVisualStyleBackColor = True
@@ -2284,7 +2284,7 @@ Partial Class frmMitarbDetails
Me.TabPage8.Controls.Add(Me.Label66)
Me.TabPage8.Location = New System.Drawing.Point(4, 22)
Me.TabPage8.Name = "TabPage8"
Me.TabPage8.Size = New System.Drawing.Size(715, 747)
Me.TabPage8.Size = New System.Drawing.Size(750, 747)
Me.TabPage8.TabIndex = 2
Me.TabPage8.Text = "Zeiterfassung"
Me.TabPage8.UseVisualStyleBackColor = True
@@ -2306,7 +2306,7 @@ Partial Class frmMitarbDetails
Me.TabControl3.Location = New System.Drawing.Point(24, 172)
Me.TabControl3.Name = "TabControl3"
Me.TabControl3.SelectedIndex = 0
Me.TabControl3.Size = New System.Drawing.Size(669, 280)
Me.TabControl3.Size = New System.Drawing.Size(723, 280)
Me.TabControl3.TabIndex = 142
'
'rtfInfoTimas
@@ -2432,7 +2432,7 @@ Partial Class frmMitarbDetails
Me.dgvUberstundenauszahlungen.Location = New System.Drawing.Point(6, 489)
Me.dgvUberstundenauszahlungen.Name = "dgvUberstundenauszahlungen"
Me.dgvUberstundenauszahlungen.ReadOnly = True
Me.dgvUberstundenauszahlungen.Size = New System.Drawing.Size(703, 255)
Me.dgvUberstundenauszahlungen.Size = New System.Drawing.Size(741, 255)
Me.dgvUberstundenauszahlungen.TabIndex = 136
'
'Label69
@@ -2525,16 +2525,6 @@ Partial Class frmMitarbDetails
Me.txtWoStd.Size = New System.Drawing.Size(44, 20)
Me.txtWoStd.TabIndex = 130
'
'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(344, 76)
Me.Label66.Name = "Label66"
Me.Label66.Size = New System.Drawing.Size(72, 13)
Me.Label66.TabIndex = 127
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))
@@ -2584,6 +2574,16 @@ Partial Class frmMitarbDetails
Me.dgvData.Size = New System.Drawing.Size(390, 192)
Me.dgvData.TabIndex = 149
'
'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(344, 76)
Me.Label66.Name = "Label66"
Me.Label66.Size = New System.Drawing.Size(72, 13)
Me.Label66.TabIndex = 127
Me.Label66.Text = "aliqu. Urlaub.:"
'
'ContextMenuStrip1
'
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
@@ -2594,7 +2594,7 @@ Partial Class frmMitarbDetails
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.WhiteSmoke
Me.ClientSize = New System.Drawing.Size(747, 892)
Me.ClientSize = New System.Drawing.Size(782, 892)
Me.Controls.Add(Me.TabControl2)
Me.Controls.Add(Me.btnCancel)
Me.Controls.Add(Me.btnOK)

View File

@@ -1426,7 +1426,7 @@ 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
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 (isnull([uest_ignorePayoutDate],0) as bit) as 'Auszahlungsdatum ignoriert'
FROM [ADMIN].[dbo].[tblUeberstunden]
where uest_deleted = 0 and uest_maId = " & mitarbeiter.mit_id & "
Order by uest_date"
@@ -1451,7 +1451,7 @@ Public Class frmMitarbDetails
Me.Cursor = Cursors.Default
frmMitarbDetails.ShowDialog()
End Sub
End Class

View File

@@ -52,7 +52,7 @@ Public Class frmMitarbeiter
'Paint wieder reaktivieren
locZeilen = -1
If Not Grid_aktiv Then Exit Sub
Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,mit_durchwahl,mit_gekuendigt, cast (case when mit_timasId is null then 0 else 1 end as bit) mit_ze FROM tblMitarbeiter "
Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,mit_durchwahl,mit_gekuendigt, cast (case when mit_timasId is null then 0 else 1 end as bit) mit_ze, cast (case when isnull([mit_DAKOSY_SB],'')<> '' and isnull([mit_DAKOSY_SBFull],'')<>'' then 1 else 0 end as bit) mit_DAKOSY FROM tblMitarbeiter "
If txtSuche.Text <> "" Then
sql &= " WHERE (mit_username LIKE '%" & txtSuche.Text & "%' OR mit_nname LIKE '%" & txtSuche.Text & "%' OR mit_vname LIKE '%" & txtSuche.Text & "%') "
End If
@@ -93,24 +93,24 @@ Public Class frmMitarbeiter
'.Columns("Info").DisplayIndex = 7
.Columns(7).DisplayIndex = 6
.Columns(0).Visible = False 'ID nicht anzeigen
.Columns("mit_id").Visible = False 'ID nicht anzeigen
.Columns(2).Visible = False 'PWD nicht anzeigen
.Columns(1).Width = 80
.Columns(1).HeaderText = "Kurzbezeichnung"
.Columns(1).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("mit_username").Width = 80
.Columns("mit_username").HeaderText = "Kurzbezeichnung"
.Columns("mit_username").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns(3).Width = 150
.Columns(3).HeaderText = "Vorname"
.Columns("mit_vname").Width = 150
.Columns("mit_vname").HeaderText = "Vorname"
.Columns(4).Width = 150
.Columns(4).HeaderText = "Nachname"
.Columns("mit_nname").Width = 150
.Columns("mit_nname").HeaderText = "Nachname"
.Columns(5).Width = 80
.Columns(5).HeaderText = "Sicherheitsstufe"
.Columns(6).Width = 175
.Columns(6).HeaderText = "Info"
.Columns("mit_niederlassung").Width = 80
.Columns("mit_niederlassung").HeaderText = "Sicherheitsstufe"
.Columns("mit_niederlassung").Width = 175
.Columns("mit_niederlassung").HeaderText = "Info"
.Columns(7).Width = 80
.Columns(7).HeaderText = "Niederlassung"

View File

@@ -58,6 +58,7 @@ 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()
@@ -335,6 +336,7 @@ Partial Class usrCntlMitarbeiter
'
'Panel1
'
Me.Panel1.Controls.Add(Me.cbxDakosy)
Me.Panel1.Controls.Add(Me.cbxZE)
Me.Panel1.Controls.Add(Me.cbx)
Me.Panel1.Controls.Add(Me.txtSuche)
@@ -437,6 +439,19 @@ 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!)
@@ -507,4 +522,5 @@ Partial Class usrCntlMitarbeiter
Friend WithEvents Button9 As Button
Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
Friend WithEvents cbxZE As CheckBox
Friend WithEvents cbxDakosy As CheckBox
End Class

View File

@@ -68,7 +68,7 @@ Public Class usrCntlMitarbeiter
Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,cast (case when mit_timasId is null then 0 else 1 end as bit) mit_ze,mit_durchwahl,mit_gekuendigt, isnull(mit_foto_DocId,'') as mit_foto_DocId FROM tblMitarbeiter WHERE (mit_firma='" & firma & "' OR (mit_firma='ALL' AND mit_FirmaHaupt='" & firma & "' )) "
Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,cast (case when mit_timasId is null then 0 else 1 end as bit) mit_ze, cast (case when isnull([mit_DAKOSY_SB],'')<> '' and isnull([mit_DAKOSY_SBFull],'')<>'' then 1 else 0 end as bit) as mit_DAKOSY, mit_durchwahl,mit_gekuendigt, isnull(mit_foto_DocId,'') as mit_foto_DocId FROM tblMitarbeiter WHERE (mit_firma='" & firma & "' OR (mit_firma='ALL' AND mit_FirmaHaupt='" & firma & "' )) "
If txtSuche.Text <> "" Then
sql &= " AND (mit_username LIKE '%" & txtSuche.Text & "%' OR mit_nname LIKE '%" & txtSuche.Text & "%' OR mit_vname LIKE '%" & txtSuche.Text & "%') "
@@ -82,6 +82,10 @@ Public Class usrCntlMitarbeiter
sql &= IIf(cbxZE.Checked, " AND mit_timasId is not null", " AND mit_timasId is null")
End If
If cbxDakosy.CheckState <> CheckState.Indeterminate Then
sql &= IIf(cbxDakosy.Checked, " AND (isnull([mit_DAKOSY_SB],'')<> '' AND isnull([mit_DAKOSY_SBFull],'')<>'')", " AND ((isnull([mit_DAKOSY_SB],'')= '' OR isnull([mit_DAKOSY_SBFull],'')=''))")
End If
If firma = "VERAG" Then
' dgvVERAG.DataSource = UID.AnzeigeTabelleFirma(sql)
@@ -252,38 +256,48 @@ Public Class usrCntlMitarbeiter
.AllowUserToOrderColumns = True
.Columns(0).Visible = False 'ID nicht anzeigen
.Columns("mit_id").Visible = False 'ID nicht anzeigen
.Columns(1).Width = 150
.Columns(1).HeaderText = "Username"
.Columns(1).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("mit_username").Width = 150
.Columns("mit_username").HeaderText = "Username"
.Columns("mit_username").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns(2).Width = 100
.Columns(2).HeaderText = "Vorname"
.Columns("mit_vname").Width = 100
.Columns("mit_vname").HeaderText = "Vorname"
.Columns(3).Width = 130
.Columns(3).HeaderText = "Nachname"
.Columns("mit_nname").Width = 130
.Columns("mit_nname").HeaderText = "Nachname"
.Columns(4).Width = 85
.Columns(4).HeaderText = "Niederlassung"
.Columns("mit_niederlassung").Width = 85
.Columns("mit_niederlassung").HeaderText = "Niederlassung"
.Columns(5).Width = 85
.Columns(5).HeaderText = "Abteilung"
.Columns("mit_abteilung").Width = 85
.Columns("mit_abteilung").HeaderText = "Abteilung"
.Columns(6).Width = 120
.Columns(6).HeaderText = "Email"
.Columns("mit_email").Width = 120
.Columns("mit_email").HeaderText = "Email"
.Columns("mit_ze").Width = 50
.Columns("mit_ze").HeaderText = "Zeiterf."
.Columns("mit_ze").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns(7).Width = 70
.Columns(7).HeaderText = "Zeiterf."
.Columns(7).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("mit_durchwahl").Width = 120
.Columns("mit_durchwahl").HeaderText = "TelefonNr."
.Columns(8).Width = 120
.Columns(8).HeaderText = "TelefonNr."
.Columns("mit_gekuendigt").Width = 70
.Columns("mit_gekuendigt").HeaderText = "Gekünd."
.Columns("mit_gekuendigt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("mit_DAKOSY").Width = 100
.Columns("mit_DAKOSY").HeaderText = "Dakosy-Zugang"
.Columns("mit_DAKOSY").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
.Columns("mit_foto_DocId").Width = 70
.Columns("mit_foto_DocId").HeaderText = "FotoID"
.Columns(9).Width = 70
.Columns(9).HeaderText = "Gekünd."
.Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
'.AutoGenerateColumns = False
@@ -871,7 +885,9 @@ Public Class usrCntlMitarbeiter
Me.Cursor = Cursors.Default
End Sub
Private Sub cbxZE_CheckStateChanged(sender As Object, e As EventArgs) Handles cbxZE.CheckStateChanged
Private Sub cbxZE_CheckStateChanged(sender As Object, e As EventArgs) Handles cbxZE.CheckStateChanged, cbxDakosy.CheckStateChanged
Tabelle_anzeigen()
End Sub
End Class