Timas, MDM, etc.

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