diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index f5c2f99..8eddb4b 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -1058,6 +1058,7 @@ + diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb index 5578fe9..b11f597 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb @@ -76,33 +76,10 @@ Partial Class frmMitarbDetails Me.Label58 = New System.Windows.Forms.Label() Me.txtCSUser = New System.Windows.Forms.TextBox() Me.Label59 = New System.Windows.Forms.Label() - Me.TabPage6 = New System.Windows.Forms.TabPage() - Me.Label63 = New System.Windows.Forms.Label() - Me.txtClientNr = New System.Windows.Forms.TextBox() - Me.btnDelete = New System.Windows.Forms.Button() - Me.TabControl1 = New System.Windows.Forms.TabControl() - Me.rtfInfoTimas = New System.Windows.Forms.RichTextBox() - Me.btngetInfo = New System.Windows.Forms.Button() - Me.cbxTimasAngelegt = New System.Windows.Forms.CheckBox() - Me.txtLohnNr = New System.Windows.Forms.TextBox() - Me.btnMAanlegen = New System.Windows.Forms.Button() - Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.TabPage7 = New System.Windows.Forms.TabPage() Me.lbSprachen = New VERAG_PROG_ALLGEMEIN.MyListBox() Me.Label4 = New System.Windows.Forms.Label() Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.cbabwJahresurlaub = New System.Windows.Forms.CheckBox() - Me.lblHoursOrDays2 = New System.Windows.Forms.Label() - Me.lblHoursOrDays1 = New System.Windows.Forms.Label() - Me.cboDaysPerWeek = New System.Windows.Forms.ComboBox() - Me.lblTage = New System.Windows.Forms.Label() - Me.Label67 = New System.Windows.Forms.Label() - Me.txtWoStd = New System.Windows.Forms.TextBox() - Me.Label66 = New System.Windows.Forms.Label() - Me.txtaliquUA = New System.Windows.Forms.TextBox() - Me.txtUrlaubsabsp = New System.Windows.Forms.TextBox() - Me.Label65 = New System.Windows.Forms.Label() - Me.cbUrlaubInStund = New System.Windows.Forms.CheckBox() Me.txtTelNr = New System.Windows.Forms.TextBox() Me.btnUpdateAD = New System.Windows.Forms.Button() Me.txtEmailExtension = New System.Windows.Forms.TextBox() @@ -148,6 +125,7 @@ Partial Class frmMitarbDetails Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label9 = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.cbxTimasNichtStempeln1 = New System.Windows.Forms.CheckBox() Me.txtprivateEMail = New System.Windows.Forms.TextBox() Me.Label64 = New System.Windows.Forms.Label() Me.cbxHO = New System.Windows.Forms.CheckBox() @@ -223,8 +201,37 @@ Partial Class frmMitarbDetails Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.cboAdminBer = New System.Windows.Forms.ComboBox() Me.Label7 = New System.Windows.Forms.Label() + Me.TabPage8 = New System.Windows.Forms.TabPage() + Me.Button7 = New System.Windows.Forms.Button() + Me.TabControl3 = New System.Windows.Forms.TabControl() + Me.rtfInfoTimas = New System.Windows.Forms.RichTextBox() + Me.btngetInfo = New System.Windows.Forms.Button() + Me.Label72 = New System.Windows.Forms.Label() + Me.Label71 = New System.Windows.Forms.Label() + Me.txtClientNr = New System.Windows.Forms.TextBox() + Me.btnDelete = New System.Windows.Forms.Button() + Me.cbxTimasAngelegt = New System.Windows.Forms.CheckBox() + Me.txtLohnNr = New System.Windows.Forms.TextBox() + Me.btnMAanlegen = New System.Windows.Forms.Button() + Me.lblEintrittsdatum = New System.Windows.Forms.Label() + Me.Label70 = New System.Windows.Forms.Label() + Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.Label69 = New System.Windows.Forms.Label() + Me.Label68 = New System.Windows.Forms.Label() + Me.cbabwJahresurlaub = New System.Windows.Forms.CheckBox() + Me.lblHoursOrDays2 = New System.Windows.Forms.Label() + Me.lblHoursOrDays1 = New System.Windows.Forms.Label() + Me.cboDaysPerWeek = New System.Windows.Forms.ComboBox() + Me.lblTage = New System.Windows.Forms.Label() + Me.Label67 = New System.Windows.Forms.Label() + Me.txtWoStd = New System.Windows.Forms.TextBox() + Me.Label66 = New System.Windows.Forms.Label() + Me.txtaliquUA = New System.Windows.Forms.TextBox() + Me.txtUrlaubsabsp = New System.Windows.Forms.TextBox() + Me.Label65 = New System.Windows.Forms.Label() + Me.cbUrlaubInStund = New System.Windows.Forms.CheckBox() + Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.cbxTimasNichtStempeln1 = New System.Windows.Forms.CheckBox() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.TabControl2.SuspendLayout() @@ -233,8 +240,6 @@ Partial Class frmMitarbDetails Me.TabPage2.SuspendLayout() Me.TabPage4.SuspendLayout() Me.TabPage5.SuspendLayout() - Me.TabPage6.SuspendLayout() - CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage7.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.GroupBox1.SuspendLayout() @@ -247,6 +252,9 @@ Partial Class frmMitarbDetails CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabPage8.SuspendLayout() + CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'PictureBox1 @@ -345,6 +353,7 @@ Partial Class frmMitarbDetails ' Me.TabControl2.Controls.Add(Me.TabPage1) Me.TabControl2.Controls.Add(Me.TabPage3) + Me.TabControl2.Controls.Add(Me.TabPage8) Me.TabControl2.Location = New System.Drawing.Point(12, 63) Me.TabControl2.Name = "TabControl2" Me.TabControl2.SelectedIndex = 0 @@ -371,7 +380,6 @@ Partial Class frmMitarbDetails Me.tbcntr.Controls.Add(Me.TabPage2) Me.tbcntr.Controls.Add(Me.TabPage4) Me.tbcntr.Controls.Add(Me.TabPage5) - Me.tbcntr.Controls.Add(Me.TabPage6) Me.tbcntr.Controls.Add(Me.TabPage7) Me.tbcntr.Location = New System.Drawing.Point(2, 539) Me.tbcntr.Name = "tbcntr" @@ -847,125 +855,6 @@ Partial Class frmMitarbDetails Me.Label59.TabIndex = 117 Me.Label59.Text = "Benutzer" ' - 'TabPage6 - ' - Me.TabPage6.Controls.Add(Me.Label63) - Me.TabPage6.Controls.Add(Me.txtClientNr) - Me.TabPage6.Controls.Add(Me.btnDelete) - Me.TabPage6.Controls.Add(Me.TabControl1) - Me.TabPage6.Controls.Add(Me.rtfInfoTimas) - Me.TabPage6.Controls.Add(Me.btngetInfo) - Me.TabPage6.Controls.Add(Me.cbxTimasAngelegt) - Me.TabPage6.Controls.Add(Me.txtLohnNr) - Me.TabPage6.Controls.Add(Me.btnMAanlegen) - Me.TabPage6.Controls.Add(Me.dgvData) - Me.TabPage6.Location = New System.Drawing.Point(4, 22) - Me.TabPage6.Name = "TabPage6" - Me.TabPage6.Size = New System.Drawing.Size(442, 174) - Me.TabPage6.TabIndex = 3 - Me.TabPage6.Text = "Zeiterfassung" - Me.TabPage6.UseVisualStyleBackColor = True - ' - 'Label63 - ' - Me.Label63.AutoSize = True - Me.Label63.Location = New System.Drawing.Point(232, 7) - Me.Label63.Name = "Label63" - Me.Label63.Size = New System.Drawing.Size(12, 13) - Me.Label63.TabIndex = 125 - Me.Label63.Text = "/" - ' - 'txtClientNr - ' - Me.txtClientNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtClientNr.Location = New System.Drawing.Point(248, 3) - Me.txtClientNr.Name = "txtClientNr" - Me.txtClientNr.Size = New System.Drawing.Size(56, 20) - Me.txtClientNr.TabIndex = 124 - ' - 'btnDelete - ' - Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btnDelete.BackColor = System.Drawing.Color.White - Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDelete.Location = New System.Drawing.Point(310, 0) - Me.btnDelete.Name = "btnDelete" - Me.btnDelete.Size = New System.Drawing.Size(55, 26) - Me.btnDelete.TabIndex = 123 - Me.btnDelete.Text = "löschen" - Me.btnDelete.UseVisualStyleBackColor = False - Me.btnDelete.Visible = False - ' - '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(434, 145) - Me.TabControl1.TabIndex = 122 - ' - 'rtfInfoTimas - ' - Me.rtfInfoTimas.Location = New System.Drawing.Point(3, 27) - Me.rtfInfoTimas.Name = "rtfInfoTimas" - Me.rtfInfoTimas.Size = New System.Drawing.Size(363, 144) - Me.rtfInfoTimas.TabIndex = 97 - Me.rtfInfoTimas.Text = "" - ' - 'btngetInfo - ' - Me.btngetInfo.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btngetInfo.BackColor = System.Drawing.Color.White - Me.btngetInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btngetInfo.Location = New System.Drawing.Point(398, 0) - Me.btngetInfo.Name = "btngetInfo" - Me.btngetInfo.Size = New System.Drawing.Size(44, 26) - Me.btngetInfo.TabIndex = 117 - Me.btngetInfo.Text = "Info" - Me.btngetInfo.UseVisualStyleBackColor = False - ' - 'cbxTimasAngelegt - ' - 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(2, 5) - Me.cbxTimasAngelegt.Name = "cbxTimasAngelegt" - Me.cbxTimasAngelegt.Size = New System.Drawing.Size(157, 17) - Me.cbxTimasAngelegt.TabIndex = 116 - Me.cbxTimasAngelegt.Text = "Account - PNr (Lohn)/Client" - Me.cbxTimasAngelegt.UseVisualStyleBackColor = True - ' - 'txtLohnNr - ' - Me.txtLohnNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtLohnNr.Location = New System.Drawing.Point(179, 3) - Me.txtLohnNr.Name = "txtLohnNr" - Me.txtLohnNr.Size = New System.Drawing.Size(37, 20) - Me.txtLohnNr.TabIndex = 114 - ' - 'btnMAanlegen - ' - Me.btnMAanlegen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btnMAanlegen.BackColor = System.Drawing.Color.White - Me.btnMAanlegen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnMAanlegen.Location = New System.Drawing.Point(374, 0) - Me.btnMAanlegen.Name = "btnMAanlegen" - Me.btnMAanlegen.Size = New System.Drawing.Size(68, 26) - Me.btnMAanlegen.TabIndex = 54 - Me.btnMAanlegen.Text = "anlegen" - Me.btnMAanlegen.UseVisualStyleBackColor = 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, 27) - Me.dgvData.Name = "dgvData" - Me.dgvData.Size = New System.Drawing.Size(364, 144) - Me.dgvData.TabIndex = 118 - ' 'TabPage7 ' Me.TabPage7.Controls.Add(Me.lbSprachen) @@ -999,18 +888,6 @@ Partial Class frmMitarbDetails ' 'GroupBox2 ' - Me.GroupBox2.Controls.Add(Me.cbabwJahresurlaub) - Me.GroupBox2.Controls.Add(Me.lblHoursOrDays2) - Me.GroupBox2.Controls.Add(Me.lblHoursOrDays1) - Me.GroupBox2.Controls.Add(Me.cboDaysPerWeek) - Me.GroupBox2.Controls.Add(Me.lblTage) - Me.GroupBox2.Controls.Add(Me.Label67) - Me.GroupBox2.Controls.Add(Me.txtWoStd) - Me.GroupBox2.Controls.Add(Me.Label66) - Me.GroupBox2.Controls.Add(Me.txtaliquUA) - Me.GroupBox2.Controls.Add(Me.txtUrlaubsabsp) - Me.GroupBox2.Controls.Add(Me.Label65) - Me.GroupBox2.Controls.Add(Me.cbUrlaubInStund) Me.GroupBox2.Controls.Add(Me.txtTelNr) Me.GroupBox2.Controls.Add(Me.btnUpdateAD) Me.GroupBox2.Controls.Add(Me.txtEmailExtension) @@ -1063,123 +940,6 @@ Partial Class frmMitarbDetails Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Firmendaten" ' - 'cbabwJahresurlaub - ' - Me.cbabwJahresurlaub.AutoSize = True - Me.cbabwJahresurlaub.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbabwJahresurlaub.Location = New System.Drawing.Point(452, 234) - Me.cbabwJahresurlaub.Name = "cbabwJahresurlaub" - Me.cbabwJahresurlaub.Size = New System.Drawing.Size(119, 17) - Me.cbabwJahresurlaub.TabIndex = 122 - Me.cbabwJahresurlaub.Text = "abw.Jahresur.-Ansp" - Me.cbabwJahresurlaub.UseVisualStyleBackColor = True - ' - 'lblHoursOrDays2 - ' - Me.lblHoursOrDays2.AutoSize = True - Me.lblHoursOrDays2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblHoursOrDays2.Location = New System.Drawing.Point(695, 262) - Me.lblHoursOrDays2.Name = "lblHoursOrDays2" - Me.lblHoursOrDays2.Size = New System.Drawing.Size(0, 13) - Me.lblHoursOrDays2.TabIndex = 121 - Me.lblHoursOrDays2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - ' - 'lblHoursOrDays1 - ' - Me.lblHoursOrDays1.AutoSize = True - Me.lblHoursOrDays1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblHoursOrDays1.Location = New System.Drawing.Point(695, 238) - Me.lblHoursOrDays1.Name = "lblHoursOrDays1" - Me.lblHoursOrDays1.Size = New System.Drawing.Size(0, 13) - Me.lblHoursOrDays1.TabIndex = 120 - Me.lblHoursOrDays1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - ' - 'cboDaysPerWeek - ' - Me.cboDaysPerWeek.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboDaysPerWeek.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboDaysPerWeek.FormattingEnabled = True - Me.cboDaysPerWeek.Items.AddRange(New Object() {"", "1", "2", "3", "4", "5"}) - Me.cboDaysPerWeek.Location = New System.Drawing.Point(406, 254) - Me.cboDaysPerWeek.Name = "cboDaysPerWeek" - Me.cboDaysPerWeek.Size = New System.Drawing.Size(40, 21) - Me.cboDaysPerWeek.TabIndex = 119 - ' - 'lblTage - ' - Me.lblTage.AutoSize = True - Me.lblTage.Location = New System.Drawing.Point(324, 262) - Me.lblTage.Name = "lblTage" - Me.lblTage.Size = New System.Drawing.Size(77, 13) - Me.lblTage.TabIndex = 117 - Me.lblTage.Text = "Tagewoche:" - ' - 'Label67 - ' - Me.Label67.AutoSize = True - Me.Label67.Location = New System.Drawing.Point(324, 239) - Me.Label67.Name = "Label67" - Me.Label67.Size = New System.Drawing.Size(77, 13) - Me.Label67.TabIndex = 116 - Me.Label67.Text = "WochenStd:" - ' - 'txtWoStd - ' - Me.txtWoStd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtWoStd.Location = New System.Drawing.Point(402, 232) - Me.txtWoStd.Name = "txtWoStd" - Me.txtWoStd.Size = New System.Drawing.Size(44, 20) - Me.txtWoStd.TabIndex = 118 - ' - 'Label66 - ' - Me.Label66.AutoSize = True - Me.Label66.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label66.Location = New System.Drawing.Point(570, 261) - Me.Label66.Name = "Label66" - Me.Label66.Size = New System.Drawing.Size(72, 13) - Me.Label66.TabIndex = 115 - Me.Label66.Text = "aliqu. Urlaub.:" - ' - 'txtaliquUA - ' - Me.txtaliquUA.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtaliquUA.Location = New System.Drawing.Point(646, 258) - Me.txtaliquUA.Name = "txtaliquUA" - Me.txtaliquUA.Size = New System.Drawing.Size(46, 20) - Me.txtaliquUA.TabIndex = 114 - Me.txtaliquUA.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtUrlaubsabsp - ' - Me.txtUrlaubsabsp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtUrlaubsabsp.Location = New System.Drawing.Point(646, 232) - Me.txtUrlaubsabsp.Name = "txtUrlaubsabsp" - Me.txtUrlaubsabsp.Size = New System.Drawing.Size(45, 20) - Me.txtUrlaubsabsp.TabIndex = 97 - Me.txtUrlaubsabsp.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'Label65 - ' - Me.Label65.AutoSize = True - Me.Label65.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label65.Location = New System.Drawing.Point(570, 235) - Me.Label65.Name = "Label65" - Me.Label65.Size = New System.Drawing.Size(70, 13) - Me.Label65.TabIndex = 98 - Me.Label65.Text = "Jahresanspr.:" - ' - 'cbUrlaubInStund - ' - Me.cbUrlaubInStund.AutoSize = True - Me.cbUrlaubInStund.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbUrlaubInStund.Location = New System.Drawing.Point(452, 257) - Me.cbUrlaubInStund.Name = "cbUrlaubInStund" - Me.cbUrlaubInStund.Size = New System.Drawing.Size(87, 17) - Me.cbUrlaubInStund.TabIndex = 97 - Me.cbUrlaubInStund.Text = "Urlaub in Std" - Me.cbUrlaubInStund.UseVisualStyleBackColor = True - ' 'txtTelNr ' Me.txtTelNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -1673,6 +1433,17 @@ Partial Class frmMitarbDetails Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Person" ' + 'cbxTimasNichtStempeln1 + ' + Me.cbxTimasNichtStempeln1.AutoSize = True + Me.cbxTimasNichtStempeln1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxTimasNichtStempeln1.Location = New System.Drawing.Point(523, 182) + Me.cbxTimasNichtStempeln1.Name = "cbxTimasNichtStempeln1" + Me.cbxTimasNichtStempeln1.Size = New System.Drawing.Size(164, 17) + Me.cbxTimasNichtStempeln1.TabIndex = 97 + Me.cbxTimasNichtStempeln1.Text = "Zeiterfassung: Kein Stempeln" + Me.cbxTimasNichtStempeln1.UseVisualStyleBackColor = True + ' 'txtprivateEMail ' Me.txtprivateEMail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -2480,22 +2251,343 @@ Partial Class frmMitarbDetails Me.Label7.TabIndex = 78 Me.Label7.Text = "Berechtigung:" ' + 'TabPage8 + ' + Me.TabPage8.Controls.Add(Me.Button7) + Me.TabPage8.Controls.Add(Me.TabControl3) + Me.TabPage8.Controls.Add(Me.rtfInfoTimas) + Me.TabPage8.Controls.Add(Me.btngetInfo) + Me.TabPage8.Controls.Add(Me.Label72) + Me.TabPage8.Controls.Add(Me.Label71) + Me.TabPage8.Controls.Add(Me.txtClientNr) + Me.TabPage8.Controls.Add(Me.btnDelete) + Me.TabPage8.Controls.Add(Me.cbxTimasAngelegt) + Me.TabPage8.Controls.Add(Me.txtLohnNr) + Me.TabPage8.Controls.Add(Me.btnMAanlegen) + Me.TabPage8.Controls.Add(Me.lblEintrittsdatum) + Me.TabPage8.Controls.Add(Me.Label70) + Me.TabPage8.Controls.Add(Me.dgvUberstundenauszahlungen) + Me.TabPage8.Controls.Add(Me.Label69) + Me.TabPage8.Controls.Add(Me.Label68) + Me.TabPage8.Controls.Add(Me.cbabwJahresurlaub) + Me.TabPage8.Controls.Add(Me.lblHoursOrDays2) + Me.TabPage8.Controls.Add(Me.lblHoursOrDays1) + Me.TabPage8.Controls.Add(Me.cboDaysPerWeek) + Me.TabPage8.Controls.Add(Me.lblTage) + Me.TabPage8.Controls.Add(Me.Label67) + Me.TabPage8.Controls.Add(Me.txtWoStd) + Me.TabPage8.Controls.Add(Me.txtaliquUA) + Me.TabPage8.Controls.Add(Me.txtUrlaubsabsp) + Me.TabPage8.Controls.Add(Me.Label65) + Me.TabPage8.Controls.Add(Me.cbUrlaubInStund) + Me.TabPage8.Controls.Add(Me.dgvData) + Me.TabPage8.Controls.Add(Me.Label66) + Me.TabPage8.Location = New System.Drawing.Point(4, 22) + Me.TabPage8.Name = "TabPage8" + Me.TabPage8.Size = New System.Drawing.Size(715, 747) + Me.TabPage8.TabIndex = 2 + Me.TabPage8.Text = "Zeiterfassung" + Me.TabPage8.UseVisualStyleBackColor = True + ' + 'Button7 + ' + Me.Button7.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button7.BackColor = System.Drawing.Color.White + Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button7.Location = New System.Drawing.Point(612, 143) + Me.Button7.Name = "Button7" + Me.Button7.Size = New System.Drawing.Size(81, 26) + Me.Button7.TabIndex = 150 + Me.Button7.Text = "zu Timas" + Me.Button7.UseVisualStyleBackColor = False + ' + 'TabControl3 + ' + Me.TabControl3.Location = New System.Drawing.Point(24, 172) + Me.TabControl3.Name = "TabControl3" + Me.TabControl3.SelectedIndex = 0 + Me.TabControl3.Size = New System.Drawing.Size(669, 280) + Me.TabControl3.TabIndex = 142 + ' + 'rtfInfoTimas + ' + Me.rtfInfoTimas.Location = New System.Drawing.Point(24, 172) + Me.rtfInfoTimas.Name = "rtfInfoTimas" + Me.rtfInfoTimas.Size = New System.Drawing.Size(363, 183) + Me.rtfInfoTimas.TabIndex = 148 + Me.rtfInfoTimas.Text = "" + ' + 'btngetInfo + ' + Me.btngetInfo.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.btngetInfo.BackColor = System.Drawing.Color.White + Me.btngetInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btngetInfo.Location = New System.Drawing.Point(401, 139) + Me.btngetInfo.Name = "btngetInfo" + Me.btngetInfo.Size = New System.Drawing.Size(44, 26) + Me.btngetInfo.TabIndex = 147 + Me.btngetInfo.Text = "Info" + Me.btngetInfo.UseVisualStyleBackColor = False + ' + 'Label72 + ' + Me.Label72.AutoSize = True + Me.Label72.Cursor = System.Windows.Forms.Cursors.Default + Me.Label72.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label72.Location = New System.Drawing.Point(13, 122) + Me.Label72.Name = "Label72" + Me.Label72.Size = New System.Drawing.Size(103, 16) + Me.Label72.TabIndex = 146 + Me.Label72.Text = "Anlage TiMas" + ' + 'Label71 + ' + Me.Label71.AutoSize = True + Me.Label71.Location = New System.Drawing.Point(235, 147) + Me.Label71.Name = "Label71" + Me.Label71.Size = New System.Drawing.Size(12, 13) + Me.Label71.TabIndex = 145 + Me.Label71.Text = "/" + ' + 'txtClientNr + ' + Me.txtClientNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtClientNr.Location = New System.Drawing.Point(251, 143) + Me.txtClientNr.Name = "txtClientNr" + Me.txtClientNr.Size = New System.Drawing.Size(56, 20) + Me.txtClientNr.TabIndex = 144 + ' + 'btnDelete + ' + Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.btnDelete.BackColor = System.Drawing.Color.White + Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDelete.Location = New System.Drawing.Point(313, 140) + Me.btnDelete.Name = "btnDelete" + Me.btnDelete.Size = New System.Drawing.Size(55, 26) + Me.btnDelete.TabIndex = 143 + Me.btnDelete.Text = "löschen" + Me.btnDelete.UseVisualStyleBackColor = False + Me.btnDelete.Visible = False + ' + 'cbxTimasAngelegt + ' + 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(19, 146) + Me.cbxTimasAngelegt.Name = "cbxTimasAngelegt" + Me.cbxTimasAngelegt.Size = New System.Drawing.Size(157, 17) + Me.cbxTimasAngelegt.TabIndex = 141 + Me.cbxTimasAngelegt.Text = "Account - PNr (Lohn)/Client" + Me.cbxTimasAngelegt.UseVisualStyleBackColor = True + ' + 'txtLohnNr + ' + Me.txtLohnNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtLohnNr.Location = New System.Drawing.Point(182, 143) + Me.txtLohnNr.Name = "txtLohnNr" + Me.txtLohnNr.Size = New System.Drawing.Size(37, 20) + Me.txtLohnNr.TabIndex = 140 + ' + 'btnMAanlegen + ' + Me.btnMAanlegen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.btnMAanlegen.BackColor = System.Drawing.Color.White + Me.btnMAanlegen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMAanlegen.Location = New System.Drawing.Point(377, 140) + Me.btnMAanlegen.Name = "btnMAanlegen" + Me.btnMAanlegen.Size = New System.Drawing.Size(68, 26) + Me.btnMAanlegen.TabIndex = 139 + Me.btnMAanlegen.Text = "anlegen" + Me.btnMAanlegen.UseVisualStyleBackColor = False + ' + 'lblEintrittsdatum + ' + Me.lblEintrittsdatum.AutoSize = True + Me.lblEintrittsdatum.Location = New System.Drawing.Point(96, 35) + Me.lblEintrittsdatum.Name = "lblEintrittsdatum" + Me.lblEintrittsdatum.Size = New System.Drawing.Size(61, 13) + Me.lblEintrittsdatum.TabIndex = 138 + Me.lblEintrittsdatum.Text = "01.01.2020" + ' + 'Label70 + ' + Me.Label70.AutoSize = True + Me.Label70.Location = New System.Drawing.Point(13, 35) + Me.Label70.Name = "Label70" + Me.Label70.Size = New System.Drawing.Size(73, 13) + Me.Label70.TabIndex = 137 + Me.Label70.Text = "Eintrittsdatum:" + ' + 'dgvUberstundenauszahlungen + ' + Me.dgvUberstundenauszahlungen.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvUberstundenauszahlungen.AllowUserToAddRows = False + Me.dgvUberstundenauszahlungen.AllowUserToDeleteRows = False + Me.dgvUberstundenauszahlungen.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.ColumnHeader + Me.dgvUberstundenauszahlungen.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllHeaders + Me.dgvUberstundenauszahlungen.BackgroundColor = System.Drawing.Color.White + Me.dgvUberstundenauszahlungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvUberstundenauszahlungen.Location = New System.Drawing.Point(6, 489) + Me.dgvUberstundenauszahlungen.Name = "dgvUberstundenauszahlungen" + Me.dgvUberstundenauszahlungen.ReadOnly = True + Me.dgvUberstundenauszahlungen.Size = New System.Drawing.Size(703, 255) + Me.dgvUberstundenauszahlungen.TabIndex = 136 + ' + 'Label69 + ' + Me.Label69.AutoSize = True + Me.Label69.Cursor = System.Windows.Forms.Cursors.Default + Me.Label69.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label69.Location = New System.Drawing.Point(13, 470) + Me.Label69.Name = "Label69" + Me.Label69.Size = New System.Drawing.Size(190, 16) + Me.Label69.TabIndex = 135 + Me.Label69.Text = "Überstundenauszahlungen" + ' + 'Label68 + ' + Me.Label68.AutoSize = True + Me.Label68.Cursor = System.Windows.Forms.Cursors.Default + Me.Label68.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label68.Location = New System.Drawing.Point(13, 10) + Me.Label68.Name = "Label68" + Me.Label68.Size = New System.Drawing.Size(151, 16) + Me.Label68.TabIndex = 94 + Me.Label68.Text = "Urlaubsaliquotierung" + ' + 'cbabwJahresurlaub + ' + Me.cbabwJahresurlaub.AutoSize = True + Me.cbabwJahresurlaub.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbabwJahresurlaub.Location = New System.Drawing.Point(144, 53) + Me.cbabwJahresurlaub.Name = "cbabwJahresurlaub" + Me.cbabwJahresurlaub.Size = New System.Drawing.Size(119, 17) + Me.cbabwJahresurlaub.TabIndex = 134 + Me.cbabwJahresurlaub.Text = "abw.Jahresur.-Ansp" + Me.cbabwJahresurlaub.UseVisualStyleBackColor = True + ' + 'lblHoursOrDays2 + ' + Me.lblHoursOrDays2.AutoSize = True + Me.lblHoursOrDays2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblHoursOrDays2.Location = New System.Drawing.Point(472, 76) + Me.lblHoursOrDays2.Name = "lblHoursOrDays2" + Me.lblHoursOrDays2.Size = New System.Drawing.Size(0, 13) + Me.lblHoursOrDays2.TabIndex = 133 + Me.lblHoursOrDays2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'lblHoursOrDays1 + ' + Me.lblHoursOrDays1.AutoSize = True + Me.lblHoursOrDays1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblHoursOrDays1.Location = New System.Drawing.Point(471, 54) + Me.lblHoursOrDays1.Name = "lblHoursOrDays1" + Me.lblHoursOrDays1.Size = New System.Drawing.Size(0, 13) + Me.lblHoursOrDays1.TabIndex = 132 + Me.lblHoursOrDays1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'cboDaysPerWeek + ' + Me.cboDaysPerWeek.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboDaysPerWeek.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboDaysPerWeek.FormattingEnabled = True + Me.cboDaysPerWeek.Items.AddRange(New Object() {"", "1", "2", "3", "4", "5"}) + Me.cboDaysPerWeek.Location = New System.Drawing.Point(95, 73) + Me.cboDaysPerWeek.Name = "cboDaysPerWeek" + Me.cboDaysPerWeek.Size = New System.Drawing.Size(40, 21) + Me.cboDaysPerWeek.TabIndex = 131 + ' + 'lblTage + ' + Me.lblTage.AutoSize = True + Me.lblTage.Location = New System.Drawing.Point(13, 81) + Me.lblTage.Name = "lblTage" + Me.lblTage.Size = New System.Drawing.Size(67, 13) + Me.lblTage.TabIndex = 129 + Me.lblTage.Text = "Tagewoche:" + ' + 'Label67 + ' + Me.Label67.AutoSize = True + Me.Label67.Location = New System.Drawing.Point(13, 58) + Me.Label67.Name = "Label67" + Me.Label67.Size = New System.Drawing.Size(67, 13) + Me.Label67.TabIndex = 128 + Me.Label67.Text = "WochenStd:" + ' + 'txtWoStd + ' + Me.txtWoStd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtWoStd.Location = New System.Drawing.Point(91, 51) + Me.txtWoStd.Name = "txtWoStd" + Me.txtWoStd.Size = New System.Drawing.Size(44, 20) + Me.txtWoStd.TabIndex = 130 + ' + 'Label66 + ' + Me.Label66.AutoSize = True + Me.Label66.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label66.Location = New System.Drawing.Point(344, 76) + Me.Label66.Name = "Label66" + Me.Label66.Size = New System.Drawing.Size(72, 13) + Me.Label66.TabIndex = 127 + Me.Label66.Text = "aliqu. Urlaub.:" + ' + 'txtaliquUA + ' + Me.txtaliquUA.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtaliquUA.Location = New System.Drawing.Point(420, 73) + Me.txtaliquUA.Name = "txtaliquUA" + Me.txtaliquUA.Size = New System.Drawing.Size(46, 20) + Me.txtaliquUA.TabIndex = 126 + Me.txtaliquUA.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtUrlaubsabsp + ' + Me.txtUrlaubsabsp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtUrlaubsabsp.Location = New System.Drawing.Point(420, 47) + Me.txtUrlaubsabsp.Name = "txtUrlaubsabsp" + Me.txtUrlaubsabsp.Size = New System.Drawing.Size(45, 20) + Me.txtUrlaubsabsp.TabIndex = 123 + Me.txtUrlaubsabsp.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label65 + ' + Me.Label65.AutoSize = True + Me.Label65.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label65.Location = New System.Drawing.Point(344, 50) + Me.Label65.Name = "Label65" + Me.Label65.Size = New System.Drawing.Size(70, 13) + Me.Label65.TabIndex = 125 + Me.Label65.Text = "Jahresanspr.:" + ' + 'cbUrlaubInStund + ' + Me.cbUrlaubInStund.AutoSize = True + Me.cbUrlaubInStund.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbUrlaubInStund.Location = New System.Drawing.Point(144, 76) + Me.cbUrlaubInStund.Name = "cbUrlaubInStund" + Me.cbUrlaubInStund.Size = New System.Drawing.Size(87, 17) + Me.cbUrlaubInStund.TabIndex = 124 + Me.cbUrlaubInStund.Text = "Urlaub in Std" + Me.cbUrlaubInStund.UseVisualStyleBackColor = True + ' + '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(24, 179) + Me.dgvData.Name = "dgvData" + Me.dgvData.Size = New System.Drawing.Size(390, 192) + Me.dgvData.TabIndex = 149 + ' 'ContextMenuStrip1 ' Me.ContextMenuStrip1.Name = "ContextMenuStrip1" Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) - - ' - 'cbxTimasNichtStempeln1 - ' - Me.cbxTimasNichtStempeln1.AutoSize = True - Me.cbxTimasNichtStempeln1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxTimasNichtStempeln1.Location = New System.Drawing.Point(523, 182) - Me.cbxTimasNichtStempeln1.Name = "cbxTimasNichtStempeln1" - Me.cbxTimasNichtStempeln1.Size = New System.Drawing.Size(164, 17) - Me.cbxTimasNichtStempeln1.TabIndex = 97 - Me.cbxTimasNichtStempeln1.Text = "Zeiterfassung: Kein Stempeln" - Me.cbxTimasNichtStempeln1.UseVisualStyleBackColor = True ' 'frmMitarbDetails ' @@ -2524,9 +2616,6 @@ Partial Class frmMitarbDetails Me.TabPage4.PerformLayout() Me.TabPage5.ResumeLayout(False) Me.TabPage5.PerformLayout() - Me.TabPage6.ResumeLayout(False) - Me.TabPage6.PerformLayout() - CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage7.ResumeLayout(False) Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() @@ -2542,6 +2631,10 @@ Partial Class frmMitarbDetails CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabPage8.ResumeLayout(False) + Me.TabPage8.PerformLayout() + CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -2711,39 +2804,46 @@ Partial Class frmMitarbDetails Friend WithEvents btnUpdateAD As Button Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents txtTelNr As TextBox - Friend WithEvents TabPage6 As TabPage - Friend WithEvents cbxTimasAngelegt As CheckBox - Friend WithEvents txtLohnNr As TextBox - Friend WithEvents btnMAanlegen As Button - Friend WithEvents btngetInfo As Button - Friend WithEvents rtfInfoTimas As RichTextBox - Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview - Friend WithEvents TabControl1 As TabControl Friend WithEvents txtATGRNAccessCode_AT52VA6 As TextBox Friend WithEvents Label60 As Label Friend WithEvents Label61 As Label Friend WithEvents txtATGRNAccessCode_AT51FP7 As TextBox Friend WithEvents TabPage7 As TabPage Friend WithEvents lbSprachen As VERAG_PROG_ALLGEMEIN.MyListBox - Friend WithEvents btnDelete As Button Friend WithEvents Label62 As Label Friend WithEvents cboEZOLL_SB_UNISPED As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cbxHO As CheckBox - Friend WithEvents Label63 As Label - Friend WithEvents txtClientNr As TextBox Friend WithEvents txtprivateEMail As TextBox Friend WithEvents Label64 As Label + Friend WithEvents cbxTimasNichtStempeln1 As CheckBox + Friend WithEvents TabPage8 As TabPage + Friend WithEvents Label68 As Label + Friend WithEvents cbabwJahresurlaub As CheckBox + Friend WithEvents lblHoursOrDays2 As Label + Friend WithEvents lblHoursOrDays1 As Label + Friend WithEvents cboDaysPerWeek As ComboBox + Friend WithEvents lblTage As Label + Friend WithEvents Label67 As Label + Friend WithEvents txtWoStd As TextBox Friend WithEvents Label66 As Label Friend WithEvents txtaliquUA As TextBox Friend WithEvents txtUrlaubsabsp As TextBox Friend WithEvents Label65 As Label Friend WithEvents cbUrlaubInStund As CheckBox - Friend WithEvents cboDaysPerWeek As ComboBox - Friend WithEvents lblTage As Label - Friend WithEvents Label67 As Label - Friend WithEvents txtWoStd As TextBox - Friend WithEvents lblHoursOrDays2 As Label - Friend WithEvents lblHoursOrDays1 As Label - Friend WithEvents cbabwJahresurlaub As CheckBox - Friend WithEvents cbxTimasNichtStempeln1 As CheckBox + Friend WithEvents lblEintrittsdatum As Label + Friend WithEvents Label70 As Label + Friend WithEvents dgvUberstundenauszahlungen As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Label69 As Label + Friend WithEvents Label72 As Label + Friend WithEvents Label71 As Label + Friend WithEvents txtClientNr As TextBox + Friend WithEvents btnDelete As Button + Friend WithEvents TabControl3 As TabControl + Friend WithEvents cbxTimasAngelegt As CheckBox + Friend WithEvents txtLohnNr As TextBox + Friend WithEvents btnMAanlegen As Button + Friend WithEvents btngetInfo As Button + Friend WithEvents rtfInfoTimas As RichTextBox + Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Button7 As Button End Class diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 56f5f2f..fe282ca 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -1,20 +1,5 @@  -Imports System.DirectoryServices -Imports System.Globalization -Imports System.IO -Imports System.Net -Imports System.Net.Http -Imports System.Net.WebRequestMethods -Imports System.Security.Policy -Imports System.Text Imports System.Text.RegularExpressions -Imports System.Windows -Imports System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel -Imports DAKOSY_Worker.DEERRE -Imports GrapeCity.ActiveReports.ReportsCore.Tools -Imports itextsharp.text.pdf.codec.wmf -Imports Microsoft.VisualBasic.ApplicationServices -Imports Newtonsoft.Json Imports VERAG_PROG_ALLGEMEIN Public Class frmMitarbDetails @@ -210,6 +195,7 @@ Public Class frmMitarbDetails datGekuendigtAm.CustomFormat = "dd.MM.yyyy" datEinstiegsdatum.Format = DateTimePickerFormat.Custom datEinstiegsdatum.CustomFormat = "dd.MM.yyyy" + If mid >= 0 Then 'mid = frmMitarbeiter.mid mitarbeiter = UID.getMitarbeiterById(mid) @@ -228,6 +214,11 @@ Public Class frmMitarbDetails txtPwd.Text = "0000" End If + + + + lblEintrittsdatum.Text = IIf(cbxEinsteigsDat.Checked, datEinstiegsdatum.Value.ToShortDateString, "--") & IIf(cbxGekuendigt.Checked, " bis " & datGekuendigtAm.Value.ToShortDateString, "") + If False Then For Each ber As cUserBerechtigungen In usrBerechtigungNEU @@ -907,25 +898,25 @@ Public Class frmMitarbDetails End If ZOLLDATENBEARB = True - ElseIf tbcntr.SelectedIndex = 3 Then - timas = New VERAG_PROG_ALLGEMEIN.cTimasAPI("timas") + 'ElseIf tbcntr.SelectedIndex = 3 Then + ' timas = New VERAG_PROG_ALLGEMEIN.cTimasAPI("timas") - If IsNothing(mitarbeiter.mit_timasId) Then - cbxTimasAngelegt.Checked = False - timas.getAllGroups(dtTimas) - initDGV(dtTimas) - Else - cbxTimasAngelegt.Checked = True - End If + ' If IsNothing(mitarbeiter.mit_timasId) Then + ' cbxTimasAngelegt.Checked = False + ' timas.getAllGroups(dtTimas) + ' initDGV(dtTimas) + ' Else + ' cbxTimasAngelegt.Checked = True + ' End If - btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked - txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked - txtClientNr.Enabled = Not cbxTimasAngelegt.Checked - dgvData.Visible = Not cbxTimasAngelegt.Checked - TabControl1.Visible = Not cbxTimasAngelegt.Checked - rtfInfoTimas.Visible = cbxTimasAngelegt.Checked - btngetInfo.Visible = cbxTimasAngelegt.Checked + ' btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked + ' txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked + ' txtClientNr.Enabled = Not cbxTimasAngelegt.Checked + ' dgvData.Visible = Not cbxTimasAngelegt.Checked + ' TabControl1.Visible = Not cbxTimasAngelegt.Checked + ' rtfInfoTimas.Visible = cbxTimasAngelegt.Checked + ' btngetInfo.Visible = cbxTimasAngelegt.Checked End If End Sub @@ -1216,6 +1207,7 @@ Public Class frmMitarbDetails rtfInfoTimas.Visible = cbxTimasAngelegt.Checked btngetInfo.Visible = cbxTimasAngelegt.Checked btnDelete.Visible = cbxTimasAngelegt.Checked + Button7.Visible = cbxTimasAngelegt.Checked End Sub @@ -1260,7 +1252,7 @@ Public Class frmMitarbDetails End If - Return True + Return True End Function @@ -1268,13 +1260,13 @@ Public Class frmMitarbDetails If dtTimas.Columns.Count > 0 Then - If TabControl1.TabCount = 0 Then + If TabControl3.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")) + TabIndex = TabControl3.TabCount + TabControl3.TabPages.Add(row("groupType")) If TabIndex = 0 Then - Dim tab As TabPage = Me.TabControl1.SelectedTab + Dim tab As TabPage = Me.TabControl3.SelectedTab Dim dv = New DataView(dt) dv.RowFilter = "groupType = '" & tab.Text & "'" dgvData.DataSource = dv @@ -1286,7 +1278,7 @@ Public Class frmMitarbDetails .Columns("id").Visible = False .Columns("name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("groupType").Visible = False - .Columns("info").Width = 250 + .Columns("info").Width = 350 .Columns("set").Width = 20 .Columns("set").HeaderText = "X" .Dock = DockStyle.Fill @@ -1304,9 +1296,9 @@ Public Class frmMitarbDetails End Sub - Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged + Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl3.SelectedIndexChanged If dgvData Is Nothing And dgvData.Rows.Count < 1 Then Exit Sub - Dim tab As TabPage = Me.TabControl1.SelectedTab + Dim tab As TabPage = Me.TabControl3.SelectedTab If ((Not tab Is Nothing) AndAlso (Not tab.Controls.Contains(Me.dgvData))) Then Dim dv = New DataView(dtTimas) dv.RowFilter = "groupType = '" & tab.Text & "'" @@ -1362,39 +1354,33 @@ Public Class frmMitarbDetails End If Dim days As Double = span.TotalDays - Dim uansp As Double = 0 - Dim aliquU As Double = 0 - - calcUrlaubsabspruch(cbUrlaubInStund.Checked, uansp) - - If days > 0 AndAlso uansp > 0 Then - If IsNumeric(txtUrlaubsabsp.Text) Then uansp = txtUrlaubsabsp.Text - If Not cbUrlaubInStund.Checked Then - aliquU = Math.Round((uansp / 365) * span.TotalDays, 2, MidpointRounding.AwayFromZero) - txtaliquUA.Text = aliquU - lblHoursOrDays2.Text = "D" - Else - aliquU = Math.Round((uansp / 365) * span.TotalDays, 2, MidpointRounding.AwayFromZero) - txtaliquUA.Text = aliquU - lblHoursOrDays2.Text = "H" - End If + Dim uansp As Double = 0 + Dim aliquU As Double = 0 + calcUrlaubsabspruch(cbUrlaubInStund.Checked, uansp) + If days > 0 AndAlso uansp > 0 Then + If IsNumeric(txtUrlaubsabsp.Text) Then uansp = txtUrlaubsabsp.Text + If Not cbUrlaubInStund.Checked Then + aliquU = Math.Round((uansp / 365) * span.TotalDays, 2, MidpointRounding.AwayFromZero) + txtaliquUA.Text = aliquU + lblHoursOrDays2.Text = "D" + Else + aliquU = Math.Round((uansp / 365) * span.TotalDays, 2, MidpointRounding.AwayFromZero) + txtaliquUA.Text = aliquU + lblHoursOrDays2.Text = "H" End If End If + + End If + End If End If End Sub - 'Private Sub cboDaysPerWeek_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboDaysPerWeek.SelectedIndexChanged - - ' calcUrlaubsabspruch(cbUrlaubInStund.Checked) - - 'End Sub - Private Sub calcUrlaubsabspruch(UrlaubInStunden As Boolean, ByRef urlaubsabspruch As Double) If Not UrlaubInStunden Then If cboDaysPerWeek.SelectedItem <> "" Then @@ -1414,6 +1400,58 @@ Public Class frmMitarbDetails txtUrlaubsabsp.Text = urlaubsabspruch End Sub + Private Sub TabControl2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl2.SelectedIndexChanged + If TabControl2.SelectedIndex = 2 Then + Try + timas = New VERAG_PROG_ALLGEMEIN.cTimasAPI("timas") + + If IsNothing(mitarbeiter.mit_timasId) Then + cbxTimasAngelegt.Checked = False + timas.getAllGroups(dtTimas) + initDGV(dtTimas) + Else + cbxTimasAngelegt.Checked = True + End If + + + btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked + txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked + txtClientNr.Enabled = Not cbxTimasAngelegt.Checked + dgvData.Visible = Not cbxTimasAngelegt.Checked + TabControl3.Visible = Not cbxTimasAngelegt.Checked + rtfInfoTimas.Visible = cbxTimasAngelegt.Checked + btngetInfo.Visible = cbxTimasAngelegt.Checked + + + + Dim dtbereitsausgezahlteUE As DataTable + Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am + FROM [ADMIN].[dbo].[tblUeberstunden] + where uest_deleted = 0 and uest_maId = " & mitarbeiter.mit_id & " + Order by uest_date" + + dtbereitsausgezahlteUE = SQL.loadDgvBySql(bereitsgezahlteueberstunden, "ADMIN", 100, True) + + dgvUberstundenauszahlungen.DataSource = dtbereitsausgezahlteUE + + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End If + + End Sub + + Private Sub Button7_Click_1(sender As Object, e As EventArgs) Handles Button7.Click + Me.Cursor = Cursors.WaitCursor + 'neue GUI für Änderungen im Timas + Dim frmMitarbDetails As New frmMitarbTimas() + frmMitarbDetails.mid = mitarbeiter.mit_timasId + Me.Cursor = Cursors.Default + frmMitarbDetails.ShowDialog() + + + End Sub End Class diff --git a/UID/Mitarbeiter/frmMitarbTimas.vb b/UID/Mitarbeiter/frmMitarbTimas.vb index 9a55efc..91b2ddc 100644 --- a/UID/Mitarbeiter/frmMitarbTimas.vb +++ b/UID/Mitarbeiter/frmMitarbTimas.vb @@ -41,67 +41,73 @@ Public Class frmMitarbTimas End Sub Private Sub initMitarbeiter(mid As Integer, Optional _isUpdate As Boolean = False) - timas = New cTimasAPI("timas") - emp = timas.getEmployee(mid) - avisoEmp = New VERAG_PROG_ALLGEMEIN.cMitarbeiter(emp.externid) + Try - timas.getAllGroups(dtTimas) - - initDGV(dtTimas) - - isUpdate = _isUpdate - Label48.Text = emp.externid - txtUsername.Text = emp.login - txtVname.Text = emp.firstname - txtNname.Text = emp.lastname - 'txtPwd.Text = emp.password - If emp.gender = "male" Then rbtnGeschlechtM.Checked = True - If emp.gender = "female" Then rbtnGeschlechtW.Checked = True - - If emp.birthdayDate = "null" Then - cbxGebDat.Checked = False - Else - cbxGebDat.Checked = True : txtGebDat.Text = emp.birthdayDate - End If - txtStrasse.Text = emp.street - txtLohn.Text = emp.pnr1 - txtPlz.Text = emp.zipcode - txtCard.Text = emp.card - txtOrt.Text = emp.city - txtInfo.Text = emp.info - 'cboNiederlassung.changeItem(mitarbeiter.mit_niederlassung) - 'cboAbteilung.changeItem(mitarbeiter.mit_abteilung) - txtTelNr.Text = emp.phone1 - txtEmail.Text = emp.email - txtMobiltel.Text = emp.phone2 - txtMandantenNr.Text = emp.clientNumber - - 'txtPersonalNr.Text = emp.pnr1 - - cbxAccount.Checked = emp.loginActive - - If emp.entryDate Is Nothing Then - cbxEinsteigsDat.Checked = False - Else - cbxEinsteigsDat.Checked = True : datEinstiegsdatum.Text = emp.entryDate - End If + timas = New cTimasAPI("timas") + emp = timas.getEmployee(mid) + avisoEmp = New VERAG_PROG_ALLGEMEIN.cMitarbeiter(emp.externid) - If emp.exitDate IsNot Nothing Then - cbxGekuendigt.Checked = True - datGekuendigtAm.Text = emp.exitDate - Else - cbxGekuendigt.Checked = False - End If + timas.getAllGroups(dtTimas) - If emp.birthdayDate Is Nothing Then - cbxGebDat.Checked = False - Else - cbxGebDat.Checked = True : txtGebDat.Text = emp.birthdayDate - End If + initDGV(dtTimas) - initcheckedlistbox(timas.getEmployeecustomFields(mid)) + isUpdate = _isUpdate + Label48.Text = emp.externid + txtUsername.Text = emp.login + txtVname.Text = emp.firstname + txtNname.Text = emp.lastname + 'txtPwd.Text = emp.password + If emp.gender = "male" Then rbtnGeschlechtM.Checked = True + If emp.gender = "female" Then rbtnGeschlechtW.Checked = True + + If emp.birthdayDate = "null" Then + cbxGebDat.Checked = False + Else + cbxGebDat.Checked = True : txtGebDat.Text = emp.birthdayDate + End If + txtStrasse.Text = emp.street + txtLohn.Text = emp.pnr1 + txtPlz.Text = emp.zipcode + txtCard.Text = emp.card + txtOrt.Text = emp.city + txtInfo.Text = emp.info + 'cboNiederlassung.changeItem(mitarbeiter.mit_niederlassung) + 'cboAbteilung.changeItem(mitarbeiter.mit_abteilung) + txtTelNr.Text = emp.phone1 + txtEmail.Text = emp.email + txtMobiltel.Text = emp.phone2 + txtMandantenNr.Text = emp.clientNumber + + 'txtPersonalNr.Text = emp.pnr1 + + cbxAccount.Checked = emp.loginActive + + If emp.entryDate Is Nothing Then + cbxEinsteigsDat.Checked = False + Else + cbxEinsteigsDat.Checked = True : datEinstiegsdatum.Text = emp.entryDate + End If + + + If emp.exitDate IsNot Nothing Then + cbxGekuendigt.Checked = True + datGekuendigtAm.Text = emp.exitDate + Else + cbxGekuendigt.Checked = False + End If + + If emp.birthdayDate Is Nothing Then + cbxGebDat.Checked = False + Else + cbxGebDat.Checked = True : txtGebDat.Text = emp.birthdayDate + End If + + initcheckedlistbox(timas.getEmployeecustomFields(mid)) + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try End Sub @@ -164,6 +170,7 @@ Public Class frmMitarbTimas + End Sub diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index 84f28fc..5550d1d 100644 --- a/UID/My Project/Resources.Designer.vb +++ b/UID/My Project/Resources.Designer.vb @@ -414,6 +414,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property ok() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("ok", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index 57b5c48..bc69051 100644 --- a/UID/My Project/Resources.resx +++ b/UID/My Project/Resources.resx @@ -118,122 +118,161 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\dp_tv.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\bürgschaften_vorlage.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; - - - ..\Resources\schule.jpg;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\Buergschaften_Jahresauswertung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\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\fd.ico;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\DSC_0121.JPG;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\urlaub1.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\kalender.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\Verag-Academy_blue.jpg;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 + + + Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; + + + ..\Resources\spedbuch.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\refresh.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\plus.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\aviso_tv.ico;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 + + + 4.0 + + + ..\Resources\sanduhr.png;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\uid.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\chain.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\uhr_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\del.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\Buergschaften_Jahresauswertung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\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\krank.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\Excel_2013_logo-155x110.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\Dienstplan.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\wait.gif;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\active_directory2_logo.png;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\gear1.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_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\dispo.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\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\reise.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\search.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 @@ -241,70 +280,34 @@ ..\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\admin2.png;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\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\uhr_notime.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\fd.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\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 - - ..\Resources\Verag-AG-Logo.jpg;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 - - 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\gear.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 + + ..\Resources\ok.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/Programme/frmBerechtigungsObjekte.Designer.vb b/UID/Programme/frmBerechtigungsObjekte.Designer.vb index 10afc5e..92a052f 100644 --- a/UID/Programme/frmBerechtigungsObjekte.Designer.vb +++ b/UID/Programme/frmBerechtigungsObjekte.Designer.vb @@ -76,10 +76,13 @@ Partial Class frmBerechtigungsObjekte Me.Label20 = New System.Windows.Forms.Label() Me.cboAbteilung = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button5 = New System.Windows.Forms.Button() + Me.txtSuche = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.pnl.SuspendLayout() CType(Me.gdvGruppen, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvGruppenBenutzer, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvObjekte, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'lblNeuesObjekt @@ -127,7 +130,7 @@ Partial Class frmBerechtigungsObjekte 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(236, 36) + Me.Label2.Location = New System.Drawing.Point(234, 36) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(118, 13) Me.Label2.TabIndex = 6 @@ -257,12 +260,15 @@ Partial Class frmBerechtigungsObjekte Me.MyTextBox4._DateTimeOnly = False Me.MyTextBox4._numbersOnly = False Me.MyTextBox4._numbersOnlyKommastellen = "" + Me.MyTextBox4._numbersOnlyTrennzeichen = True Me.MyTextBox4._Prozent = False Me.MyTextBox4._ShortDateNew = False Me.MyTextBox4._ShortDateOnly = False Me.MyTextBox4._TimeOnly = False + Me.MyTextBox4._TimeOnly_Seconds = False Me.MyTextBox4._value = Nothing Me.MyTextBox4._Waehrung = False + Me.MyTextBox4._WaehrungZeichen = True Me.MyTextBox4.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.MyTextBox4.ForeColor = System.Drawing.Color.Black Me.MyTextBox4.Location = New System.Drawing.Point(12, 622) @@ -433,12 +439,15 @@ Partial Class frmBerechtigungsObjekte Me.MyTextBox3._DateTimeOnly = False Me.MyTextBox3._numbersOnly = False Me.MyTextBox3._numbersOnlyKommastellen = "" + Me.MyTextBox3._numbersOnlyTrennzeichen = True Me.MyTextBox3._Prozent = False Me.MyTextBox3._ShortDateNew = False Me.MyTextBox3._ShortDateOnly = False Me.MyTextBox3._TimeOnly = False + Me.MyTextBox3._TimeOnly_Seconds = False Me.MyTextBox3._value = "0" Me.MyTextBox3._Waehrung = False + Me.MyTextBox3._WaehrungZeichen = True Me.MyTextBox3.ForeColor = System.Drawing.Color.Black Me.MyTextBox3.Location = New System.Drawing.Point(728, 417) Me.MyTextBox3.MaxLineLength = -1 @@ -454,12 +463,15 @@ Partial Class frmBerechtigungsObjekte Me.MyTextBox2._DateTimeOnly = False Me.MyTextBox2._numbersOnly = False Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._numbersOnlyTrennzeichen = True Me.MyTextBox2._Prozent = False Me.MyTextBox2._ShortDateNew = False Me.MyTextBox2._ShortDateOnly = False Me.MyTextBox2._TimeOnly = False + Me.MyTextBox2._TimeOnly_Seconds = False Me.MyTextBox2._value = "0" Me.MyTextBox2._Waehrung = False + Me.MyTextBox2._WaehrungZeichen = True Me.MyTextBox2.ForeColor = System.Drawing.Color.Black Me.MyTextBox2.Location = New System.Drawing.Point(727, 293) Me.MyTextBox2.MaxLineLength = -1 @@ -480,13 +492,13 @@ Partial Class frmBerechtigungsObjekte Me.dgvObjekte.BackgroundColor = System.Drawing.Color.White Me.dgvObjekte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvObjekte.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.id, Me.bez, Me.art}) - Me.dgvObjekte.Location = New System.Drawing.Point(237, 52) + Me.dgvObjekte.Location = New System.Drawing.Point(237, 54) Me.dgvObjekte.MultiSelect = False Me.dgvObjekte.Name = "dgvObjekte" Me.dgvObjekte.ReadOnly = True Me.dgvObjekte.RowHeadersVisible = False Me.dgvObjekte.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvObjekte.Size = New System.Drawing.Size(317, 554) + Me.dgvObjekte.Size = New System.Drawing.Size(317, 552) Me.dgvObjekte.TabIndex = 14 ' 'id @@ -514,12 +526,15 @@ Partial Class frmBerechtigungsObjekte Me.MyTextBox1._DateTimeOnly = False Me.MyTextBox1._numbersOnly = False Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True Me.MyTextBox1._Prozent = False Me.MyTextBox1._ShortDateNew = False Me.MyTextBox1._ShortDateOnly = False Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._TimeOnly_Seconds = False Me.MyTextBox1._value = Nothing Me.MyTextBox1._Waehrung = False + Me.MyTextBox1._WaehrungZeichen = True Me.MyTextBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.MyTextBox1.ForeColor = System.Drawing.Color.Black Me.MyTextBox1.Location = New System.Drawing.Point(237, 622) @@ -589,12 +604,15 @@ Partial Class frmBerechtigungsObjekte Me.MyTextBox5._DateTimeOnly = False Me.MyTextBox5._numbersOnly = False Me.MyTextBox5._numbersOnlyKommastellen = "" + Me.MyTextBox5._numbersOnlyTrennzeichen = True Me.MyTextBox5._Prozent = False Me.MyTextBox5._ShortDateNew = False Me.MyTextBox5._ShortDateOnly = False Me.MyTextBox5._TimeOnly = False + Me.MyTextBox5._TimeOnly_Seconds = False Me.MyTextBox5._value = "0" Me.MyTextBox5._Waehrung = False + Me.MyTextBox5._WaehrungZeichen = True Me.MyTextBox5.ForeColor = System.Drawing.Color.Black Me.MyTextBox5.Location = New System.Drawing.Point(728, 337) Me.MyTextBox5.MaxLineLength = -1 @@ -654,12 +672,15 @@ Partial Class frmBerechtigungsObjekte Me.MyTextBox6._DateTimeOnly = False Me.MyTextBox6._numbersOnly = False Me.MyTextBox6._numbersOnlyKommastellen = "" + Me.MyTextBox6._numbersOnlyTrennzeichen = True Me.MyTextBox6._Prozent = False Me.MyTextBox6._ShortDateNew = False Me.MyTextBox6._ShortDateOnly = False Me.MyTextBox6._TimeOnly = False + Me.MyTextBox6._TimeOnly_Seconds = False Me.MyTextBox6._value = "0" Me.MyTextBox6._Waehrung = False + Me.MyTextBox6._WaehrungZeichen = True Me.MyTextBox6.ForeColor = System.Drawing.Color.Black Me.MyTextBox6.Location = New System.Drawing.Point(728, 377) Me.MyTextBox6.MaxLineLength = -1 @@ -705,12 +726,47 @@ Partial Class frmBerechtigungsObjekte Me.Button5.Text = "OK" Me.Button5.UseVisualStyleBackColor = True ' + 'txtSuche + ' + Me.txtSuche._DateTimeOnly = False + Me.txtSuche._numbersOnly = False + Me.txtSuche._numbersOnlyKommastellen = "" + Me.txtSuche._numbersOnlyTrennzeichen = True + Me.txtSuche._Prozent = False + Me.txtSuche._ShortDateNew = False + Me.txtSuche._ShortDateOnly = False + Me.txtSuche._TimeOnly = False + Me.txtSuche._TimeOnly_Seconds = False + Me.txtSuche._value = Nothing + Me.txtSuche._Waehrung = False + Me.txtSuche._WaehrungZeichen = True + Me.txtSuche.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.txtSuche.ForeColor = System.Drawing.Color.Black + Me.txtSuche.Location = New System.Drawing.Point(358, 33) + Me.txtSuche.MaxLineLength = -1 + Me.txtSuche.MaxLines_Warning = "" + Me.txtSuche.MaxLines_Warning_Label = Nothing + Me.txtSuche.Name = "txtSuche" + Me.txtSuche.Size = New System.Drawing.Size(168, 20) + Me.txtSuche.TabIndex = 42 + ' + 'PictureBox1 + ' + Me.PictureBox1.Image = Global.ADMIN.My.Resources.Resources.search + Me.PictureBox1.Location = New System.Drawing.Point(532, 33) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(23, 17) + Me.PictureBox1.TabIndex = 43 + Me.PictureBox1.TabStop = False + ' 'frmBerechtigungsObjekte ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(836, 658) + Me.Controls.Add(Me.PictureBox1) + Me.Controls.Add(Me.txtSuche) Me.Controls.Add(Me.Label19) Me.Controls.Add(Me.MyTextBox6) Me.Controls.Add(Me.Label20) @@ -757,6 +813,7 @@ Partial Class frmBerechtigungsObjekte CType(Me.gdvGruppen, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvGruppenBenutzer, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvObjekte, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -813,4 +870,6 @@ Partial Class frmBerechtigungsObjekte Friend WithEvents cboAbteilung As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Button5 As System.Windows.Forms.Button Friend WithEvents Button6 As Button + Friend WithEvents txtSuche As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents PictureBox1 As PictureBox End Class diff --git a/UID/Programme/frmBerechtigungsObjekte.vb b/UID/Programme/frmBerechtigungsObjekte.vb index 46948f9..efad84d 100644 --- a/UID/Programme/frmBerechtigungsObjekte.vb +++ b/UID/Programme/frmBerechtigungsObjekte.vb @@ -27,13 +27,13 @@ init() End Sub - Sub init() + Sub init(Optional searchparam As String = "") MyComboBox1.SelectedIndex = 0 gdvGruppen.Rows.Clear() dgvObjekte.Rows.Clear() dgvGruppenBenutzer.Rows.Clear() - BerechtigungsObjekte = New VERAG_PROG_ALLGEMEIN.cBerechtigungsObjekte_List(progId) + BerechtigungsObjekte = New VERAG_PROG_ALLGEMEIN.cBerechtigungsObjekte_List(progId, searchparam) BerechtigungenGruppen = New VERAG_PROG_ALLGEMEIN.cBerechtigungenGruppen_List(progId) For Each b In BerechtigungenGruppen.LIST @@ -270,4 +270,20 @@ MsgBox("Keine Benutzer gefunden!") End If End Sub + + Private Sub MyTextBox7_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown + + + Dim sqladdon As String = "" + + If e.KeyCode = Keys.Enter Then + If txtSuche.Text <> "" Then + sqladdon &= " AND [bero_bezeichnung] like '%" & txtSuche.Text & "%'" + End If + init(sqladdon) + End If + + End Sub + + End Class \ No newline at end of file diff --git a/UID/Resources/ok.png b/UID/Resources/ok.png new file mode 100644 index 0000000..8e4a706 Binary files /dev/null and b/UID/Resources/ok.png differ diff --git a/UID/frmAPIEinstellungen.Designer.vb b/UID/frmAPIEinstellungen.Designer.vb index 6f0e4e2..ed63a06 100644 --- a/UID/frmAPIEinstellungen.Designer.vb +++ b/UID/frmAPIEinstellungen.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmAPIEinstellungen 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 frmAPIEinstellungen '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.Label2 = New System.Windows.Forms.Label() Me.txtSuche = New System.Windows.Forms.TextBox() @@ -49,7 +49,7 @@ Partial Class frmAPIEinstellungen ' 'btnOK ' - Me.btnOK.Location = New System.Drawing.Point(863, 454) + Me.btnOK.Location = New System.Drawing.Point(1037, 450) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(109, 23) Me.btnOK.TabIndex = 20 diff --git a/UID/frmAPIEinstellungen.vb b/UID/frmAPIEinstellungen.vb index 41a8266..fc16c9b 100644 --- a/UID/frmAPIEinstellungen.vb +++ b/UID/frmAPIEinstellungen.vb @@ -1,4 +1,5 @@ -Imports VERAG_PROG_ALLGEMEIN +Imports System.Net +Imports VERAG_PROG_ALLGEMEIN Public Class frmAPIEinstellungen @@ -61,8 +62,31 @@ Public Class frmAPIEinstellungen .Columns("api_description").HeaderText = "Beschreibung" .Columns("api_description").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + Dim c As New DataGridViewImageColumn + c.Name = "isRunning" : c.HeaderText = "Online" + c.Image = My.Resources.wait : c.ImageLayout = DataGridViewImageCellLayout.Zoom + c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White + c.DefaultCellStyle.Tag = "Online" + .Columns.Add(c) + + + + For Each r As DataGridViewRow In .Rows + If r.Cells("api_url").Value Is DBNull.Value Then + r.DefaultCellStyle.ForeColor = Color.Gray + ElseIf CBool(r.Cells("api_active").Value) = False Then + r.DefaultCellStyle.ForeColor = Color.Gray + End If + + If r.Cells("api_url").Value IsNot DBNull.Value AndAlso CheckAddress(r.Cells("api_url").Value) Then + DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.ok + Else + DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.del + End If + Next End If + End With @@ -73,22 +97,6 @@ Public Class frmAPIEinstellungen End Sub - Private Sub TextBox1_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtSuche.PreviewKeyDown - - Dim sqladdon As String = "" - - If e.KeyCode = Keys.Enter Then - If txtSuche.Text <> "" Then - sqladdon &= " [api_program] like '%" & txtSuche.Text & "%' or [api_url] like '%" & txtSuche.Text & "%'" - End If - loadDGV(sqladdon) - End If - - - - End Sub - - Private Sub DataGridView_DefaultValuesNeeded(sender As Object, e As DataGridViewRowEventArgs) Handles DataGridView.DefaultValuesNeeded Try @@ -129,4 +137,33 @@ Public Class frmAPIEinstellungen End If End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) + If DataGridView.SelectedRows.Count = 0 Then Exit Sub + + + + End Sub + + Private Function CheckAddress(url As String) As Boolean + Try + If url = "" Then Return False + Dim request As WebRequest = WebRequest.Create(url) + Dim response As WebResponse = request.GetResponse() + Catch ex As Exception + Return False + End Try + Return True + End Function + + Private Sub txtSuche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown + Dim sqladdon As String = "" + + If e.KeyCode = Keys.Enter Then + If txtSuche.Text <> "" Then + sqladdon &= " [api_program] like '%" & txtSuche.Text & "%' or [api_url] like '%" & txtSuche.Text & "%'" + End If + loadDGV(sqladdon) + End If + + End Sub End Class \ No newline at end of file diff --git a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb index 07407b2..2cc9527 100644 --- a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb @@ -98,8 +98,6 @@ Public Class frmMDMNachrichtenVerarbeitung Dim cnt = 0 Try - - Dim MDM_server = "" Dim MDM_name = "" Dim MDM_pwd = ""