MERGE

2024-03-01 15:03:39 +01:00
parent cd5f875c1f 8e74638768
commit 9fdca37fab
5 changed files with 490 additions and 69 deletions
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb
@@ -22,7 +22,7 @@ Partial Class frmUeberstundenauszahlen
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmUeberstundenauszahlen))
        Me.dtpMonat = New System.Windows.Forms.DateTimePicker()
        Me.lblMonat = New System.Windows.Forms.Label()
        Me.Label2 = New System.Windows.Forms.Label()
@@ -52,13 +52,23 @@ Partial Class frmUeberstundenauszahlen
        Me.picDel = New System.Windows.Forms.PictureBox()
        Me.txtAusz50vonSaldo = New System.Windows.Forms.TextBox()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.txtAuszManuell = New System.Windows.Forms.TextBox()
+        Me.cx25 = New System.Windows.Forms.CheckBox()
+        Me.cbx50 = New System.Windows.Forms.CheckBox()
+        Me.cbx100 = New System.Windows.Forms.CheckBox()
+        Me.txtberAusz25 = New System.Windows.Forms.TextBox()
+        Me.cbxoverwrite = New System.Windows.Forms.CheckBox()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.txt50x1 = New System.Windows.Forms.TextBox()
-        Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.cbxoverwrite = New System.Windows.Forms.CheckBox()
+        Me.cbxTeilzeit = New System.Windows.Forms.CheckBox()
+        Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.picShow = New System.Windows.Forms.PictureBox()
        CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.picShow, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'dtpMonat
@@ -162,7 +172,7 @@ Partial Class frmUeberstundenauszahlen
        'Button1
        '
        Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.Button1.Location = New System.Drawing.Point(321, 170)
+        Me.Button1.Location = New System.Drawing.Point(464, 170)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(87, 30)
        Me.Button1.TabIndex = 12
@@ -252,7 +262,7 @@ Partial Class frmUeberstundenauszahlen
        '
        'txtberAusz50
        '
-        Me.txtberAusz50.Location = New System.Drawing.Point(291, 69)
+        Me.txtberAusz50.Location = New System.Drawing.Point(309, 69)
        Me.txtberAusz50.Name = "txtberAusz50"
        Me.txtberAusz50.ReadOnly = True
        Me.txtberAusz50.Size = New System.Drawing.Size(54, 20)
@@ -261,7 +271,7 @@ Partial Class frmUeberstundenauszahlen
        '
        'txtberAusz100
        '
-        Me.txtberAusz100.Location = New System.Drawing.Point(291, 27)
+        Me.txtberAusz100.Location = New System.Drawing.Point(309, 27)
        Me.txtberAusz100.Name = "txtberAusz100"
        Me.txtberAusz100.ReadOnly = True
        Me.txtberAusz100.Size = New System.Drawing.Size(54, 20)
@@ -271,7 +281,7 @@ Partial Class frmUeberstundenauszahlen
        'Label1
        '
        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(289, 11)
+        Me.Label1.Location = New System.Drawing.Point(306, 11)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(92, 13)
        Me.Label1.TabIndex = 25
@@ -299,7 +309,7 @@ Partial Class frmUeberstundenauszahlen
        '
        Me.picDel.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.del
        Me.picDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.picDel.Location = New System.Drawing.Point(387, 11)
+        Me.picDel.Location = New System.Drawing.Point(404, 11)
        Me.picDel.Name = "picDel"
        Me.picDel.Size = New System.Drawing.Size(21, 16)
        Me.picDel.TabIndex = 28
@@ -316,7 +326,14 @@ Partial Class frmUeberstundenauszahlen
        '
        'Panel1
        '
+        Me.Panel1.Controls.Add(Me.picShow)
+        Me.Panel1.Controls.Add(Me.txtAuszManuell)
+        Me.Panel1.Controls.Add(Me.cx25)
+        Me.Panel1.Controls.Add(Me.cbx50)
+        Me.Panel1.Controls.Add(Me.cbx100)
+        Me.Panel1.Controls.Add(Me.txtberAusz25)
        Me.Panel1.Controls.Add(Me.cbxoverwrite)
+        Me.Panel1.Controls.Add(Me.dgvUeberstunden)
        Me.Panel1.Controls.Add(Me.Label8)
        Me.Panel1.Controls.Add(Me.txt50x1)
        Me.Panel1.Controls.Add(Me.Label2)
@@ -341,9 +358,67 @@ Partial Class frmUeberstundenauszahlen
        Me.Panel1.Controls.Add(Me.txtAusz50)
        Me.Panel1.Location = New System.Drawing.Point(15, 67)
        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(421, 235)
+        Me.Panel1.Size = New System.Drawing.Size(619, 235)
        Me.Panel1.TabIndex = 30
        '
+        'txtAuszManuell
+        '
+        Me.txtAuszManuell.Location = New System.Drawing.Point(272, 196)
+        Me.txtAuszManuell.Name = "txtAuszManuell"
+        Me.txtAuszManuell.Size = New System.Drawing.Size(54, 20)
+        Me.txtAuszManuell.TabIndex = 37
+        Me.txtAuszManuell.Text = "0"
+        Me.txtAuszManuell.Visible = False
+        '
+        'cx25
+        '
+        Me.cx25.AutoSize = True
+        Me.cx25.Location = New System.Drawing.Point(196, 111)
+        Me.cx25.Name = "cx25"
+        Me.cx25.Size = New System.Drawing.Size(15, 14)
+        Me.cx25.TabIndex = 36
+        Me.cx25.UseVisualStyleBackColor = True
+        '
+        'cbx50
+        '
+        Me.cbx50.AutoSize = True
+        Me.cbx50.Location = New System.Drawing.Point(196, 72)
+        Me.cbx50.Name = "cbx50"
+        Me.cbx50.Size = New System.Drawing.Size(15, 14)
+        Me.cbx50.TabIndex = 35
+        Me.cbx50.UseVisualStyleBackColor = True
+        '
+        'cbx100
+        '
+        Me.cbx100.AutoSize = True
+        Me.cbx100.Location = New System.Drawing.Point(196, 30)
+        Me.cbx100.Name = "cbx100"
+        Me.cbx100.Size = New System.Drawing.Size(15, 14)
+        Me.cbx100.TabIndex = 32
+        Me.cbx100.UseVisualStyleBackColor = True
+        '
+        'txtberAusz25
+        '
+        Me.txtberAusz25.Location = New System.Drawing.Point(309, 108)
+        Me.txtberAusz25.Name = "txtberAusz25"
+        Me.txtberAusz25.ReadOnly = True
+        Me.txtberAusz25.Size = New System.Drawing.Size(54, 20)
+        Me.txtberAusz25.TabIndex = 34
+        Me.txtberAusz25.Text = "0"
+        Me.txtberAusz25.Visible = False
+        '
+        'cbxoverwrite
+        '
+        Me.cbxoverwrite.AutoSize = True
+        Me.cbxoverwrite.Checked = True
+        Me.cbxoverwrite.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxoverwrite.Location = New System.Drawing.Point(79, 179)
+        Me.cbxoverwrite.Name = "cbxoverwrite"
+        Me.cbxoverwrite.Size = New System.Drawing.Size(102, 17)
+        Me.cbxoverwrite.TabIndex = 31
+        Me.cbxoverwrite.Text = "max. auszahlbar"
+        Me.cbxoverwrite.UseVisualStyleBackColor = True
+        '
        'Label8
        '
        Me.Label8.AutoSize = True
@@ -362,6 +437,16 @@ Partial Class frmUeberstundenauszahlen
        Me.txt50x1.TabIndex = 32
        Me.txt50x1.Text = "0"
        '
+        'cbxTeilzeit
+        '
+        Me.cbxTeilzeit.AutoSize = True
+        Me.cbxTeilzeit.Location = New System.Drawing.Point(239, 5)
+        Me.cbxTeilzeit.Name = "cbxTeilzeit"
+        Me.cbxTeilzeit.Size = New System.Drawing.Size(59, 17)
+        Me.cbxTeilzeit.TabIndex = 31
+        Me.cbxTeilzeit.Text = "Teilzeit"
+        Me.cbxTeilzeit.UseVisualStyleBackColor = True
+        '
        'dgvUeberstunden
        '
        Me.dgvUeberstunden.AKTUALISIERUNGS_INTERVALL = -1
@@ -369,10 +454,10 @@ Partial Class frmUeberstundenauszahlen
        Me.dgvUeberstunden.AllowUserToDeleteRows = False
        Me.dgvUeberstunden.BackgroundColor = System.Drawing.Color.White
        Me.dgvUeberstunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvUeberstunden.Location = New System.Drawing.Point(381, 12)
+        Me.dgvUeberstunden.Location = New System.Drawing.Point(381, 30)
        Me.dgvUeberstunden.Name = "dgvUeberstunden"
        Me.dgvUeberstunden.ReadOnly = True
-        Me.dgvUeberstunden.Size = New System.Drawing.Size(32, 20)
+        Me.dgvUeberstunden.Size = New System.Drawing.Size(227, 98)
        Me.dgvUeberstunden.TabIndex = 13
        Me.dgvUeberstunden.Visible = False
        '
@@ -388,16 +473,28 @@ Partial Class frmUeberstundenauszahlen
        Me.cbxoverwrite.Text = "max. auszahlbar"
        Me.cbxoverwrite.UseVisualStyleBackColor = True
        '
+        'picShow
+        '
+        Me.picShow.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.today
+        Me.picShow.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.picShow.Location = New System.Drawing.Point(431, 11)
+        Me.picShow.Name = "picShow"
+        Me.picShow.Size = New System.Drawing.Size(21, 16)
+        Me.picShow.TabIndex = 38
+        Me.picShow.TabStop = False
+        Me.picShow.Visible = False
+        '
        'frmUeberstundenauszahlen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(463, 337)
+        Me.ClientSize = New System.Drawing.Size(646, 337)
+        Me.Controls.Add(Me.PictureBox1)
+        Me.Controls.Add(Me.cbxTeilzeit)
        Me.Controls.Add(Me.Panel1)
        Me.Controls.Add(Me.lblBis)
        Me.Controls.Add(Me.dtpBis)
        Me.Controls.Add(Me.cbxabwDatum)
-        Me.Controls.Add(Me.dgvUeberstunden)
        Me.Controls.Add(Me.Label7)
        Me.Controls.Add(Me.lblMA)
        Me.Controls.Add(Me.lblMonat)
@@ -409,6 +506,8 @@ Partial Class frmUeberstundenauszahlen
        Me.Panel1.ResumeLayout(False)
        Me.Panel1.PerformLayout()
        CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.picShow, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -447,4 +546,12 @@ Partial Class frmUeberstundenauszahlen
    Friend WithEvents txt50x1 As Windows.Forms.TextBox
    Friend WithEvents Label8 As Windows.Forms.Label
    Friend WithEvents cbxoverwrite As Windows.Forms.CheckBox
+    Friend WithEvents cbxTeilzeit As Windows.Forms.CheckBox
+    Friend WithEvents txtberAusz25 As Windows.Forms.TextBox
+    Friend WithEvents cx25 As Windows.Forms.CheckBox
+    Friend WithEvents cbx50 As Windows.Forms.CheckBox
+    Friend WithEvents cbx100 As Windows.Forms.CheckBox
+    Friend WithEvents txtAuszManuell As Windows.Forms.TextBox
+    Friend WithEvents PictureBox1 As Windows.Forms.PictureBox
+    Friend WithEvents picShow As Windows.Forms.PictureBox
 End Class