Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

2024-08-30 22:40:47 +02:00
parent 1b20fdd5d1 ad7fa10999
commit 8e79458cb0
27 changed files with 4589 additions and 2104 deletions
--- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
@@ -77,6 +77,10 @@ Public Class cKundenErweitert
    Property kde_EORIgeprueftAm As Object = Nothing
    Property kde_AdressZusatz As Object = Nothing
    Property kde_abweichendesZZVL As Object = Nothing
+    Property kde_HRNr As Object = Nothing
+    Property kde_Kapital As Object = Nothing
+    Property kde_KapitalWaehrung As Object = Nothing
+    Property kde_GruendungsDatum As Object = Nothing

    Dim SQL As New SQL

@@ -155,6 +159,10 @@ Public Class cKundenErweitert
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_EORIgeprueftAm", kde_EORIgeprueftAm))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AdressZusatz", kde_AdressZusatz))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_abweichendesZZVL", kde_abweichendesZZVL))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_HRNr", kde_HRNr))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Kapital", kde_Kapital))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_KapitalWaehrung", kde_KapitalWaehrung))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_GruendungsDatum", kde_GruendungsDatum))

        Return list
    End Function
--- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenKontakte.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenKontakte.vb
@@ -96,6 +96,12 @@ Public Class cKundenKontakte
    Property kkd_AnsprechpartnerAnrede As Object = Nothing
    Property kkd_AnsprechpartnerVorname As Object = Nothing
    Property kkd_AnsprechpartnerNachname As Object = Nothing
+    Property kkd_Ort As Object = Nothing
+    Property kkd_PLZ As Object = Nothing
+    Property kkd_Adresse As Object = Nothing
+    Property kkd_GebDatum As Object = Nothing
+    Property kkd_Land As Object = Nothing
+

    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

@@ -125,6 +131,12 @@ Public Class cKundenKontakte
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_AnsprechpartnerAnrede", kkd_AnsprechpartnerAnrede))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_AnsprechpartnerVorname", kkd_AnsprechpartnerVorname))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_AnsprechpartnerNachname", kkd_AnsprechpartnerNachname))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_Adresse", kkd_Adresse))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_Ort", kkd_Ort))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_PLZ", kkd_PLZ))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_GebDatum", kkd_GebDatum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kkd_Land", kkd_Land))
+

        Return list
    End Function
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb
@@ -24,6 +24,7 @@ Partial Class frmMessenger
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -38,12 +39,12 @@ Partial Class frmMessenger
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger))
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
        Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
-        Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel6 = New System.Windows.Forms.Panel()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label()
        Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox()
-        Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel5 = New System.Windows.Forms.Panel()
        Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.PictureBox2 = New System.Windows.Forms.PictureBox()
@@ -64,7 +65,7 @@ Partial Class frmMessenger
        Me.btnNeu = New System.Windows.Forms.Button()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
-        Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel()
+        Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
        Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement()
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.btnTeilnehmer = New System.Windows.Forms.Button()
@@ -92,9 +93,9 @@ Partial Class frmMessenger
        Me.btnSendAtt = New System.Windows.Forms.Button()
        Me.btnSenden = New System.Windows.Forms.Button()
        Me.rtbChatMessage = New System.Windows.Forms.RichTextBox()
-        Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer()
-        Me.Timer_REFRESH = New System.Windows.Forms.Timer()
-        Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
+        Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components)
+        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
+        Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -1014,6 +1015,7 @@ Partial Class frmMessenger
        Me.Controls.Add(Me.SplitContainer)
        Me.DoubleBuffered = True
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MinimizeBox = False
        Me.Name = "frmMessenger"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Messenger"
--- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
+++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb
@@ -1364,5 +1364,15 @@ Public Class frmMessenger
        'End If
    End Sub

+    Private Sub UsrCntlChat_Art_Btn1_Load(ctl As usrCntlChat_Art_Btn) Handles UsrCntlChat_Art_Btn_MACHAT.CLICKED

+    End Sub
+
+    Private Sub UsrCntlChat_Art_Btn2_Load(ctl As usrCntlChat_Art_Btn) Handles UsrCntlChat_Art_Btn_LKWCHAT.CLICKED
+
+    End Sub
+
+    Private Sub UsrCntlChat_Art_snd_Load(ctl As usrCntlChat_Art_Btn) Handles UsrCntlChat_Art_Btn_SNDCHAT.CLICKED
+
+    End Sub
 End Class
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb
@@ -22,7 +22,6 @@ 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()
@@ -53,6 +52,7 @@ Partial Class frmUeberstundenauszahlen
        Me.txtAusz50vonSaldo = New System.Windows.Forms.TextBox()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.Label12 = New System.Windows.Forms.Label()
+        Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
        Me.txtBruttoSum = New System.Windows.Forms.TextBox()
        Me.txtNettoSum = New System.Windows.Forms.TextBox()
        Me.Label11 = New System.Windows.Forms.Label()
@@ -71,7 +71,7 @@ Partial Class frmUeberstundenauszahlen
        Me.cbx100 = New System.Windows.Forms.CheckBox()
        Me.txtberAusz25 = New System.Windows.Forms.TextBox()
        Me.cbxoverwrite = New System.Windows.Forms.CheckBox()
-        Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.txt50x1 = New System.Windows.Forms.TextBox()
        Me.cbxTeilzeit = New System.Windows.Forms.CheckBox()
@@ -79,12 +79,11 @@ Partial Class frmUeberstundenauszahlen
        Me.lblWarning = New System.Windows.Forms.Label()
        Me.Label5 = New System.Windows.Forms.Label()
        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
-        Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
        Me.TabControl1 = New System.Windows.Forms.TabControl()
        Me.TabPage1 = New System.Windows.Forms.TabPage()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
        Me.cbxalle = New System.Windows.Forms.CheckBox()
-        Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
        Me.Label69 = New System.Windows.Forms.Label()
        CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
@@ -403,6 +402,17 @@ Partial Class frmUeberstundenauszahlen
        Me.Label12.TabIndex = 54
        Me.Label12.Text = "Summe"
        '
+        'LinkLabel1
+        '
+        Me.LinkLabel1.AutoSize = True
+        Me.LinkLabel1.Location = New System.Drawing.Point(447, 258)
+        Me.LinkLabel1.Name = "LinkLabel1"
+        Me.LinkLabel1.Size = New System.Drawing.Size(161, 13)
+        Me.LinkLabel1.TabIndex = 131
+        Me.LinkLabel1.TabStop = True
+        Me.LinkLabel1.Text = "zu unterschreibende Dokumente"
+        Me.LinkLabel1.Visible = False
+        '
        'txtBruttoSum
        '
        Me.txtBruttoSum.Location = New System.Drawing.Point(316, 147)
@@ -650,17 +660,6 @@ Partial Class frmUeberstundenauszahlen
        Me.PictureBox5.TabIndex = 130
        Me.PictureBox5.TabStop = False
        '
-        'LinkLabel1
-        '
-        Me.LinkLabel1.AutoSize = True
-        Me.LinkLabel1.Location = New System.Drawing.Point(447, 258)
-        Me.LinkLabel1.Name = "LinkLabel1"
-        Me.LinkLabel1.Size = New System.Drawing.Size(161, 13)
-        Me.LinkLabel1.TabIndex = 131
-        Me.LinkLabel1.TabStop = True
-        Me.LinkLabel1.Text = "zu unterschreibende Dokumente"
-        Me.LinkLabel1.Visible = False
-        '
        'TabControl1
        '
        Me.TabControl1.Controls.Add(Me.TabPage1)
@@ -724,8 +723,6 @@ Partial Class frmUeberstundenauszahlen
        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(8, 20)
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
@@ -1,6 +1,7 @@

 Imports System.Drawing
 Imports System.Globalization
+Imports System.Reflection
 Imports System.Text
 Imports System.Threading
 Imports System.Windows.Forms
@@ -501,8 +502,10 @@ Public Class frmUeberstundenauszahlen
        If TabControl1.SelectedIndex = 1 Then
            Try

+
+
                Dim dtbereitsausgezahlteUE As DataTable
-                Dim bereitsgezahlteueberstunden = "select uest_deleted as geloescht,  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, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end) as bit as ignoreAuszahlungsdatum
+                Dim bereitsgezahlteueberstunden = "select uest_deleted as geloescht,  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, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end as bit) ignoreAuszahlungsdatum
                FROM [ADMIN].[dbo].[tblUeberstunden] 
                where uest_timasId = " & MA.mit_timasId & IIf(Not cbxalle.Checked, " and uest_deleted = 0", "") & "
                Order by uest_date"
@@ -512,10 +515,14 @@ Public Class frmUeberstundenauszahlen
                With dgvUberstundenauszahlungen

                    .DataSource = dtbereitsausgezahlteUE
+
                    .Columns("geloescht").Visible = False
+                    .Columns("ignoreAuszahlungsdatum").Width = 50
                    .Columns("ignoreAuszahlungsdatum").HeaderText = "Auszdat. irgnoriert"
                    .Columns("ignoreAuszahlungsdatum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter

+
+
                    For Each row As DataGridViewRow In .Rows

                        If Not IsDBNull(row.Cells("geloescht").Value) Then
@@ -593,6 +600,7 @@ Public Class frmUeberstundenauszahlen
        End If
    End Sub

+
    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click

        Dim checkauszahlungsdatum As Boolean = False
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
@@ -759,7 +759,7 @@ Public Class cATEZ_NCTS_IN

            Dim responseStatusCode = rest.ReadResponseHeader()
            If (responseStatusCode < 0) Then
-                For i = 0 To 30 'Versuche den Header 16x abzufragen (funktioniert ab und zu nicht).
+                For i = 0 To 30 'Versuche den Header 30x abzufragen (funktioniert ab und zu nicht).
                    responseStatusCode = rest.ReadResponseHeader()
                    If responseStatusCode > 0 Then Exit For
                    Thread.Sleep(5000)