diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index 521a2d9..924da17 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -914,14 +914,6 @@ Component Always - - Component - Always - - - Component - Always - Component Always @@ -989,7 +981,6 @@ - @@ -1036,6 +1027,8 @@ + + diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb index b9a61ff..263bb75 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmMitarbDetails Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmMitarbDetails 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMitarbDetails)) @@ -71,6 +71,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.TabControl1 = New System.Windows.Forms.TabControl() + Me.PictureBox9 = New System.Windows.Forms.PictureBox() Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.rtfInfoTimas = New System.Windows.Forms.RichTextBox() Me.btngetInfo = New System.Windows.Forms.Button() @@ -206,6 +208,7 @@ Partial Class frmMitarbDetails Me.TabPage4.SuspendLayout() Me.TabPage5.SuspendLayout() Me.TabPage6.SuspendLayout() + CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox2.SuspendLayout() Me.GroupBox1.SuspendLayout() @@ -222,7 +225,7 @@ Partial Class frmMitarbDetails ' 'PictureBox1 ' - Me.PictureBox1.Image = Global.ADMIN.My.Resources.Resources.admin_logo + Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image) Me.PictureBox1.Location = New System.Drawing.Point(12, 7) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(198, 41) @@ -258,12 +261,12 @@ Partial Class frmMitarbDetails ' Me.btnADladen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.btnADladen.BackColor = System.Drawing.Color.White + Me.btnADladen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnADladen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnADladen.Location = New System.Drawing.Point(602, 9) + Me.btnADladen.Location = New System.Drawing.Point(628, 3) Me.btnADladen.Name = "btnADladen" - Me.btnADladen.Size = New System.Drawing.Size(81, 36) + Me.btnADladen.Size = New System.Drawing.Size(55, 45) Me.btnADladen.TabIndex = 53 - Me.btnADladen.Text = "Active Directory" Me.btnADladen.UseVisualStyleBackColor = False Me.btnADladen.Visible = False ' @@ -751,6 +754,8 @@ Partial Class frmMitarbDetails ' 'TabPage6 ' + Me.TabPage6.Controls.Add(Me.TabControl1) + Me.TabPage6.Controls.Add(Me.PictureBox9) Me.TabPage6.Controls.Add(Me.dgvData) Me.TabPage6.Controls.Add(Me.rtfInfoTimas) Me.TabPage6.Controls.Add(Me.btngetInfo) @@ -764,21 +769,38 @@ Partial Class frmMitarbDetails Me.TabPage6.Text = "Zeiterfassung" Me.TabPage6.UseVisualStyleBackColor = True ' + 'TabControl1 + ' + Me.TabControl1.Location = New System.Drawing.Point(5, 26) + Me.TabControl1.Name = "TabControl1" + Me.TabControl1.SelectedIndex = 0 + Me.TabControl1.Size = New System.Drawing.Size(360, 145) + Me.TabControl1.TabIndex = 122 + ' + 'PictureBox9 + ' + Me.PictureBox9.Location = New System.Drawing.Point(405, 3) + Me.PictureBox9.Name = "PictureBox9" + Me.PictureBox9.Size = New System.Drawing.Size(34, 27) + Me.PictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage + Me.PictureBox9.TabIndex = 121 + Me.PictureBox9.TabStop = False + ' 'dgvData ' Me.dgvData.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvData.BackgroundColor = System.Drawing.Color.White Me.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvData.Location = New System.Drawing.Point(2, 29) + Me.dgvData.Location = New System.Drawing.Point(2, 27) Me.dgvData.Name = "dgvData" - Me.dgvData.Size = New System.Drawing.Size(364, 142) + Me.dgvData.Size = New System.Drawing.Size(364, 144) Me.dgvData.TabIndex = 118 ' 'rtfInfoTimas ' - Me.rtfInfoTimas.Location = New System.Drawing.Point(3, 29) + Me.rtfInfoTimas.Location = New System.Drawing.Point(3, 27) Me.rtfInfoTimas.Name = "rtfInfoTimas" - Me.rtfInfoTimas.Size = New System.Drawing.Size(363, 110) + Me.rtfInfoTimas.Size = New System.Drawing.Size(363, 144) Me.rtfInfoTimas.TabIndex = 97 Me.rtfInfoTimas.Text = "" ' @@ -799,19 +821,19 @@ Partial Class frmMitarbDetails Me.cbxTimasAngelegt.AutoSize = True Me.cbxTimasAngelegt.Enabled = False 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(5, 3) + Me.cbxTimasAngelegt.Location = New System.Drawing.Point(2, 5) Me.cbxTimasAngelegt.Name = "cbxTimasAngelegt" Me.cbxTimasAngelegt.Size = New System.Drawing.Size(181, 17) Me.cbxTimasAngelegt.TabIndex = 116 - Me.cbxTimasAngelegt.Text = "Account - PersonalNr (für LOHN)" + Me.cbxTimasAngelegt.Text = "Account - PersonalNr (Lohnverr.)" Me.cbxTimasAngelegt.UseVisualStyleBackColor = True ' 'txtPersonalNr ' Me.txtPersonalNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtPersonalNr.Location = New System.Drawing.Point(252, 1) + Me.txtPersonalNr.Location = New System.Drawing.Point(189, 3) Me.txtPersonalNr.Name = "txtPersonalNr" - Me.txtPersonalNr.Size = New System.Drawing.Size(114, 20) + Me.txtPersonalNr.Size = New System.Drawing.Size(47, 20) Me.txtPersonalNr.TabIndex = 114 ' 'btnMAanlegen @@ -902,7 +924,7 @@ Partial Class frmMitarbDetails Me.btnUpdateAD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.btnUpdateAD.BackColor = System.Drawing.Color.White Me.btnUpdateAD.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnUpdateAD.Image = Global.ADMIN.My.Resources.Resources.refresh + Me.btnUpdateAD.Image = CType(resources.GetObject("btnUpdateAD.Image"), System.Drawing.Image) Me.btnUpdateAD.Location = New System.Drawing.Point(669, 37) Me.btnUpdateAD.Name = "btnUpdateAD" Me.btnUpdateAD.Size = New System.Drawing.Size(27, 20) @@ -1867,7 +1889,7 @@ Partial Class frmMitarbDetails 'PictureBox2 ' Me.PictureBox2.Enabled = False - Me.PictureBox2.Image = Global.ADMIN.My.Resources.Resources.Aviso + Me.PictureBox2.Image = CType(resources.GetObject("PictureBox2.Image"), System.Drawing.Image) Me.PictureBox2.Location = New System.Drawing.Point(365, 241) Me.PictureBox2.Name = "PictureBox2" Me.PictureBox2.Size = New System.Drawing.Size(34, 33) @@ -1887,7 +1909,7 @@ Partial Class frmMitarbDetails 'PictureBox7 ' Me.PictureBox7.Enabled = False - Me.PictureBox7.Image = Global.ADMIN.My.Resources.Resources.sdl_ico + Me.PictureBox7.Image = CType(resources.GetObject("PictureBox7.Image"), System.Drawing.Image) Me.PictureBox7.Location = New System.Drawing.Point(209, 241) Me.PictureBox7.Name = "PictureBox7" Me.PictureBox7.Size = New System.Drawing.Size(34, 33) @@ -2068,7 +2090,7 @@ Partial Class frmMitarbDetails 'PictureBox4 ' Me.PictureBox4.Enabled = False - Me.PictureBox4.Image = Global.ADMIN.My.Resources.Resources.parkzeit + Me.PictureBox4.Image = CType(resources.GetObject("PictureBox4.Image"), System.Drawing.Image) Me.PictureBox4.Location = New System.Drawing.Point(526, 80) Me.PictureBox4.Name = "PictureBox4" Me.PictureBox4.Size = New System.Drawing.Size(34, 33) @@ -2088,7 +2110,7 @@ Partial Class frmMitarbDetails 'PictureBox3 ' Me.PictureBox3.Enabled = False - Me.PictureBox3.Image = Global.ADMIN.My.Resources.Resources.dispo_ico + Me.PictureBox3.Image = CType(resources.GetObject("PictureBox3.Image"), System.Drawing.Image) Me.PictureBox3.Location = New System.Drawing.Point(365, 80) Me.PictureBox3.Name = "PictureBox3" Me.PictureBox3.Size = New System.Drawing.Size(34, 33) @@ -2108,7 +2130,7 @@ Partial Class frmMitarbDetails 'PictureBox5 ' Me.PictureBox5.Enabled = False - Me.PictureBox5.Image = Global.ADMIN.My.Resources.Resources.uid_ico + Me.PictureBox5.Image = CType(resources.GetObject("PictureBox5.Image"), System.Drawing.Image) Me.PictureBox5.Location = New System.Drawing.Point(209, 80) Me.PictureBox5.Name = "PictureBox5" Me.PictureBox5.Size = New System.Drawing.Size(34, 33) @@ -2190,6 +2212,7 @@ Partial Class frmMitarbDetails Me.TabPage5.PerformLayout() Me.TabPage6.ResumeLayout(False) Me.TabPage6.PerformLayout() + CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() @@ -2381,4 +2404,6 @@ Partial Class frmMitarbDetails Friend WithEvents btngetInfo As Button Friend WithEvents rtfInfoTimas As RichTextBox Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents PictureBox9 As PictureBox + Friend WithEvents TabControl1 As TabControl End Class diff --git a/UID/Mitarbeiter/frmMitarbDetails.resx b/UID/Mitarbeiter/frmMitarbDetails.resx index 4dbf476..cadfc89 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.resx +++ b/UID/Mitarbeiter/frmMitarbDetails.resx @@ -118,6 +118,373 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + B3v2d44WCwAAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAKxJREFUOE+t + z8ENgzAMheGoW3QRxos4doWKYThwbXdoJzF1A4kdno2UcPikkrz8UgMRXQoe9sg/5vc3jNNiiRt0p+Tg + /2N4SHSi3idGEAUQ+SYBwbNH/n0VtIfa7QdvG4MMb41gGfjcYISDo32DNQSZjhRdf1mGyhsjWAa+47Yz + yO7quwoyGUVh6zwBQSaDHvkmMYIMBaR6n+zB+fUJ8blYxg26U3LwKvCwHYUV3DDCWLBXXp8AAAAASUVO + RK5CYII= + + + + + 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 + QmCC + + + + + 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 + vh8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAlCAYAAAAjt+tHAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAq9JREFUWEfVl91qIjEYhqfQpQcWCv1ZFvagSpddqLRIW3DcE/+9Cq/Dy/AmvAdv + wQvx2ENPPDD9ntlkmOg3saXpSgMPk0nyfe87SWyTZDAYwIlwKpwJ58KFcClcRYJc5CQ3GmihmTjxb0JF + YPBPoSb8En5HglzkJDcaaKF5ggHc0HAj3AkPwouQRoac5EYDLTRPMcCU4IqOdDQamV6vZ/r9fvaUtrzO + k3cH7yGKY9vttknTlDpm0ELzDAOsC1PzMBwOTb1eN5VKxSRJEhVykrvZbGKCmUDzHANsDtbnha/8DHEH + ubvdLgZYDjQvMMAOZZOkTJsWGBNmGS2reYkB1oKdSqMaFBO7N9BC8+q/G0DDau0beMsSrFYrU1Y2m42Z + z+emVqupsfDhGQgZcGW9XquxEM0AIpPJJGc6nZrlcpn1UWazmRofzQBPrZ9lCPWjYbX2DbxnD5QJHOoP + zsBHDYzH46yPslgs9vpBdOIY2G63Wd3BnnCFPv72a/HRZqCsIM6G1GIhmgH3my/Czg/9DYCgAUENKuIM + 8NT6DxFtBr6sAdE57hKgYbWOMwPBJeBEpAXFRHSOa0CbgfxIJqhBMUHDauVHsvxQ2ul0jnIozY/lrVbr + 04/l9q7hHcu9iwnndv6RSN2jWq2qiTUYa9c6fyJsxZl+72ISupq1hL9AoreYYIwVyuJsDnKVXs0OXU7v + hUfh+ZAJ+mQcPNsYYslBLnKSGw208supM6Fdz6+FH8Kt8Edo8HWaicKXN+xYYoglR/B67lEs8u5mh0CS + 8SWP7OSiCer8guizYxhLzL+vLBR59/X2GnaKtGkmGs4E2J8WXx4Up0ibr7fbUMKuCdb1ieu2vXI/2TZP + XNByeaiNJRRNfBfYVKw1UKftXeKgNgZwJtjFbCxEgXq+swUtVmGQvAL7tq8xicSnXgAAAABJRU5ErkJg + gg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAc5JREFUWEftljFKBEEQRec0XsAbmHkDE9NNBCPTBQ+w5iJmBoJgZKCZGBhtJMhm + C0aCCEaKYcsr9g1FO5vOJP2hZqerq379roat6crEaAKagCYgBKzf3ku3O+vtaH4em2Lv8LTs7J9sViX2 + jb25e9p4S3l4XG7l+f75LZfX9+Hj9+PzK/whwEQ2JZeYxEyGn/V8cVUOjhfx/rJaxx7ErM8ubnue5+Vr + 7BlLDIfhUCAESAoRyninAMAnKTAWU7CnsShr4xBQcyg0Oo+DYibWAuxO7oiFsHw1nEq/e8QrBi6QhYYA + Em2J6izomlN4HbSTdwtykrxHDmZn6IKc+P5dAQ4CNE8PslrgXWqsQd3mGnXXEA1CgIo9dQa+2s/aHIFA + 1hJvQ70fAqZEE9AENAGdfw6T2aBzTBt0jmk8+HvEeHdIOFRq5P9xkT9EzAd5bvhdAMjv5w8PCJxmDBUJ + SdKfDZ8xjlgJyVGgY95ZgiCGEuBwwcfDkzrJHLMUysDv9BPESCa5MRTGz6BCWO4otXoBJmYyTgQk0RRJ + kdw5rL4avwPwY+TkbkQeD4tBZivzN4FAqATEGYMoT2f38vWRxztQZBTH+pepbNA5pg06R7NZ+QO0aZRu + zy7SVAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAdpJREFUWEftljFKBEEQRec0XsAbmHkDE9NNBCPTBQ+w5iJmBoJgZKCZGBhtJMhm + C0aCCEaKYcvrmV/8aXoMZ5L58Me1uqr6d9Vu9TRpYswCZgGzgBDwvH5Nze4i6NjZP8m2o+V5Z2mxXF2F + /8PjurOmtH17D7u4d3iabu6e0stm23m1CAEsyvngeNVZ+8kur+87awsJg/gJnqtG1oUQ4KfxjTiZ7FRJ + +Pj8CjtCHMRr7eziNm9I9WSD3z+/2TcE+Gl8I0+mIOAtQ7yDCtZi3K5WZAFlz2pB3hbgwrykxMpO3x38 + r7WeAC8zlZCA//rvp/GKDVWGVsgOtUcW4EFD9E38lNAr5pUZoh8mvgPll8RZnp7yaa1sjVemRirhCAGA + xPTT6acTaI3WvTLAY0vWcvUETIFZwCygqf1URmXVOCarxjHJg8Giua8LhIlWTkDAXYGvw+8Sv4CG7gvi + 4/blQQLNd6ahEhJUzn2ITT78BUpIjATqHYMpCBCkt6q4M3jopJrTujbL0Ym9nP34KJmSy4eNsfPygjCv + aNyOHujJOBFQElEi2cQrB8vWsKnskBivRo7joc1IplKWbzkAoUqAn3wQpdOpet4+4vgMJDJvDuPDVKwa + x2TVOBoX6Q+jPT6GjgY3BAAAAABJRU5ErkJggg== + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 7720c9e..01761e9 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -30,6 +30,7 @@ Public Class frmMitarbDetails Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim FirmaTmp = "" Dim timas As cTimasAPI + Dim dtTimas As New DataTable Sub New() @@ -286,6 +287,7 @@ Public Class frmMitarbDetails txtCSUser.Text = mitarbeiter.mit_CSuser txtCSPW.Text = mitarbeiter.mit_CSpwd txtPersonalNr.Text = mitarbeiter.mit_PersonalNr + txtTelNr.Text = mitarbeiter.mit_telefonnr cboALIASDomain.changeItem(mitarbeiter.mit_AliasAD_Domain) txtALIASUser.Text = mitarbeiter.mit_AliasAD_Username @@ -565,6 +567,8 @@ Public Class frmMitarbDetails mitarbeiter.mit_teamId = If(cboTeam._value = "", Nothing, cboTeam._value) mitarbeiter.mit_CSuser = txtCSUser.Text mitarbeiter.mit_CSpwd = txtCSPW.Text + mitarbeiter.mit_PersonalNr = txtPersonalNr.Text + mitarbeiter.mit_telefonnr = txtTelNr.Text @@ -857,10 +861,8 @@ Public Class frmMitarbDetails If IsNothing(mitarbeiter.mit_timasId) Then cbxTimasAngelegt.Checked = False - Dim dt As New DataTable - - timas.getGroups(dt) - initDGV(dt) + timas.getGroups(dtTimas) + initDGV(dtTimas) Else cbxTimasAngelegt.Checked = True End If @@ -869,6 +871,7 @@ Public Class frmMitarbDetails btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked txtPersonalNr.Enabled = Not cbxTimasAngelegt.Checked dgvData.Visible = Not cbxTimasAngelegt.Checked + TabControl1.Visible = Not cbxTimasAngelegt.Checked rtfInfoTimas.Visible = cbxTimasAngelegt.Checked btngetInfo.Visible = cbxTimasAngelegt.Checked End If @@ -1123,11 +1126,22 @@ Public Class frmMitarbDetails Private Sub btnMAanlegen_Click(sender As Object, e As EventArgs) Handles btnMAanlegen.Click - If checkMandatoryFields() Then - timas.createMA(mitarbeiter, rtfInfoTimas.Text, dgvData) - tbcntr_TabIndexChanged(sender, e) + Dim newMid As Integer = 0 + If txtVname.Text = "" And txtNname.Text = "" Then MsgBox("Bitte geben Sie einen Namen ein!") : Exit Sub + getMitarbeiter() + If isUpdate Then + mitarbeiter.mit_id = mid + If UID.updateMitarbeiter(mitarbeiter) Then saveBerechtigungen(newMid) + Else + If UID.insertMitarbeiter(mitarbeiter, newMid) Then saveBerechtigungen(newMid) End If + + If checkMandatoryFields() Then + timas.createMA(mitarbeiter, rtfInfoTimas.Text, dtTimas) + tbcntr_TabIndexChanged(sender, e) + End If + End Sub Private Sub btngetInfo_Click(sender As Object, e As EventArgs) Handles btngetInfo.Click @@ -1159,9 +1173,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,33 +1183,95 @@ 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 Sub initDGV(dt As DataTable) - dgvData.DataSource = dt + 'dgvData.DataSource = dt - If dgvData.Columns.Count > 0 Then - With dgvData - .RowHeadersWidth = 10 - .Columns("id").Visible = False - .Columns("name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns("info").Width = 200 - .Columns("set").Width = 20 - .Columns("set").HeaderText = "X" + '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 With + 'End If + + + If dtTimas.Columns.Count > 0 Then + + If TabControl1.TabCount = 0 Then + For Each row As DataRow In dt.DefaultView.ToTable(True, "groupType").Rows + Dim TabIndex As Integer 'Anzahl der erstellten Tabs, bei keinem Tab ist der Index 0 + TabIndex = TabControl1.TabCount + TabControl1.TabPages.Add(row("groupType")) + If TabIndex = 0 Then + Dim tab As TabPage = Me.TabControl1.SelectedTab + Dim dv = New DataView(dt) + dv.RowFilter = "groupType = '" & tab.Text & "'" + dgvData.DataSource = dv + If dgvData.Columns.Count > 0 Then + With dgvData + .RowHeadersWidth = 10 + .Columns("id").Visible = False + .Columns("name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("groupType").Visible = False + .Columns("info").Width = 150 + .Columns("set").Width = 20 + .Columns("set").HeaderText = "X" + .Dock = DockStyle.Fill + + End With + tab.Controls.Add(Me.dgvData) + End If + End If + + Next + End If End If + End Sub + Private Sub PictureBox9_Click_1(sender As Object, e As EventArgs) Handles PictureBox9.Click + Dim webAddress As String = "https://zeit.verag.ag/" + Process.Start(webAddress) + End Sub + + Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged + If dgvData Is Nothing And dgvData.Rows.Count < 1 Then Exit Sub + Dim tab As TabPage = Me.TabControl1.SelectedTab + If ((Not tab Is Nothing) AndAlso (Not tab.Controls.Contains(Me.dgvData))) Then + Dim dv = New DataView(dtTimas) + dv.RowFilter = "groupType = '" & tab.Text & "'" + dgvData.DataSource = dv + If dgvData.Columns.Count > 0 Then + tab.Controls.Add(Me.dgvData) + End If + + If (Me.isDataLoaded) Then + End If + End If + End Sub + + Private isDataLoaded As Boolean = True End Class diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb index 283dbca..e3ad354 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb @@ -25,19 +25,27 @@ Partial Class usrCntlMitarbeiter Me.components = New System.ComponentModel.Container() Me.Button6 = New System.Windows.Forms.Button() Me.Panel2 = New System.Windows.Forms.Panel() - Me.Button8 = New System.Windows.Forms.Button() - Me.Button7 = New System.Windows.Forms.Button() + Me.Button9 = New System.Windows.Forms.Button() Me.Button5 = New System.Windows.Forms.Button() Me.Button4 = New System.Windows.Forms.Button() 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 +56,28 @@ 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.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(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 @@ -87,8 +91,7 @@ Partial Class usrCntlMitarbeiter ' 'Panel2 ' - Me.Panel2.Controls.Add(Me.Button8) - Me.Panel2.Controls.Add(Me.Button7) + Me.Panel2.Controls.Add(Me.Button9) Me.Panel2.Controls.Add(Me.Button6) Me.Panel2.Controls.Add(Me.Button5) Me.Panel2.Controls.Add(Me.Button4) @@ -99,25 +102,14 @@ Partial Class usrCntlMitarbeiter Me.Panel2.Size = New System.Drawing.Size(92, 684) Me.Panel2.TabIndex = 24 ' - 'Button8 + 'Button9 ' - Me.Button8.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Button8.Location = New System.Drawing.Point(3, 553) - Me.Button8.Name = "Button8" - Me.Button8.Size = New System.Drawing.Size(87, 60) - Me.Button8.TabIndex = 20 - Me.Button8.Text = "Upload Mitarbeiterfotos WIKI" - Me.Button8.UseVisualStyleBackColor = True - ' - 'Button7 - ' - Me.Button7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Button7.Location = New System.Drawing.Point(11, 619) - Me.Button7.Name = "Button7" - Me.Button7.Size = New System.Drawing.Size(75, 53) - Me.Button7.TabIndex = 19 - Me.Button7.Text = "Copy to Clipboard WIKI" - Me.Button7.UseVisualStyleBackColor = True + Me.Button9.Location = New System.Drawing.Point(10, 262) + Me.Button9.Name = "Button9" + Me.Button9.Size = New System.Drawing.Size(75, 34) + Me.Button9.TabIndex = 21 + Me.Button9.Text = "Wiki" + Me.Button9.UseVisualStyleBackColor = True ' 'Button5 ' @@ -164,6 +156,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 +175,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 +196,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 +217,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 +238,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 +259,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 +280,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 +301,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 +402,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,75 +416,10 @@ Partial Class usrCntlMitarbeiter Me.BerechtigungenSetzenToolStripMenuItem.Size = New System.Drawing.Size(194, 22) Me.BerechtigungenSetzenToolStripMenuItem.Text = "Berechtigungen setzen" ' - 'dgvVERAG + 'ContextMenuStrip2 ' - 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 + Me.ContextMenuStrip2.Name = "ContextMenuStrip2" + Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' 'usrCntlMitarbeiter ' @@ -416,23 +434,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 @@ -465,7 +485,9 @@ Partial Class usrCntlMitarbeiter Friend WithEvents dgvVERIMEX As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents UserKopierenToolStripMenuItem As ToolStripMenuItem - 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 + Friend WithEvents Button9 As Button + Friend WithEvents ContextMenuStrip2 As ContextMenuStrip End Class diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.resx b/UID/Mitarbeiter/usrCntlMitarbeiter.resx index 279a447..091f0a7 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.resx +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.resx @@ -120,4 +120,7 @@ 17, 17 + + 174, 17 + \ No newline at end of file diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb index 5aec6ec..92ad34f 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb @@ -2,6 +2,7 @@ Imports System.Net Imports System.Text Imports System.Windows.Controls +Imports System.Windows.Forms.VisualStyles.VisualStyleElement Imports GrapeCity.Viewer.Common.Model Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN.cChilkat_Helper @@ -19,6 +20,7 @@ Public Class usrCntlMitarbeiter Private locZeilen As Integer = -1 Public mid As Integer = -1 Dim FUNC = New cProgramFunctions + Dim dt As New DataTable() Private Sub uctrlMitarbeiter_Load(sender As Object, e As EventArgs) Handles MyBase.Load ConnStr = frmMain.ConnStr @@ -50,7 +52,12 @@ Public Class usrCntlMitarbeiter showVERAGATILLA("FRONTOFFICE") ElseIf TabControl1.SelectedIndex = 6 Then showVERAGATILLA("VERIMEX") + ElseIf TabControl1.SelectedIndex = 7 Then + If dgvTimasNew IsNot Nothing Then + showTIMAS() + End If End If + End Sub Public Sub showVERAGATILLA(firma) @@ -186,6 +193,44 @@ Public Class usrCntlMitarbeiter End Sub + Public Sub showTIMAS() + locZeilen = -1 + If Not Grid_aktiv Then Exit Sub + + If dt.Columns.Count > 0 Then + + If txtSuche.Text <> "" Then + dt.DefaultView.RowFilter = "lastname like '%" & txtSuche.Text & "%' or firstname like '%" & txtSuche.Text & "%' or pnr1 like '%" & txtSuche.Text & "%' or info like '%" & txtSuche.Text & "%'" + Else + dt.DefaultView.RowFilter = Nothing + End If + + dgvTimasNew.DataSource = dt + + Else + Dim timas As New cTimasAPI() + timas.getEmployeeList(dt) + dgvTimasNew.DataSource = dt + + End If + With dgvTimasNew + + .RowTemplate.Height = 20 + .RowTemplate.DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopLeft + .AllowUserToAddRows = False + .AllowUserToDeleteRows = False + .AllowUserToOrderColumns = False + .AllowUserToResizeColumns = False + .AllowUserToResizeRows = False + .RowTemplate.ReadOnly = True + .RowHeadersVisible = False + .SelectionMode = DataGridViewSelectionMode.FullRowSelect + .AllowUserToOrderColumns = True + End With + + + End Sub + Private Sub sortDGV(dgv As DataGridView) With dgv @@ -364,6 +409,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 +464,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 +507,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() @@ -512,7 +558,7 @@ Public Class usrCntlMitarbeiter End Sub - Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click + Private Sub copyToClipboardWIKI() Try Me.Cursor = Cursors.WaitCursor Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -570,7 +616,47 @@ Public Class usrCntlMitarbeiter End Sub - Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click + Private Sub mnuItem_Clicked(sender As Object, e As EventArgs) + ContextMenuStrip1.Hide() + Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem) + + If item IsNot Nothing Then + If item.Name = "uploadPuctureToWiki" Then + uploadToWiki() + + ElseIf item.Name = "copyToClipboard" Then + copyToClipboardWIKI() + Else + MsgBox("Funktion nicht implementiert!") + End If + + End If + + End Sub + + + + Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click + If Not ContextMenuStrip2.Items.ContainsKey("uploadPuctureToWiki") Then + Dim uploadPictures = New ToolStripMenuItem() With {.Text = "Bilder ins WIKI hochladen", .Name = "uploadPuctureToWiki", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)} + ContextMenuStrip2.Items.Add(uploadPictures) + AddHandler uploadPictures.Click, AddressOf mnuItem_Clicked + End If + + + If Not ContextMenuStrip2.Items.ContainsKey("copyToClipboard") Then + Dim copyToClipboard = New ToolStripMenuItem() With {.Text = "In Zwischenablage kopieren", .Name = "copyToClipboard", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)} + AddHandler copyToClipboard.Click, AddressOf mnuItem_Clicked + ContextMenuStrip2.Items.Add(copyToClipboard) + End If + + + + ContextMenuStrip2.Show(Cursor.Position) + End Sub + + + Private Sub uploadToWiki() Me.Cursor = Cursors.WaitCursor Dim token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcGkiOjEsImdycCI6MSwiaWF0IjoxNjg3OTMzNDU3LCJleHAiOjE3MTk0OTEwNTcsImF1ZCI6InVybjp3aWtpLmpzIiwiaXNzIjoidXJuOndpa2kuanMifQ.ul2loFYVHdco2Ia2LcS4nme4PdgcuU6QKrunucECebX5LhcsSyuEg-lKiP2X3JXW57Ym4oCBjamDd5-5uqbQd9hOQ5CDO6yqK2r8TPNxivK29oAl2wfcHaKOe7QNti0yRlMpomJjc_5qaegeeLjN5w-lYbbqtSz_6y8GkPPr0P3l4coIk5IzngGazj8XLYGGN6y5qT4s8IR0sNhfz0hJAlIeVTeFKl8KFZMpFKvBnOjkL0GYOYjrHzPLSUAhe8hCGVcA7rWsweVjjvOclFDDFwZ0SwOY0TZqvz-LOsZ3V7ucQaT3flAjuHiEhODGJguQRBs67U8lVO2cxbJJyR3FUA" @@ -600,7 +686,7 @@ Public Class usrCntlMitarbeiter dgv = dgvFRONTOFFICE - ElseIf TabControl1.SelectedIndex = 5 Then + ElseIf TabControl1.SelectedIndex = 6 Then dgv = dgvVERIMEX @@ -610,7 +696,7 @@ Public Class usrCntlMitarbeiter For Each row As DataGridViewRow In dgv.Rows If row.Cells("mit_foto_DocId").Value > 0 Then Dim file = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(row.Cells("mit_foto_DocId").Value) - Dim succeess = uploadPictureToWiki(token, 4, file) 'Folder 4 -> Mitarbeiterfotos + Dim succeess = uploadPictureToWIKI(token, 4, file) 'Folder 4 -> Mitarbeiterfotos End If Next @@ -626,7 +712,7 @@ Public Class usrCntlMitarbeiter - Private Function uploadPictureToWiki(authenticationToken As String, folderIDx As Integer, image As String) As String + Private Function uploadPictureToWIKI(authenticationToken As String, folderIDx As Integer, image As String) As String Try VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index 67a6b34..84f28fc 100644 --- a/UID/My Project/Resources.Designer.vb +++ b/UID/My Project/Resources.Designer.vb @@ -14,7 +14,7 @@ Option Explicit On Imports System Namespace My.Resources - + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen @@ -22,20 +22,20 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then @@ -45,71 +45,81 @@ Namespace My.Resources Return resourceMan End Get End Property - + ''' ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get Set - resourceCulture = Value + resourceCulture = value End Set End Property - + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property active_directory_logo() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("active_directory_logo", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property admin() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("admin", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property admin_logo() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("admin_logo", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property admin_monitoring() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("admin_monitoring", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property admin1() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("admin1", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property admin2() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("admin2", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. ''' @@ -118,37 +128,37 @@ Namespace My.Resources Return ResourceManager.GetString("asd3ad2asd3asd2asd", resourceCulture) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. ''' Friend ReadOnly Property ATILLA_DURMAZ() As Byte() Get Dim obj As Object = ResourceManager.GetObject("ATILLA_DURMAZ", resourceCulture) - Return CType(obj, Byte()) + Return CType(obj,Byte()) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property Aviso() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("Aviso", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property aviso_tv() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("aviso_tv", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. ''' @@ -157,67 +167,67 @@ Namespace My.Resources Return ResourceManager.GetString("bbvn6", resourceCulture) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. ''' Friend ReadOnly Property Buergschaften_Jahresauswertung() As Byte() Get Dim obj As Object = ResourceManager.GetObject("Buergschaften_Jahresauswertung", resourceCulture) - Return CType(obj, Byte()) + Return CType(obj,Byte()) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. ''' Friend ReadOnly Property Buergschaften_JahresauswertungSplit() As Byte() Get Dim obj As Object = ResourceManager.GetObject("Buergschaften_JahresauswertungSplit", resourceCulture) - Return CType(obj, Byte()) + Return CType(obj,Byte()) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. ''' Friend ReadOnly Property Bürgschaften_Vorlage() As Byte() Get Dim obj As Object = ResourceManager.GetObject("Bürgschaften_Vorlage", resourceCulture) - Return CType(obj, Byte()) + Return CType(obj,Byte()) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property chain() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("chain", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property CMR() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("CMR", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property cmr_logo_klein() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("cmr_logo_klein", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt. ''' @@ -226,7 +236,7 @@ Namespace My.Resources Return ResourceManager.GetString("connStringAdmin", resourceCulture) End Get End Property - + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt. ''' @@ -235,7 +245,7 @@ Namespace My.Resources Return ResourceManager.GetString("connStringAdmin_DEF", resourceCulture) End Get End Property - + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt. ''' @@ -244,7 +254,7 @@ Namespace My.Resources Return ResourceManager.GetString("connStringFMZOLL", resourceCulture) End Get End Property - + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt. ''' @@ -253,357 +263,357 @@ Namespace My.Resources Return ResourceManager.GetString("connStringFMZOLL_DEV", resourceCulture) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property del() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("del", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. ''' Friend ReadOnly Property Dienstplan() As Byte() Get Dim obj As Object = ResourceManager.GetObject("Dienstplan", resourceCulture) - Return CType(obj, Byte()) + Return CType(obj,Byte()) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property dispo() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("dispo", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property dispo_ico() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("dispo_ico", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property doku_sym() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("doku_sym", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property dp_tv() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("dp_tv", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property DSC_0121() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("DSC_0121", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property Excel_2013_logo_155x110() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("Excel_2013_logo-155x110", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property fd() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("fd", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property fd1() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("fd1", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property gear() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("gear", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property gear1() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("gear1", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property gear2() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("gear2", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property kalender() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("kalender", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property krank() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("krank", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property parkzeit() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("parkzeit", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property personGray_m() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("personGray_m", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property personGray_w() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("personGray_w", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property plus() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("plus", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property printer() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("printer", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property refresh() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("refresh", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property refresh1() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("refresh1", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property reise() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("reise", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property sanduhr() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("sanduhr", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property save() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("save", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property schule() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("schule", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property sdl_ico() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("sdl_ico", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property search() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("search", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property spedbuch() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("spedbuch", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property stift() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("stift", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property uhr_green() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("uhr_green", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property uhr_notime() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("uhr_notime", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property uhr_red() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("uhr_red", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property uid() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("uid", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property uid_ico() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("uid_ico", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Zeichenfolge, die 4.0 ähnelt. ''' @@ -612,64 +622,64 @@ Namespace My.Resources Return ResourceManager.GetString("UpdaterVersion", resourceCulture) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property urlaub() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("urlaub", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property urlaub1() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("urlaub1", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property Verag_Academy_blue() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("Verag_Academy_blue", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property Verag_AG_Logo() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("Verag_AG_Logo", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property Verag_AG_Logopng() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("Verag_AG_Logopng", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property - + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Friend ReadOnly Property wait() As System.Drawing.Bitmap Get Dim obj As Object = ResourceManager.GetObject("wait", resourceCulture) - Return CType(obj, System.Drawing.Bitmap) + Return CType(obj,System.Drawing.Bitmap) End Get End Property End Module diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index 254e3f3..57b5c48 100644 --- a/UID/My Project/Resources.resx +++ b/UID/My Project/Resources.resx @@ -118,190 +118,193 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\sdl_ico1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\chain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\DSC_0121.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Verag-AG-Logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\uid1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\kalender.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Verag-Academy_blue.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\reise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; - - - ..\Resources\cmr-logo_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\wait.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\spedbuch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\fd.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\buergschaften_jahresauswertungsplit.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\uid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\dispo_ico1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\aviso_tv.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ATILLA_DURMAZ.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; - - - ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; - - - ..\Resources\refresh1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\uhr_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\admin2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\admin1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\admin_monitoring1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; - - - ..\Resources\urlaub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Buergschaften_Jahresauswertung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\urlaub1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - 4.0 - - - ..\Resources\krank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Excel_2013_logo-155x110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\gear1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\admin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\doku_sym1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\gear2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\dispo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\dp_tv.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\admin2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\CMR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\fd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\uhr_notime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\schule.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Aviso.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Dienstplan.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\bürgschaften_vorlage.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\1374582040_38117.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; - - ..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\schule.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\krank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\personGray_m.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Buergschaften_Jahresauswertung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\gear2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - + + ..\Resources\doku_sym1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\uhr_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dispo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\refresh1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\admin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\personGray_m.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dispo_ico1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\cmr-logo_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Verag-Academy_blue.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\kalender.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\fd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\fd.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\active_directory2_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\CMR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\spedbuch.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\admin1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\reise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\uhr_notime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; + + + + + + ..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\uid1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Dienstplan.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\admin2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Aviso.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\DSC_0121.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\admin_monitoring1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; + + + ..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\aviso_tv.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\wait.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\urlaub1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\urlaub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\gear1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + 4.0 + + + ..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\1374582040_38117.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Verag-AG-Logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; + + + ..\Resources\chain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\uid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\sdl_ico1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Excel_2013_logo-155x110.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\buergschaften_jahresauswertungsplit.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\admin2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ATILLA_DURMAZ.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/UID/Resources/TiMaS-Paket-Time.png b/UID/Resources/TiMaS-Paket-Time.png new file mode 100644 index 0000000..de71c23 Binary files /dev/null and b/UID/Resources/TiMaS-Paket-Time.png differ diff --git a/UID/Resources/active_directory2_logo.png b/UID/Resources/active_directory2_logo.png new file mode 100644 index 0000000..b948eff Binary files /dev/null and b/UID/Resources/active_directory2_logo.png differ diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb index 5e043b5..cec9357 100644 --- a/UID/cSqlDb.vb +++ b/UID/cSqlDb.vb @@ -1550,8 +1550,8 @@ Public Class cMitarbeiter 'Änderung Dim sql = "INSERT INTO tblMitarbeiter " & - "(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe, mit_CSuser, mit_CSpwd ) OUTPUT INSERTED.mit_id VALUES " & - "(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe, @mit_CSuser, @mit_CSpwd )" + "(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe, mit_CSuser, mit_CSpwd, mit_PersonalNr, mit_telefonnr ) OUTPUT INSERTED.mit_id VALUES " & + "(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe, @mit_CSuser, @mit_CSpwd, @mit_PersonalNr, @mit_telefonnr)" @@ -1624,7 +1624,8 @@ Public Class cMitarbeiter cmd.Parameters.AddWithValue("@mit_CSuser", If(m.mit_CSuser, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_CSpwd", If(m.mit_CSpwd, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_id", DBNull.Value) - + cmd.Parameters.AddWithValue("@mit_PersonalNr", If(m.mit_PersonalNr, DBNull.Value)) + cmd.Parameters.AddWithValue("@mit_telefonnr", If(m.mit_telefonnr, DBNull.Value)) Try mid = cmd.ExecuteScalar() @@ -1643,7 +1644,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_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_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 " & " WHERE mit_id=@mit_id " @@ -1717,7 +1718,8 @@ Public Class cMitarbeiter cmd.Parameters.AddWithValue("@mit_fakturierungsgruppe", m.mit_fakturierungsgruppe) cmd.Parameters.AddWithValue("@mit_CSuser", If(m.mit_CSuser, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_CSpwd", If(m.mit_CSpwd, DBNull.Value)) - + cmd.Parameters.AddWithValue("@mit_PersonalNr", If(m.mit_PersonalNr, DBNull.Value)) + cmd.Parameters.AddWithValue("@mit_telefonnr", If(m.mit_telefonnr, DBNull.Value)) 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