diff --git a/UID/usrCntlAPI.vb b/UID/usrCntlAPI.vb index 7a78a3f..083c468 100644 --- a/UID/usrCntlAPI.vb +++ b/UID/usrCntlAPI.vb @@ -39,6 +39,7 @@ Public Class usrCntlAPI 'cboType.fillWithSQL("SELECT distinct(api_Type) FROM [tblAPI] ", False, "ADMIN", True) cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FTP", "FTP")) cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MAIL", "MAIL")) + cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("REST", "REST")) cboAPIArt.Items.Clear() cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) @@ -46,8 +47,11 @@ Public Class usrCntlAPI cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AVISO_OUT_BELEGMAIL", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_BELEGMAIL)) cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG_OUT_EZA", VERAG_PROG_ALLGEMEIN.cAPI_ART.VERAG_OUT_EZA)) cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG_OUT_NCTS", VERAG_PROG_ALLGEMEIN.cAPI_ART.VERAG_OUT_NCTS)) - cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MSE", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_MSE)) + cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MULTISERVICE", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_MSE)) cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MDM SAMMELRECHNUNG", VERAG_PROG_ALLGEMEIN.cAPI_ART.SDL_OUT_SAMMELRECHNUNG)) + cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CREDITSAFE", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS)) + cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SAMMELRECHNUNG", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_SAMMELRECHNUNG)) + cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EINZELRECHNUNG", VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_EINZELRECHNUNG)) cboAPIArt.changeItem("") diff --git a/initATLASAufschubkonten/cWorker_Verwahrung.vb b/initATLASAufschubkonten/cWorker_Verwahrung.vb index 3156189..ee385a0 100644 --- a/initATLASAufschubkonten/cWorker_Verwahrung.vb +++ b/initATLASAufschubkonten/cWorker_Verwahrung.vb @@ -1192,8 +1192,17 @@ Anzeige: Else TextHTMLtable &= " - " End If - TextHTMLtable &= "" & GSPOS.gsp_EH_Anzahl & "" - If gs_row IsNot Nothing AndAlso Not IsDBNull(gs_row("gs_gewicht")) AndAlso gs_row("gs_gewicht") <> "" Then + + If GSPOS.gsp_EH_Anzahl IsNot Nothing AndAlso IsNumeric(GSPOS.gsp_EH_Anzahl) Then + TextHTMLtable &= "" & GSPOS.gsp_EH_Anzahl & "" + Else + TextHTMLtable &= " - " + End If + + + + + If gs_row IsNot Nothing AndAlso Not IsDBNull(gs_row("gs_gewicht")) Then TextHTMLtable &= "" & gs_row("gs_gewicht").ToString & "" Else TextHTMLtable &= " - " diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 3357b54..6515c50 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -917,9 +917,6 @@ Public Class frmStartOptions Dim sendMail As Boolean = True importCreditsafeEvents(CDate(Today().AddDays(-1)).ToShortDateString, checkDate, upateKunden, setzeInfoImKunden, sendMail, False) - - - closeMe() Case "CREDITSAFE_UPLOADS" @@ -6815,7 +6812,6 @@ weiter: '1. Use Portfolio-Specific Events for Targeted Monitoring: Start with the portfolio-specific endpoint to focus on changes relevant to a particular portfolio. '2. Leverage Global Events for a Broader View: Use the all-events endpoint to gain a comprehensive overview of all notifications across your portfolios. - '3. Drill Down to Company-Level Events WHEN NEEDED: For detailed insights into a specific company, use the company-specific endpoint. '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -6870,7 +6866,7 @@ weiter: If Not companyDetailEventsRequest Then - Dim API_Start_Daily = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN, VERAG_PROG_ALLGEMEIN.cAPI_Type.REST, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS, "DAiLY-CREDITSAFE-EVENTS-IMPORT", "CS") + Dim API_Start_Daily = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN, VERAG_PROG_ALLGEMEIN.cAPI_Type.REST, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_IN_CS, "DAILY-CREDITSAFE-EVENTS-IMPORT", "CS") Dim dtMonitoredRequest As New DataTable @@ -7002,8 +6998,9 @@ repeatRequest: End If If APIText.Contains("Invalid token") Then - If Not cs.authenticate() = 200 Then - API.UPDTAE_ERR("ERROR", APIText, "importCreditsafeEvents") + Dim ERR = Not cs.authenticate() + If ERR <> "200" Then + API.UPDTAE_ERR("ERROR", APIText & vbNewLine & "ERR-Code: " & ERR, "importCreditsafeEvents") Exit For Else Thread.Sleep(4000) @@ -7017,7 +7014,7 @@ repeatRequest: End If - Thread.Sleep(1000) + Thread.Sleep(500) 'von 1000 auf 500 reduziert! Next If dtCreditsafe.Rows.Count = (counter - dt_fehlendeCreditsafeIDS.Rows.Count) Then