Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb

@@ -112,7 +112,7 @@ Public Class cAufschubKonten
             Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
 
 
-                Using cmd As New SqlCommand("SELECT * FROM tblBrgAufschubKonten WHERE brgakto_gs_standort=@brgakto_gs_standort  " & IIf(firma <> 0, " AND brgakto_firma=@brgakto_firma", ""), conn)
+                Using cmd As New SqlCommand("SELECT * FROM tblBrgAufschubKonten WHERE brgakto_gs_standort=@brgakto_gs_standort  " & IIf(firma <> 0, " AND brgakto_firmaID=@brgakto_firmaID", ""), conn)
                     cmd.Parameters.AddWithValue("@brgakto_gs_standort", brgakto_gs_standort)
                     If firma <> 0 Then cmd.Parameters.AddWithValue("@brgakto_firmaID", brgakto_firmaID)
                     Dim dr = cmd.ExecuteReader()
@@ -250,7 +250,7 @@ Public Class cAufschubKonten
 
         Try
 
-            Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,)
+            Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate.ToShortDateString & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,)
 
         Catch ex As Exception
             MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)

VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.vb

@@ -1007,40 +1007,15 @@ Public Class frmMessenger
     Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnSendAtt.Click
         If Not CHAT.chat_aktiv Then MsgBox("Chat inaktiv!") : Exit Sub
         If CHAT IsNot Nothing Then
-            Dim fd As New OpenFileDialog
-            '  fd.Filter = "Excel Dateien|*.xls;*.xlsx"
-            fd.RestoreDirectory = True
-            fd.Title = "Datei auswählen"
-
-            ' fd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
-
-            'fd.Filter = "Image Files(*.BMP;*.JPG;*.GIF;*.PNG)|*.BMP;*.JPG;*.GIF;*.PNG"
-            'fd.FilterIndex = 2
-
-            If fd.ShowDialog() = System.Windows.Forms.DialogResult.OK And fd.FileName <> "" Then
-                saveFileAtt(fd.FileName)
-                'Dim fileName = New System.IO.FileInfo(fd.FileName).Name
-                'Dim docId = -1
-                'If saveToDS(fileName, fd.FileName, docId) Then
-
-                '    Dim MSG As New VERAG_PROG_ALLGEMEIN.cMessenger.cMessenger_ChatMessages(CHAT.chat_id, VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)
-                '    MSG.chatMg_type = "ATTACHMENT"
-                '    MSG.chatMg_text = fileName
-                '    MSG.chatMg_anhang_docId = docId
-                '    MSG.chatMg_maName = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.Fullname
-                '    MSG.chatMg_maFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
-
-                '    If MSG.SAVE(True, CHAT.CHAT_MEMBERS) Then
-                '        SEND_TOKEN_NEW_MESSAGE()
-                '        ' CHAT.CHAT_MESSAGES.Add(MSG)
-                '        SET_ALL_READ()
-                '        REFRESH_CHAT()
-                '        rtbChatMessage.Text = ""
-                '        rtbChatMessage.Focus()
-                '    End If
-                ' End If
-            End If
+            Using fd As New OpenFileDialog()
+                fd.Title = "Datei auswählen"
+                fd.RestoreDirectory = True
+                fd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
 
+                If fd.ShowDialog(Me) = DialogResult.OK AndAlso Not String.IsNullOrEmpty(fd.FileName) Then
+                    saveFileAtt(fd.FileName)
+                End If
+            End Using
         End If
     End Sub
 

VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb

@@ -1065,7 +1065,7 @@ Public Class cTimasAPI
         End Try
     End Function
 
-    Public Sub getTimeAccounts(ByRef from As Date, ByRef toDate As Date, ByRef employeeNr As Integer, ByRef accountsdt As DataTable, ByRef dt As DataTable)
+    Public Sub getTimeAccounts(ByRef from As Date, ByRef toDate As Date, ByRef employeeNr As Integer, ByRef accountsdt As DataTable, ByRef dt As DataTable, Optional ByRef employeedt As DataTable = Nothing)
 
         Try
 
@@ -1084,8 +1084,21 @@ Public Class cTimasAPI
             For Each row As DataRow In accountsdt.Rows
                 id &= row("accountid") & ","
             Next
+
             rest.AddQueryParam("accounts", id)
-            rest.AddQueryParam("employees", employeeNr)
+
+            Dim idEmployee As String = ""
+            If employeedt IsNot Nothing AndAlso employeedt.Rows.Count > 0 Then
+                For Each row As DataRow In employeedt.Rows
+                    idEmployee &= row("employeeId") & ","
+                Next
+
+            Else
+                idEmployee = employeeNr
+            End If
+
+
+            rest.AddQueryParam("employees", idEmployee)
 
             Dim sbResponseBody As String
 
@@ -1117,6 +1130,7 @@ Public Class cTimasAPI
             If dt IsNot Nothing And Not dt.Columns.Contains("accountid") Then
 
                 dt.Columns.Add("accountid", GetType(Integer))
+                dt.Columns.Add("employeeid", GetType(Integer))
                 dt.Columns.Add("date", GetType(String))
                 dt.Columns.Add("value", GetType(Double))
                 dt.Columns.Add("multiplier", GetType(String))
@@ -1133,6 +1147,7 @@ Public Class cTimasAPI
                 If accounts.StringOf("value") <> "" Then
                     Dim R As DataRow = dt.NewRow
                     R("accountid") = accounts.IntOf("accountid")
+                    R("employeeid") = accounts.IntOf("employeeid")
                     R("date") = accounts.StringOf("date")
                     Dim timeToDouble = accounts.StringOf("value").Replace("-", "")
                     Dim ts As TimeSpan = New TimeSpan(Integer.Parse(timeToDouble.Split(":"c)(0)), Integer.Parse(timeToDouble.Split(":"c)(1)), 0)
@@ -1144,6 +1159,8 @@ Public Class cTimasAPI
 
             End While
 
+            If dt.Rows.Count = 0 Then Exit Sub
+
             dt.DefaultView.Sort = " accountid asc, date asc"
             dt = dt.DefaultView.ToTable()
 

VERAG_PROG_ALLGEMEIN/cGesamtsicherheitsReferenz.vb

@@ -199,7 +199,7 @@ Public Class cGesamtsicherheitsReferenz
     	                when gsp_art = 'Open' then (gsp_sicherheitsbetrag * -1)
     	                when gsp_art = 'Close' then gsp_sicherheitsbetrag
                     end) 
-					as SicherheitsSaldoPositionen from [tblGesamtsicherheitsPositionen] Where gsp_gsid IN (select gs_gsId from [tblGesamtsicherheit] where gs_standort = '" & gsr_standort & "' ))"
+					as SicherheitsSaldoPositionen from [tblGesamtsicherheitsPositionen] Where gsp_gsnr IN (select gs_gsnr from [tblGesamtsicherheit] where gs_standort = '" & gsr_standort & "' ))"
 
         Dim dt As New DataTable
         Dim mrn As Double = 0

VERAG_PROG_ALLGEMEIN/cSicherheiten.vb

@@ -1,6 +1,16 @@
 Imports System.Data.SqlClient
 Imports System.Reflection
 
+Public Class Sicherheiten_Standort
+    Public Const VERAG_AG As String = "VERAG AG"
+    Public Const VERAG_GMBH As String = "VERAG GmbH"
+    Public Const VERAG_CS As String = "VERAG CS"
+    Public Const IMEX As String = "IMEX"
+    Public Const UNISPED As String = "UNISPED GmbH"
+    Public Const AMBAR As String = "AMBAR GmbH"
+    Public Const ATILLA As String = "ATILLA GmbH"
+End Class
+
 Public Class cSicherheiten
 
     Property gs_gsId As Integer