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

Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-11-14 15:07:45 +01:00
parent 391bea7c98 7a3a0a73ec
commit 14022df226
5 changed files with 186 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UID/Mitarbeiter/frmMitarbeiter.vb
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 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 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

226
UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb generated
View File

@@ -31,13 +31,21 @@ Partial Class usrCntlMitarbeiter
Me.Button3 = New System.Windows.Forms.Button()
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.c = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.TabPage2 = New System.Windows.Forms.TabPage()
Me.dgvATILLA = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.TabPage3 = New System.Windows.Forms.TabPage()
Me.dgvIMEX = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.TabPage4 = New System.Windows.Forms.TabPage()
Me.dgvUNISPED = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.TabPage5 = New System.Windows.Forms.TabPage()
Me.dgvAMBAR = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.TabPage6 = New System.Windows.Forms.TabPage()
Me.dgvFRONTOFFICE = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.TabPage7 = New System.Windows.Forms.TabPage()
Me.dgvVERIMEX = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.TabPage8 = New System.Windows.Forms.TabPage()
Me.dgvTimasNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel1 = New System.Windows.Forms.Panel()
Me.cbx = New System.Windows.Forms.CheckBox()
Me.txtSuche = New System.Windows.Forms.TextBox()
@@ -49,35 +57,28 @@ 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.dgvVERAG = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.dgvATILLA = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.dgvIMEX = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.dgvUNISPED = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.dgvAMBAR = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.dgvFRONTOFFICE = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.dgvVERIMEX = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.dgvTimasNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.cbxZE = New System.Windows.Forms.CheckBox()
Me.Panel2.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
CType(Me.c, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage2.SuspendLayout()
CType(Me.dgvATILLA, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage3.SuspendLayout()
CType(Me.dgvIMEX, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage4.SuspendLayout()
CType(Me.dgvUNISPED, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage5.SuspendLayout()
CType(Me.dgvAMBAR, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage6.SuspendLayout()
CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage7.SuspendLayout()
CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage8.SuspendLayout()
CType(Me.dgvTimasNew, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.Panel3.SuspendLayout()
Me.ContextMenuStrip1.SuspendLayout()
CType(Me.dgvVERAG, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvATILLA, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvIMEX, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvUNISPED, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvAMBAR, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.dgvTimasNew, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'Button6
@@ -166,7 +167,7 @@ Partial Class usrCntlMitarbeiter
'
'TabPage1
'
Me.TabPage1.Controls.Add(Me.dgvVERAG)
Me.TabPage1.Controls.Add(Me.c)
Me.TabPage1.Location = New System.Drawing.Point(4, 22)
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
@@ -175,6 +176,16 @@ Partial Class usrCntlMitarbeiter
Me.TabPage1.Text = "VERAG"
Me.TabPage1.UseVisualStyleBackColor = True
'
'c
'
Me.c.AKTUALISIERUNGS_INTERVALL = -1
Me.c.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.c.Dock = System.Windows.Forms.DockStyle.Fill
Me.c.Location = New System.Drawing.Point(3, 3)
Me.c.Name = "c"
Me.c.Size = New System.Drawing.Size(875, 616)
Me.c.TabIndex = 24
'
'TabPage2
'
Me.TabPage2.Controls.Add(Me.dgvATILLA)
@@ -186,6 +197,16 @@ Partial Class usrCntlMitarbeiter
Me.TabPage2.Text = "ATILLA"
Me.TabPage2.UseVisualStyleBackColor = True
'
'dgvATILLA
'
Me.dgvATILLA.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvATILLA.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvATILLA.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvATILLA.Location = New System.Drawing.Point(3, 3)
Me.dgvATILLA.Name = "dgvATILLA"
Me.dgvATILLA.Size = New System.Drawing.Size(875, 616)
Me.dgvATILLA.TabIndex = 25
'
'TabPage3
'
Me.TabPage3.Controls.Add(Me.dgvIMEX)
@@ -197,6 +218,16 @@ Partial Class usrCntlMitarbeiter
Me.TabPage3.Text = "IMEX"
Me.TabPage3.UseVisualStyleBackColor = True
'
'dgvIMEX
'
Me.dgvIMEX.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvIMEX.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvIMEX.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvIMEX.Location = New System.Drawing.Point(3, 3)
Me.dgvIMEX.Name = "dgvIMEX"
Me.dgvIMEX.Size = New System.Drawing.Size(875, 616)
Me.dgvIMEX.TabIndex = 25
'
'TabPage4
'
Me.TabPage4.Controls.Add(Me.dgvUNISPED)
@@ -208,6 +239,16 @@ Partial Class usrCntlMitarbeiter
Me.TabPage4.Text = "UNISPED"
Me.TabPage4.UseVisualStyleBackColor = True
'
'dgvUNISPED
'
Me.dgvUNISPED.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvUNISPED.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvUNISPED.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvUNISPED.Location = New System.Drawing.Point(3, 3)
Me.dgvUNISPED.Name = "dgvUNISPED"
Me.dgvUNISPED.Size = New System.Drawing.Size(875, 616)
Me.dgvUNISPED.TabIndex = 25
'
'TabPage5
'
Me.TabPage5.Controls.Add(Me.dgvAMBAR)
@@ -219,6 +260,16 @@ Partial Class usrCntlMitarbeiter
Me.TabPage5.Text = "AMBAR"
Me.TabPage5.UseVisualStyleBackColor = True
'
'dgvAMBAR
'
Me.dgvAMBAR.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvAMBAR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvAMBAR.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvAMBAR.Location = New System.Drawing.Point(3, 3)
Me.dgvAMBAR.Name = "dgvAMBAR"
Me.dgvAMBAR.Size = New System.Drawing.Size(875, 616)
Me.dgvAMBAR.TabIndex = 25
'
'TabPage6
'
Me.TabPage6.Controls.Add(Me.dgvFRONTOFFICE)
@@ -230,6 +281,16 @@ Partial Class usrCntlMitarbeiter
Me.TabPage6.Text = "FRONT-OFFICE"
Me.TabPage6.UseVisualStyleBackColor = True
'
'dgvFRONTOFFICE
'
Me.dgvFRONTOFFICE.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvFRONTOFFICE.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvFRONTOFFICE.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvFRONTOFFICE.Location = New System.Drawing.Point(3, 3)
Me.dgvFRONTOFFICE.Name = "dgvFRONTOFFICE"
Me.dgvFRONTOFFICE.Size = New System.Drawing.Size(875, 616)
Me.dgvFRONTOFFICE.TabIndex = 26
'
'TabPage7
'
Me.TabPage7.Controls.Add(Me.dgvVERIMEX)
@@ -241,6 +302,16 @@ Partial Class usrCntlMitarbeiter
Me.TabPage7.Text = "VERIMEX"
Me.TabPage7.UseVisualStyleBackColor = True
'
'dgvVERIMEX
'
Me.dgvVERIMEX.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvVERIMEX.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvVERIMEX.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvVERIMEX.Location = New System.Drawing.Point(3, 3)
Me.dgvVERIMEX.Name = "dgvVERIMEX"
Me.dgvVERIMEX.Size = New System.Drawing.Size(875, 616)
Me.dgvVERIMEX.TabIndex = 27
'
'TabPage8
'
Me.TabPage8.Controls.Add(Me.dgvTimasNew)
@@ -251,8 +322,20 @@ Partial Class usrCntlMitarbeiter
Me.TabPage8.Text = "Zeiterfassung"
Me.TabPage8.UseVisualStyleBackColor = True
'
'dgvTimasNew
'
Me.dgvTimasNew.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvTimasNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvTimasNew.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvTimasNew.Location = New System.Drawing.Point(0, 0)
Me.dgvTimasNew.Name = "dgvTimasNew"
Me.dgvTimasNew.ReadOnly = True
Me.dgvTimasNew.Size = New System.Drawing.Size(881, 622)
Me.dgvTimasNew.TabIndex = 0
'
'Panel1
'
Me.Panel1.Controls.Add(Me.cbxZE)
Me.Panel1.Controls.Add(Me.cbx)
Me.Panel1.Controls.Add(Me.txtSuche)
Me.Panel1.Controls.Add(Me.Button1)
@@ -341,86 +424,18 @@ Partial Class usrCntlMitarbeiter
Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
'
'dgvVERAG
'cbxZE
'
Me.dgvVERAG.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvVERAG.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvVERAG.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvVERAG.Location = New System.Drawing.Point(3, 3)
Me.dgvVERAG.Name = "dgvVERAG"
Me.dgvVERAG.Size = New System.Drawing.Size(875, 616)
Me.dgvVERAG.TabIndex = 24
'
'dgvATILLA
'
Me.dgvATILLA.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvATILLA.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvATILLA.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvATILLA.Location = New System.Drawing.Point(3, 3)
Me.dgvATILLA.Name = "dgvATILLA"
Me.dgvATILLA.Size = New System.Drawing.Size(875, 616)
Me.dgvATILLA.TabIndex = 25
'
'dgvIMEX
'
Me.dgvIMEX.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvIMEX.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvIMEX.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvIMEX.Location = New System.Drawing.Point(3, 3)
Me.dgvIMEX.Name = "dgvIMEX"
Me.dgvIMEX.Size = New System.Drawing.Size(875, 616)
Me.dgvIMEX.TabIndex = 25
'
'dgvUNISPED
'
Me.dgvUNISPED.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvUNISPED.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvUNISPED.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvUNISPED.Location = New System.Drawing.Point(3, 3)
Me.dgvUNISPED.Name = "dgvUNISPED"
Me.dgvUNISPED.Size = New System.Drawing.Size(875, 616)
Me.dgvUNISPED.TabIndex = 25
'
'dgvAMBAR
'
Me.dgvAMBAR.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvAMBAR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvAMBAR.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvAMBAR.Location = New System.Drawing.Point(3, 3)
Me.dgvAMBAR.Name = "dgvAMBAR"
Me.dgvAMBAR.Size = New System.Drawing.Size(875, 616)
Me.dgvAMBAR.TabIndex = 25
'
'dgvFRONTOFFICE
'
Me.dgvFRONTOFFICE.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvFRONTOFFICE.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvFRONTOFFICE.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvFRONTOFFICE.Location = New System.Drawing.Point(3, 3)
Me.dgvFRONTOFFICE.Name = "dgvFRONTOFFICE"
Me.dgvFRONTOFFICE.Size = New System.Drawing.Size(875, 616)
Me.dgvFRONTOFFICE.TabIndex = 26
'
'dgvVERIMEX
'
Me.dgvVERIMEX.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvVERIMEX.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvVERIMEX.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvVERIMEX.Location = New System.Drawing.Point(3, 3)
Me.dgvVERIMEX.Name = "dgvVERIMEX"
Me.dgvVERIMEX.Size = New System.Drawing.Size(875, 616)
Me.dgvVERIMEX.TabIndex = 27
'
'dgvTimasNew
'
Me.dgvTimasNew.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvTimasNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvTimasNew.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvTimasNew.Location = New System.Drawing.Point(0, 0)
Me.dgvTimasNew.Name = "dgvTimasNew"
Me.dgvTimasNew.ReadOnly = True
Me.dgvTimasNew.Size = New System.Drawing.Size(881, 622)
Me.dgvTimasNew.TabIndex = 0
Me.cbxZE.AutoSize = True
Me.cbxZE.Checked = True
Me.cbxZE.CheckState = System.Windows.Forms.CheckState.Indeterminate
Me.cbxZE.Location = New System.Drawing.Point(659, 13)
Me.cbxZE.Name = "cbxZE"
Me.cbxZE.Size = New System.Drawing.Size(133, 17)
Me.cbxZE.TabIndex = 51
Me.cbxZE.Text = "Zeiterfassung-Account"
Me.cbxZE.ThreeState = True
Me.cbxZE.UseVisualStyleBackColor = True
'
'usrCntlMitarbeiter
'
@@ -435,25 +450,25 @@ Partial Class usrCntlMitarbeiter
Me.Panel2.ResumeLayout(False)
Me.TabControl1.ResumeLayout(False)
Me.TabPage1.ResumeLayout(False)
CType(Me.c, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage2.ResumeLayout(False)
CType(Me.dgvATILLA, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage3.ResumeLayout(False)
CType(Me.dgvIMEX, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage4.ResumeLayout(False)
CType(Me.dgvUNISPED, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage5.ResumeLayout(False)
CType(Me.dgvAMBAR, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage6.ResumeLayout(False)
CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage7.ResumeLayout(False)
CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage8.ResumeLayout(False)
CType(Me.dgvTimasNew, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel1.ResumeLayout(False)
Me.Panel1.PerformLayout()
Me.Panel3.ResumeLayout(False)
Me.ContextMenuStrip1.ResumeLayout(False)
CType(Me.dgvVERAG, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvATILLA, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvIMEX, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvUNISPED, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvAMBAR, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.dgvTimasNew, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@@ -464,7 +479,7 @@ Partial Class usrCntlMitarbeiter
Friend WithEvents Button3 As System.Windows.Forms.Button
Friend WithEvents TabControl1 As System.Windows.Forms.TabControl
Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
Friend WithEvents dgvVERAG As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents c As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
Friend WithEvents dgvATILLA As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents Panel1 As System.Windows.Forms.Panel
@@ -491,4 +506,5 @@ Partial Class usrCntlMitarbeiter
Friend WithEvents dgvTimasNew As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents Button9 As Button
Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
Friend WithEvents cbxZE As CheckBox
End Class

67
UID/Mitarbeiter/usrCntlMitarbeiter.vb
View File

@@ -67,7 +67,7 @@ Public Class usrCntlMitarbeiter
Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,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,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 & "%') "
@@ -77,21 +77,24 @@ Public Class usrCntlMitarbeiter
sql &= " AND mit_gekuendigt=" & IIf(cbx.Checked, 1, 0)
End If
If cbxZE.CheckState <> CheckState.Indeterminate Then
sql &= IIf(cbxZE.Checked, " AND mit_timasId is not null", " AND mit_timasId is null")
End If
If firma = "VERAG" Then
' dgvVERAG.DataSource = UID.AnzeigeTabelleFirma(sql)
dgvVERAG.SET_SQL(sql, "ADMIN")
dgvVERAG.LOAD()
c.SET_SQL(sql, "ADMIN")
c.LOAD()
'Tabelle Kommt/Geht bereinigen
If dgvVERAG.RowCount = 0 Then
dgvVERAG.DataSource = Nothing
If c.RowCount = 0 Then
c.DataSource = Nothing
Else
sortDGV(dgvVERAG)
sortDGV(c)
'Eintraege_festlegen()
'AL: Sortierung nach Ausfahrt (Zeit)
dgvVERAG.Sort(dgvVERAG.Columns(3), ListSortDirection.Ascending)
c.Sort(c.Columns(3), ListSortDirection.Ascending)
End If
ElseIf firma = "ATILLA" Then
' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
@@ -269,16 +272,26 @@ Public Class usrCntlMitarbeiter
.Columns(6).Width = 120
.Columns(6).HeaderText = "Email"
.Columns(7).Width = 120
.Columns(7).HeaderText = "TelefonNr."
.Columns(8).Width = 80
.Columns(8).HeaderText = "Gekündigt"
.Columns(7).Width = 70
.Columns(7).HeaderText = "Zeiterf."
.Columns(7).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns(8).Width = 120
.Columns(8).HeaderText = "TelefonNr."
.Columns(9).Width = 70
.Columns(9).HeaderText = "Gekünd."
.Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
'.AutoGenerateColumns = False
'.Columns(9).Visible = False
End With
End Sub
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
Dim Firma = ""
@@ -298,16 +311,16 @@ Public Class usrCntlMitarbeiter
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
Dim frmMitarbDetails As New frmMitarbDetails
frmMitarbDetails.mid = dgvVERAG.CurrentRow.Cells(0).Value
frmMitarbDetails.mid = c.CurrentRow.Cells(0).Value
frmMitarbDetails.Show()
AddHandler frmMitarbDetails.FormClosing, AddressOf handleClose
End Sub
Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
If TabControl1.SelectedIndex = 0 Then
Select Case MsgBox("Soll der Mitarbeiter '" & dgvVERAG.CurrentRow.Cells(1).Value & "' wirklich gelöscht werden?", vbQuestion Or vbYesNo Or vbDefaultButton2, "Löschen?")
Select Case MsgBox("Soll der Mitarbeiter '" & c.CurrentRow.Cells(1).Value & "' wirklich gelöscht werden?", vbQuestion Or vbYesNo Or vbDefaultButton2, "Löschen?")
Case vbYes
UID.delData(Convert.ToInt32(dgvVERAG.CurrentRow.Cells(0).Value))
UID.delData(Convert.ToInt32(c.CurrentRow.Cells(0).Value))
Tabelle_anzeigen()
Case vbNo
@@ -380,7 +393,7 @@ Public Class usrCntlMitarbeiter
Private Sub dgvIMEX_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIMEX.CellDoubleClick, dgvUNISPED.CellDoubleClick, dgvAMBAR.CellDoubleClick, dgvVERAG.CellDoubleClick, dgvATILLA.CellDoubleClick, dgvFRONTOFFICE.CellDoubleClick, dgvVERIMEX.CellDoubleClick
Private Sub dgvIMEX_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIMEX.CellDoubleClick, dgvUNISPED.CellDoubleClick, dgvAMBAR.CellDoubleClick, c.CellDoubleClick, dgvATILLA.CellDoubleClick, dgvFRONTOFFICE.CellDoubleClick, dgvVERIMEX.CellDoubleClick
Me.Cursor = Cursors.Default
Dim frmMitarbDetails As New frmMitarbDetails
frmMitarbDetails.mid = sender.CurrentRow.Cells(0).Value
@@ -403,7 +416,7 @@ Public Class usrCntlMitarbeiter
Dim dgv As DataGridView = Nothing
Select Case TabControl1.SelectedIndex
Case 0 : dgv = dgvVERAG
Case 0 : dgv = c
Case 1 : dgv = dgvATILLA
Case 2 : dgv = dgvIMEX
Case 3 : dgv = dgvUNISPED
@@ -436,13 +449,13 @@ Public Class usrCntlMitarbeiter
If TabControl1.SelectedIndex = 0 Then
If dgvVERAG.SelectedRows.Count <> 1 Then Exit Sub
If c.SelectedRows.Count <> 1 Then Exit Sub
Select Case sender.Name
Case copyUserName
copyUser(dgvVERAG.CurrentRow.Cells(0).Value)
copyUser(c.CurrentRow.Cells(0).Value)
Case setPermissionsName
Dim frm As New frmBenutzerBerGruppenKopieren(dgvVERAG.CurrentRow.Cells(0).Value)
Dim frm As New frmBenutzerBerGruppenKopieren(c.CurrentRow.Cells(0).Value)
frm.Show(Me)
End Select
@@ -514,15 +527,15 @@ Public Class usrCntlMitarbeiter
End If
End Sub
Private Sub dgvVerag_CellMouseDown(ByVal sender As Object, ByVal e As DataGridViewCellMouseEventArgs) Handles dgvVERAG.CellMouseDown, dgvVERIMEX.CellMouseDown, dgvUNISPED.CellMouseDown, dgvIMEX.CellMouseDown, dgvFRONTOFFICE.CellMouseDown, dgvATILLA.CellMouseDown, dgvAMBAR.CellMouseDown
Private Sub dgvVerag_CellMouseDown(ByVal sender As Object, ByVal e As DataGridViewCellMouseEventArgs) Handles c.CellMouseDown, dgvVERIMEX.CellMouseDown, dgvUNISPED.CellMouseDown, dgvIMEX.CellMouseDown, dgvFRONTOFFICE.CellMouseDown, dgvATILLA.CellMouseDown, dgvAMBAR.CellMouseDown
If e.Button = Windows.Forms.MouseButtons.Right AndAlso e.RowIndex > -1 Then
Dim rowClicked As DataGridView.HitTestInfo
Select Case sender.name
Case "dgvVERAG"
rowClicked = dgvVERAG.HitTest(e.X, e.Y)
dgvVERAG.ClearSelection()
Me.dgvVERAG.Rows(e.RowIndex).Selected = True
rowClicked = c.HitTest(e.X, e.Y)
c.ClearSelection()
Me.c.Rows(e.RowIndex).Selected = True
Case "dgvVERIMEX"
rowClicked = dgvVERIMEX.HitTest(e.X, e.Y)
@@ -706,7 +719,7 @@ Public Class usrCntlMitarbeiter
If TabControl1.SelectedIndex = 0 Then
dgv = dgvVERAG
dgv = c
ElseIf TabControl1.SelectedIndex = 1 Then
@@ -842,4 +855,8 @@ Public Class usrCntlMitarbeiter
Me.Cursor = Cursors.Default
End Sub
Private Sub cbxZE_CheckedChanged(sender As Object, e As EventArgs) Handles cbxZE.CheckedChanged
Tabelle_anzeigen()
End Sub
End Class

2
UID/cSqlDb.vb
View File

@@ -1648,7 +1648,7 @@ Public Class cMitarbeiter
Dim sql = "UPDATE tblMitarbeiter " &
"SET mit_username=@mit_username, mit_abweichenderAnzeigename=@mit_abweichenderAnzeigename,mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma,mit_DpUserStandardFirma2=@mit_DpUserStandardFirma2, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_AliasAD_Domain2=@mit_AliasAD_Domain2,mit_AliasAD_Username2=@mit_AliasAD_Username2,mit_teamId=@mit_teamId,mit_ChatBenutzer=@mit_ChatBenutzer,mit_FirmaHaupt=@mit_FirmaHaupt ,mit_EZOLL_SB_UNISPED=@mit_EZOLL_SB_UNISPED " &
" ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto,mit_sprache=@mit_sprache,mit_fakturierungsgruppe=@mit_fakturierungsgruppe, mit_CSuser=@mit_CSuser, mit_CSpwd=@mit_CSpwd, mit_PersonalNr = @mit_PersonalNr, mit_telefonnr = @mit_telefonnr, mit_ATGRNAccessCode_AT51FP7 =@mit_ATGRNAccessCode_AT51FP7 ,mit_ATGRNAccessCode_AT52VA6=@mit_ATGRNAccessCode_AT52VA6, mit_Sprachkentnisse=@mit_Sprachkentnisse" &
" ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto,mit_sprache=@mit_sprache,mit_fakturierungsgruppe=@mit_fakturierungsgruppe, mit_CSuser=@mit_CSuser, mit_CSpwd=@mit_CSpwd, mit_PersonalNr = @mit_PersonalNr, mit_timasId = @mit_timasId, mit_telefonnr = @mit_telefonnr, mit_ATGRNAccessCode_AT51FP7 =@mit_ATGRNAccessCode_AT51FP7 ,mit_ATGRNAccessCode_AT52VA6=@mit_ATGRNAccessCode_AT52VA6, mit_Sprachkentnisse=@mit_Sprachkentnisse" &
" WHERE mit_id=@mit_id "

40
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -446,7 +446,7 @@ Public Class frmStartOptions
Dim f As New frmInfo(PARAM)
f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(False, True, False)
VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL("AMBAR", False, True, False)
closeMe()
Case "AMBAR_DATEV_BUCHUNGEN"
@@ -454,7 +454,7 @@ Public Class frmStartOptions
Dim f As New frmInfo(PARAM)
f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(False, False, True)
VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL("AMBAR", False, False, True)
closeMe()
@@ -463,7 +463,7 @@ Public Class frmStartOptions
Dim f As New frmInfo(PARAM)
f.Show()
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(False, True, True)
VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL("AMBAR", False, True, True)
closeMe()
@@ -3217,18 +3217,18 @@ Public Class frmStartOptions
End If
SDL.Sachbearbeiter = "ASFINAG"
Dim Validto = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
Dim Validto = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.KartenNr = SQl.checkNullStr(oRDR.GetValue("CardNumber"))
SDL.KartenNr = SQL.checkNullStr(oRDR.GetValue("CardNumber"))
If Validto <> "" Then
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(Validto, 1, 2), Mid(Validto, 3, 2), 1)))
End If
SDL.OBUID = SQl.checkNullStr(oRDR.GetValue("OBUID"))
SDL.Vertragsabschlussdatum = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.Kategorie = SQl.checkNullStr(oRDR.GetValue("Kategorie"))
SDL.Schadstoffklasse = SQl.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
SDL.Status = SQl.checkNullStr(oRDR.GetValue("Status"))
SDL.OBUID = SQL.checkNullStr(oRDR.GetValue("OBUID"))
SDL.Vertragsabschlussdatum = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.Kategorie = SQL.checkNullStr(oRDR.GetValue("Kategorie"))
SDL.Schadstoffklasse = SQL.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
SDL.Status = SQL.checkNullStr(oRDR.GetValue("Status"))
SDL.SAVE()
End If
@@ -3274,19 +3274,19 @@ Public Class frmStartOptions
End If
SDL.Sachbearbeiter = "ASFINAG"
Dim Validto = SQl.checkNullStr(row.Item("contractDate"))
Dim Validto = SQL.checkNullStr(row.Item("contractDate"))
SDL.KartenNr = SQl.checkNullStr(row.Item("cardNumber"))
SDL.KartenNr = SQL.checkNullStr(row.Item("cardNumber"))
If Validto <> "" Then
'MsgBox(Mid(Validto, 7, 2) & " " & Mid(Validto, 4, 2))
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(Validto, 7, 2), Mid(Validto, 4, 2), 1))) 'noch im DETAIL checken!
End If
SDL.OBUID = SQl.checkNullStr(row.Item("OBUID"))
SDL.Vertragsabschlussdatum = SQl.checkNullStr(row.Item("contractDate"))
SDL.Kategorie = SQl.checkNullStr(row.Item("vehicleCategory"))
SDL.Schadstoffklasse = SQl.checkNullStr(row.Item("emissionCategory"))
SDL.Status = SQl.checkNullStr(row.Item("status"))
SDL.OBUID = SQL.checkNullStr(row.Item("OBUID"))
SDL.Vertragsabschlussdatum = SQL.checkNullStr(row.Item("contractDate"))
SDL.Kategorie = SQL.checkNullStr(row.Item("vehicleCategory"))
SDL.Schadstoffklasse = SQL.checkNullStr(row.Item("emissionCategory"))
SDL.Status = SQL.checkNullStr(row.Item("status"))
SDL.SAVE()
End If
@@ -3598,7 +3598,7 @@ Public Class frmStartOptions
Private Sub btnDatev_Click(sender As Object, e As EventArgs) Handles btnDatev.Click
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxDatevTest.Checked
VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL(cbxDatevOpen.Checked, cbxDatevDebitoren.Checked, cbxDatevBuchungen.Checked)
VERAG_PROG_ALLGEMEIN.cDatev_Interface.genDatensatzCSV_ALL("AMBAR", cbxDatevOpen.Checked, cbxDatevDebitoren.Checked, cbxDatevBuchungen.Checked)
End Sub
Private Sub LinkLabel44_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel44.LinkClicked
@@ -3872,7 +3872,9 @@ Public Class frmStartOptions
If element.Name = "land" AndAlso element.InnerText <> "" Then wk.fw_land = element.InnerText
If element.Name = "iso2" AndAlso element.InnerText <> "" Then wk.fw_iso2 = element.InnerText
If element.Name = "iso3" AndAlso element.InnerText <> "" Then wk.fw_iso3 = element.InnerText
If element.Name = "kurswert" AndAlso element.InnerText <> "" Then wk.fw_kurswert = element.InnerText
If element.Name = "kurswert" AndAlso element.InnerText <> "" Then
wk.fw_kurswert = element.InnerText
End If
If element.Name = "startdatum" AndAlso element.InnerText <> "" Then
wk.fw_startdatum = element.InnerText
startDatum = wk.fw_startdatum