From eaaa59fef644cb00d3c94004ce7d1ca8493be40b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 4 Sep 2023 08:32:07 +0200 Subject: [PATCH] timas-verbesserungen --- .../Schnittstellen/TIMAS/cTimasAPI.vb | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index 44314af2..cf045186 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -267,6 +267,7 @@ Public Class cTimasAPI success = rest.FullRequestSb("POST", "/rest/web-api/employees", sbRequestBody, sbResponseBody) If (success <> True) Then Debug.WriteLine(rest.LastErrorText) + info = rest.LastErrorText Return timasEmployeeCreated End If @@ -556,15 +557,15 @@ Public Class cTimasAPI Return "Array Failure" End If - If dt IsNot Nothing And Not dt.Columns.Contains("id") Then - dt.Columns.Add("id", GetType(Integer)) - dt.Columns.Add("externid", GetType(String)) - dt.Columns.Add("pnr1", GetType(String)) - dt.Columns.Add("firstname", GetType(String)) - dt.Columns.Add("lastname", GetType(String)) - dt.Columns.Add("gender", GetType(String)) - dt.Columns.Add("card", GetType(Integer)) - dt.Columns.Add("info", GetType(String)) + If dt IsNot Nothing And Not dt.Columns.Contains("Id") Then + dt.Columns.Add("Id", GetType(Integer)) + 'dt.Columns.Add("externid", GetType(String)) + dt.Columns.Add("Personal-Nr (Lohn)", GetType(String)) + dt.Columns.Add("Vorname", GetType(String)) + dt.Columns.Add("Nachname", GetType(String)) + dt.Columns.Add("Geschlecht", GetType(String)) + dt.Columns.Add("Ausweis-Nr", GetType(Integer)) + dt.Columns.Add("Info", GetType(String)) @@ -574,14 +575,14 @@ Public Class cTimasAPI Dim employee As Chilkat.JsonObject = jsonArray.ObjectAt(j) Dim R As DataRow = dt.NewRow - R("id") = employee.IntOf("id") - R("externid") = employee.StringOf("externid") - R("pnr1") = employee.StringOf("pnr1") - R("firstname") = employee.StringOf("firstname") - R("lastname") = employee.StringOf("lastname") - R("gender") = employee.StringOf("gender") - R("card") = employee.IntOf("card") - R("info") = employee.StringOf("info") + R("Id") = employee.IntOf("id") + '("externid") = employee.StringOf("externid") + R("Personal-Nr (Lohn)") = employee.StringOf("pnr1") + R("Vorname") = employee.StringOf("firstname") + R("Nachname") = employee.StringOf("lastname") + R("Geschlecht") = employee.StringOf("gender") + R("Ausweis-Nr") = employee.IntOf("card") + R("Info") = employee.StringOf("info") dt.Rows.Add(R) j = j + 1 End While