diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 7720c9e..3b909b1 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -1159,9 +1159,9 @@ Public Class frmMitarbDetails 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 - End If + MsgBox("Einstiegsdatum darf nicht vor 01.01.2000 liegen!") + Return False + End If If mitarbeiter.mit_gekuendigt Then MsgBox("Bereits gekündige MA können nicht angelegt werden!") @@ -1169,11 +1169,16 @@ Public Class frmMitarbDetails End If If mitarbeiter.mit_vname = "" Or mitarbeiter.mit_nname = "" Then - MsgBox("Vor- und Nachnamen angeben!") - Return False - End If + MsgBox("Vor- und Nachnamen angeben!") + Return False + End If - Return True + If mitarbeiter.mit_firma = "" Then + MsgBox("Firma angeben!") + Return False + End If + + Return True End Function @@ -1185,6 +1190,7 @@ Public Class frmMitarbDetails 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 diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb index 283dbca..301d3c3 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb @@ -32,12 +32,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.dgvVERAG = 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() @@ -48,32 +57,27 @@ Partial Class usrCntlMitarbeiter Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.UserKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BerechtigungenSetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - 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.Panel2.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() + CType(Me.dgvVERAG, 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() Me.SuspendLayout() ' 'Button6 @@ -164,6 +168,7 @@ Partial Class usrCntlMitarbeiter Me.TabControl1.Controls.Add(Me.TabPage5) Me.TabControl1.Controls.Add(Me.TabPage6) Me.TabControl1.Controls.Add(Me.TabPage7) + Me.TabControl1.Controls.Add(Me.TabPage8) Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.TabControl1.Location = New System.Drawing.Point(0, 0) Me.TabControl1.Name = "TabControl1" @@ -182,6 +187,16 @@ Partial Class usrCntlMitarbeiter Me.TabPage1.Text = "VERAG" Me.TabPage1.UseVisualStyleBackColor = True ' + 'dgvVERAG + ' + 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 + ' 'TabPage2 ' Me.TabPage2.Controls.Add(Me.dgvATILLA) @@ -193,6 +208,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) @@ -204,6 +229,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) @@ -215,6 +250,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) @@ -226,6 +271,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) @@ -237,6 +292,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) @@ -248,6 +313,36 @@ 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) + Me.TabPage8.Location = New System.Drawing.Point(4, 22) + Me.TabPage8.Name = "TabPage8" + Me.TabPage8.Size = New System.Drawing.Size(881, 622) + Me.TabPage8.TabIndex = 7 + Me.TabPage8.Text = "Zeiterfassung" + Me.TabPage8.UseVisualStyleBackColor = True + ' + 'dgvTimasNew + ' + Me.dgvTimasNew.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvTimasNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvTimasNew.Location = New System.Drawing.Point(3, 3) + Me.dgvTimasNew.Name = "dgvTimasNew" + Me.dgvTimasNew.ReadOnly = True + Me.dgvTimasNew.Size = New System.Drawing.Size(875, 616) + Me.dgvTimasNew.TabIndex = 0 + ' 'Panel1 ' Me.Panel1.Controls.Add(Me.cbx) @@ -319,7 +414,7 @@ Partial Class usrCntlMitarbeiter ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserKopierenToolStripMenuItem, Me.BerechtigungenSetzenToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(195, 70) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(195, 48) ' 'UserKopierenToolStripMenuItem ' @@ -333,76 +428,6 @@ Partial Class usrCntlMitarbeiter Me.BerechtigungenSetzenToolStripMenuItem.Size = New System.Drawing.Size(194, 22) Me.BerechtigungenSetzenToolStripMenuItem.Text = "Berechtigungen setzen" ' - 'dgvVERAG - ' - 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 - ' 'usrCntlMitarbeiter ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -416,23 +441,25 @@ Partial Class usrCntlMitarbeiter Me.Panel2.ResumeLayout(False) Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) + CType(Me.dgvVERAG, 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() Me.ResumeLayout(False) End Sub @@ -468,4 +495,6 @@ Partial Class usrCntlMitarbeiter Friend WithEvents Button7 As Button Friend WithEvents Button8 As Button Friend WithEvents BerechtigungenSetzenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents TabPage8 As TabPage + Friend WithEvents dgvTimasNew As VERAG_PROG_ALLGEMEIN.MyDatagridview End Class diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb index 5aec6ec..cabc7e7 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb @@ -50,6 +50,8 @@ Public Class usrCntlMitarbeiter showVERAGATILLA("FRONTOFFICE") ElseIf TabControl1.SelectedIndex = 6 Then showVERAGATILLA("VERIMEX") + ElseIf TabControl1.SelectedIndex = 7 Then + showTIMAS() End If End Sub @@ -186,6 +188,29 @@ Public Class usrCntlMitarbeiter End Sub + Public Sub showTIMAS() + 'Paint wieder reaktivieren + locZeilen = -1 + If Not Grid_aktiv Then Exit Sub + + Dim dt As New DataTable() + + dt.Columns.Add("id", GetType(Integer)) + dt.Columns.Add("externid", GetType(String)) + dt.Columns.Add("pnr1", GetType(String)) + dt.Columns.Add("firstname", GetType(String)) + dt.Columns.Add("lastname", GetType(String)) + dt.Columns.Add("gender", GetType(String)) + dt.Columns.Add("card", GetType(Integer)) + dt.Columns.Add("info", GetType(String)) + + Dim timas As New cTimasAPI() + timas.getEmployeeList(dt) + + dgvTimasNew.DataSource = dt + + End Sub + Private Sub sortDGV(dgv As DataGridView) With dgv @@ -364,6 +389,7 @@ Public Class usrCntlMitarbeiter Case 4 : dgv = dgvAMBAR Case 5 : dgv = dgvFRONTOFFICE Case 6 : dgv = dgvVERIMEX + Case 7 : dgv = dgvTimasNew End Select If e.KeyCode = Keys.Return Then @@ -418,7 +444,7 @@ Public Class usrCntlMitarbeiter If dgvFRONTOFFICE.SelectedRows.Count <> 1 Then Exit Sub copyUser(dgvFRONTOFFICE.CurrentRow.Cells(0).Value) - ElseIf TabControl1.SelectedIndex = 5 Then + ElseIf TabControl1.SelectedIndex = 6 Then If dgvVERIMEX.SelectedRows.Count <> 1 Then Exit Sub copyUser(dgvVERIMEX.CurrentRow.Cells(0).Value) @@ -461,7 +487,7 @@ Public Class usrCntlMitarbeiter dgvATILLA.ClearSelection() Me.dgvATILLA.Rows(e.RowIndex).Selected = True - Case Else + Case "dgvVERIMEX" rowClicked = dgvAMBAR.HitTest(e.X, e.Y) dgvAMBAR.ClearSelection() @@ -600,7 +626,7 @@ Public Class usrCntlMitarbeiter dgv = dgvFRONTOFFICE - ElseIf TabControl1.SelectedIndex = 5 Then + ElseIf TabControl1.SelectedIndex = 6 Then dgv = dgvVERIMEX diff --git a/UID/My Project/AssemblyInfo.vb b/UID/My Project/AssemblyInfo.vb index 33bffb2..8780a20 100644 --- a/UID/My Project/AssemblyInfo.vb +++ b/UID/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/UID/usrCntlAPI.Designer.vb b/UID/usrCntlAPI.Designer.vb index 4367a42..a4476e5 100644 --- a/UID/usrCntlAPI.Designer.vb +++ b/UID/usrCntlAPI.Designer.vb @@ -79,6 +79,7 @@ Partial Class usrCntlAPI Me.Panel3 = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.Button11 = New System.Windows.Forms.Button() + Me.Button1 = New System.Windows.Forms.Button() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -134,6 +135,7 @@ Partial Class usrCntlAPI ' 'SplitContainer1.Panel1 ' + Me.SplitContainer1.Panel1.Controls.Add(Me.Button1) Me.SplitContainer1.Panel1.Controls.Add(Me.Label11) Me.SplitContainer1.Panel1.Controls.Add(Me.txtZollBelegNr) Me.SplitContainer1.Panel1.Controls.Add(Me.Label10) @@ -196,10 +198,12 @@ Partial Class usrCntlAPI Me.txtZollBelegNr._DateTimeOnly = False Me.txtZollBelegNr._numbersOnly = False Me.txtZollBelegNr._numbersOnlyKommastellen = "" + Me.txtZollBelegNr._numbersOnlyTrennzeichen = True Me.txtZollBelegNr._Prozent = False Me.txtZollBelegNr._ShortDateNew = False Me.txtZollBelegNr._ShortDateOnly = False Me.txtZollBelegNr._TimeOnly = False + Me.txtZollBelegNr._TimeOnly_Seconds = False Me.txtZollBelegNr._value = "" Me.txtZollBelegNr._Waehrung = False Me.txtZollBelegNr._WaehrungZeichen = True @@ -227,10 +231,12 @@ Partial Class usrCntlAPI Me.txtBezugsNr._DateTimeOnly = False Me.txtBezugsNr._numbersOnly = False Me.txtBezugsNr._numbersOnlyKommastellen = "" + Me.txtBezugsNr._numbersOnlyTrennzeichen = True Me.txtBezugsNr._Prozent = False Me.txtBezugsNr._ShortDateNew = False Me.txtBezugsNr._ShortDateOnly = False Me.txtBezugsNr._TimeOnly = False + Me.txtBezugsNr._TimeOnly_Seconds = False Me.txtBezugsNr._value = "" Me.txtBezugsNr._Waehrung = False Me.txtBezugsNr._WaehrungZeichen = True @@ -264,6 +270,7 @@ Partial Class usrCntlAPI Me.kdtxtKunde._displayWoelflKd = False Me.kdtxtKunde._hideIfListEmpty = True Me.kdtxtKunde._loadKdData = False + Me.kdtxtKunde._searchName1 = True Me.kdtxtKunde._UseFIRMA = "" Me.kdtxtKunde._ValueKdAndName = True Me.kdtxtKunde.dgvpos = "LEFT" @@ -285,10 +292,12 @@ Partial Class usrCntlAPI Me.txtAPIUArt._DateTimeOnly = False Me.txtAPIUArt._numbersOnly = False Me.txtAPIUArt._numbersOnlyKommastellen = "" + Me.txtAPIUArt._numbersOnlyTrennzeichen = True Me.txtAPIUArt._Prozent = False Me.txtAPIUArt._ShortDateNew = False Me.txtAPIUArt._ShortDateOnly = False Me.txtAPIUArt._TimeOnly = False + Me.txtAPIUArt._TimeOnly_Seconds = False Me.txtAPIUArt._value = Nothing Me.txtAPIUArt._Waehrung = False Me.txtAPIUArt._WaehrungZeichen = True @@ -414,10 +423,12 @@ Partial Class usrCntlAPI Me.txtSendungsId._DateTimeOnly = False Me.txtSendungsId._numbersOnly = True Me.txtSendungsId._numbersOnlyKommastellen = "" + Me.txtSendungsId._numbersOnlyTrennzeichen = True Me.txtSendungsId._Prozent = False Me.txtSendungsId._ShortDateNew = False Me.txtSendungsId._ShortDateOnly = False Me.txtSendungsId._TimeOnly = False + Me.txtSendungsId._TimeOnly_Seconds = False Me.txtSendungsId._value = "" Me.txtSendungsId._Waehrung = False Me.txtSendungsId._WaehrungZeichen = True @@ -436,10 +447,12 @@ Partial Class usrCntlAPI Me.txtAvisoId._DateTimeOnly = False Me.txtAvisoId._numbersOnly = True Me.txtAvisoId._numbersOnlyKommastellen = "" + Me.txtAvisoId._numbersOnlyTrennzeichen = True Me.txtAvisoId._Prozent = False Me.txtAvisoId._ShortDateNew = False Me.txtAvisoId._ShortDateOnly = False Me.txtAvisoId._TimeOnly = False + Me.txtAvisoId._TimeOnly_Seconds = False Me.txtAvisoId._value = "" Me.txtAvisoId._Waehrung = False Me.txtAvisoId._WaehrungZeichen = True @@ -514,10 +527,12 @@ Partial Class usrCntlAPI Me.txtAbfertDat._DateTimeOnly = False Me.txtAbfertDat._numbersOnly = False Me.txtAbfertDat._numbersOnlyKommastellen = "" + Me.txtAbfertDat._numbersOnlyTrennzeichen = True Me.txtAbfertDat._Prozent = False Me.txtAbfertDat._ShortDateNew = False Me.txtAbfertDat._ShortDateOnly = True Me.txtAbfertDat._TimeOnly = False + Me.txtAbfertDat._TimeOnly_Seconds = False Me.txtAbfertDat._value = "" Me.txtAbfertDat._Waehrung = False Me.txtAbfertDat._WaehrungZeichen = True @@ -634,10 +649,12 @@ Partial Class usrCntlAPI Me.txtAbfertDatBis._DateTimeOnly = False Me.txtAbfertDatBis._numbersOnly = False Me.txtAbfertDatBis._numbersOnlyKommastellen = "" + Me.txtAbfertDatBis._numbersOnlyTrennzeichen = True Me.txtAbfertDatBis._Prozent = False Me.txtAbfertDatBis._ShortDateNew = False Me.txtAbfertDatBis._ShortDateOnly = True Me.txtAbfertDatBis._TimeOnly = False + Me.txtAbfertDatBis._TimeOnly_Seconds = False Me.txtAbfertDatBis._value = "" Me.txtAbfertDatBis._Waehrung = False Me.txtAbfertDatBis._WaehrungZeichen = True @@ -728,10 +745,12 @@ Partial Class usrCntlAPI Me.txtAbfertigungsnummerBis._DateTimeOnly = False Me.txtAbfertigungsnummerBis._numbersOnly = False Me.txtAbfertigungsnummerBis._numbersOnlyKommastellen = "" + Me.txtAbfertigungsnummerBis._numbersOnlyTrennzeichen = True Me.txtAbfertigungsnummerBis._Prozent = False Me.txtAbfertigungsnummerBis._ShortDateNew = False Me.txtAbfertigungsnummerBis._ShortDateOnly = False Me.txtAbfertigungsnummerBis._TimeOnly = False + Me.txtAbfertigungsnummerBis._TimeOnly_Seconds = False Me.txtAbfertigungsnummerBis._value = Nothing Me.txtAbfertigungsnummerBis._Waehrung = False Me.txtAbfertigungsnummerBis._WaehrungZeichen = True @@ -751,10 +770,12 @@ Partial Class usrCntlAPI Me.txtAbfertigungsnummer._DateTimeOnly = False Me.txtAbfertigungsnummer._numbersOnly = False Me.txtAbfertigungsnummer._numbersOnlyKommastellen = "" + Me.txtAbfertigungsnummer._numbersOnlyTrennzeichen = True Me.txtAbfertigungsnummer._Prozent = False Me.txtAbfertigungsnummer._ShortDateNew = False Me.txtAbfertigungsnummer._ShortDateOnly = False Me.txtAbfertigungsnummer._TimeOnly = False + Me.txtAbfertigungsnummer._TimeOnly_Seconds = False Me.txtAbfertigungsnummer._value = Nothing Me.txtAbfertigungsnummer._Waehrung = False Me.txtAbfertigungsnummer._WaehrungZeichen = True @@ -862,10 +883,12 @@ Partial Class usrCntlAPI Me.txtMaxSrch._DateTimeOnly = False Me.txtMaxSrch._numbersOnly = True Me.txtMaxSrch._numbersOnlyKommastellen = "" + Me.txtMaxSrch._numbersOnlyTrennzeichen = True Me.txtMaxSrch._Prozent = False Me.txtMaxSrch._ShortDateNew = False Me.txtMaxSrch._ShortDateOnly = False Me.txtMaxSrch._TimeOnly = False + Me.txtMaxSrch._TimeOnly_Seconds = False Me.txtMaxSrch._value = "" Me.txtMaxSrch._Waehrung = False Me.txtMaxSrch._WaehrungZeichen = True @@ -922,6 +945,18 @@ Partial Class usrCntlAPI Me.Button11.TabIndex = 4 Me.Button11.UseVisualStyleBackColor = True ' + 'Button1 + ' + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button1.Location = New System.Drawing.Point(850, 122) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(162, 52) + Me.Button1.TabIndex = 53 + Me.Button1.Text = "API Verwaltung" + Me.Button1.UseVisualStyleBackColor = True + ' 'usrCntlAPI ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1003,4 +1038,5 @@ Partial Class usrCntlAPI Friend WithEvents txtZollBelegNr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label10 As Label Friend WithEvents txtBezugsNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Button1 As Button End Class diff --git a/UID/usrCntlAPI.vb b/UID/usrCntlAPI.vb index 625e443..5cb60c6 100644 --- a/UID/usrCntlAPI.vb +++ b/UID/usrCntlAPI.vb @@ -263,4 +263,8 @@ Public Class usrCntlAPI txtAbfertigungsnummerBis.Enabled = (txtAbfertigungsnummer.Text <> "") End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + + End Sub End Class