From f8cd9179834d631d101d889855b3ed5564a61138 Mon Sep 17 00:00:00 2001
From: "d.breimaier" <d.breimaier@verag.ag>
Date: Mon, 4 Mar 2024 16:52:38 +0100
Subject: [PATCH] Ueberstunden

---
 .../frmUeberstundenauszahlen.vb               |  53 +++++---
 .../frmUeberstundenliste.Designer.vb          |  37 ++++++
 .../frmUeberstundenliste.resx                 | 120 ++++++++++++++++++
 .../frmUeberstundenliste.vb                   |   3 +
 .../VERAG_PROG_ALLGEMEIN.vbproj               |   9 ++
 5 files changed, 206 insertions(+), 16 deletions(-)
 create mode 100644 VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.Designer.vb
 create mode 100644 VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.resx
 create mode 100644 VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.vb

diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
index 2d082bed..fd8b5d31 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
@@ -1,11 +1,12 @@
 
+Imports System.Data.Common
 Imports System.Drawing
+Imports System.Runtime.InteropServices.ComTypes
 Imports System.Text
 Imports System.Threading
+Imports System.Web.UI.WebControls
 Imports System.Windows.Forms
 Imports System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip
-
-
 Public Class frmUeberstundenauszahlen
 
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -145,10 +146,12 @@ Public Class frmUeberstundenauszahlen
 
 
     Private Function getUeberstunden(dtAccouts As DataTable, dtSumUeberstunden As DataTable) As DataTable
-        Dim dtmerged As DataTable
+        Dim dtmerged As New DataTable
         If dtAccouts IsNot Nothing AndAlso dtSumUeberstunden IsNot Nothing Then
 
             dtmerged = dtAccouts.Clone
+
+
             dtmerged.Merge(dtSumUeberstunden, False, MissingSchemaAction.Add)
 
             If (dtmerged.Columns.Contains("accountType")) Then
@@ -210,6 +213,7 @@ Public Class frmUeberstundenauszahlen
 
         Try
 
+
             Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
             Dim frm As New Form
             Dim dgv As New DataGridView()
@@ -220,21 +224,39 @@ Public Class frmUeberstundenauszahlen
             End If
 
             Dim dv = New DataView(dt)
-            dv.RowFilter = "accountid = 1550 Or accountid = 1551 Or accountid = 1553"
-            dgv.DataSource = dv.ToTable
+            dv.RowFilter = "accountid = 1550 Or accountid = 1551 Or accountid = 1553" 'Überstunden!
+            dt = dv.ToTable
+
+            For Each row As DataRow In dt.Rows
+
+                Select Case row(0)
+
+                    Case 1550 : If IsDBNull(row(1)) Then row(1) = CStr("ÜS 100%")
+                    Case 1551 : If IsDBNull(row(1)) Then row(1) = CStr("ÜS 50%")
+                    Case 1553 : If IsDBNull(row(1)) Then row(1) = CStr("ÜS 25%")
+
+                End Select
+            Next
+
+            If (dt.Columns.Contains("accountid")) Then
+                dt.Columns.Remove("accountid")
+                dt.AcceptChanges()
+            End If
+
+
+            dgv.DataSource = dt
+
 
 
             If dgv IsNot Nothing Then
-                frm.Size = New Size(500, 500)
-                dgv.Size = New Size(frm.Size.Width, frm.Size.Height)
-                dgv.Dock = DockStyle.Fill
-                dgv.Anchor = AnchorStyles.Left
-                dgv.Anchor = AnchorStyles.Top
-                dgv.ReadOnly = True
-                frm.Controls.Add(dgv)
-                frm.StartPosition = FormStartPosition.CenterScreen
-                frm.ShowDialog()
-            End If
+                    dgv.AutoSize = DataGridViewAutoSizeColumnMode.Fill
+                    dgv.Dock = DockStyle.Fill
+                    dgv.ReadOnly = True
+                    frm.Controls.Add(dgv)
+                    frm.Width *= 2
+                    frm.StartPosition = FormStartPosition.CenterScreen
+                    frm.ShowDialog()
+                End If
 
 
         Catch ex As System.Exception
@@ -578,7 +600,6 @@ Public Class frmUeberstundenauszahlen
     Private Sub calcUeberstunden()
 
 
-
         If txtAusz.Text <> "" AndAlso IsNumeric(txtAusz.Text) Then
 
             Dim summeAusz = CDbl(txtAusz.Text)
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.Designer.vb
new file mode 100644
index 00000000..68d0900e
--- /dev/null
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.Designer.vb
@@ -0,0 +1,37 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmUeberstundenliste
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    '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.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.SuspendLayout()
+        '
+        'frmUeberstundenliste
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(736, 348)
+        Me.Name = "frmUeberstundenliste"
+        Me.Text = "frmUeberstundenliste"
+        Me.ResumeLayout(False)
+
+    End Sub
+End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.resx b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.vb
new file mode 100644
index 00000000..83f40b7f
--- /dev/null
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenliste.vb
@@ -0,0 +1,3 @@
+Public Class frmUeberstundenliste
+
+End Class
\ No newline at end of file
diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
index edcb1ff9..55eec870 100644
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -388,6 +388,12 @@
     <Compile Include="Mitarbeiterverzeichnis\frmUeberstundenauszahlen.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Mitarbeiterverzeichnis\frmUeberstundenliste.Designer.vb">
+      <DependentUpon>frmUeberstundenliste.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Mitarbeiterverzeichnis\frmUeberstundenliste.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="My Project\Resources.Designer.vb">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -778,6 +784,9 @@
     <EmbeddedResource Include="Mitarbeiterverzeichnis\frmUeberstundenauszahlen.resx">
       <DependentUpon>frmUeberstundenauszahlen.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Mitarbeiterverzeichnis\frmUeberstundenliste.resx">
+      <DependentUpon>frmUeberstundenliste.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>