API Einstellungen, Überstundenauszahlung, Sammelrechnungsdruck, etc

UID/Mitarbeiter/frmMitarbDetails.vb

@@ -908,7 +908,7 @@ Public Class frmMitarbDetails
 
             ZOLLDATENBEARB = True
         ElseIf tbcntr.SelectedIndex = 3 Then
-            timas = New VERAG_PROG_ALLGEMEIN.cTimasAPI()
+            timas = New VERAG_PROG_ALLGEMEIN.cTimasAPI("timas")
 
             If IsNothing(mitarbeiter.mit_timasId) Then
                 cbxTimasAngelegt.Checked = False
@@ -921,6 +921,7 @@ Public Class frmMitarbDetails
 
             btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked
             txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked
+            txtClientNr.Enabled = Not cbxTimasAngelegt.Checked
             dgvData.Visible = Not cbxTimasAngelegt.Checked
             TabControl1.Visible = Not cbxTimasAngelegt.Checked
             rtfInfoTimas.Visible = cbxTimasAngelegt.Checked
@@ -964,7 +965,7 @@ Public Class frmMitarbDetails
             Exit Sub
         End If
 
-        Dim cs = New cCreditSafeAPI
+        Dim cs = New cCreditSafeAPI("creditsafe")
         Dim statuscode = cs.authenticate(txtCSUser.Text, txtCSPW.Text)
         Select Case statuscode
 
@@ -1210,6 +1211,7 @@ Public Class frmMitarbDetails
 
         btnMAanlegen.Visible = Not cbxTimasAngelegt.Checked
         txtLohnNr.Enabled = Not cbxTimasAngelegt.Checked
+        txtClientNr.Enabled = Not cbxTimasAngelegt.Checked
         dgvData.Visible = Not cbxTimasAngelegt.Checked
         rtfInfoTimas.Visible = cbxTimasAngelegt.Checked
         btngetInfo.Visible = cbxTimasAngelegt.Checked
@@ -1252,7 +1254,7 @@ Public Class frmMitarbDetails
 
         If txtLohnNr.Text = "" Then
 
-            If Not vbYes = MsgBox("Möchten Sie den Mitarbeiter ohne Lohnnummer anlegen?" & vbNewLine & "Ohne Lohnnummer kann kein Ableich ins Lohnsystem erfolgen!", vbYesNoCancel) Then
+            If Not vbYes = MsgBox("Möchten Sie den Mitarbeiter ohne Lohnnummer anlegen?" & vbNewLine & "Ohne Lohnnummer kann kein Abgleich ins Lohnsystem erfolgen!", vbYesNoCancel) Then
                 Return False
             End If
 
@@ -1301,10 +1303,6 @@ Public Class frmMitarbDetails
 
     End Sub
 
-    Private Sub PictureBox9_Click_1(sender As Object, e As EventArgs)
-        Dim webAddress As String = "https://zeit.verag.ag/"
-        Process.Start(webAddress)
-    End Sub
 
     Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged
         If dgvData Is Nothing And dgvData.Rows.Count < 1 Then Exit Sub

UID/Mitarbeiter/frmMitarbTimas.vb

@@ -41,7 +41,7 @@ Public Class frmMitarbTimas
 
     End Sub
     Private Sub initMitarbeiter(mid As Integer, Optional _isUpdate As Boolean = False)
-        timas = New cTimasAPI
+        timas = New cTimasAPI("timas")
         emp = timas.getEmployee(mid)
         avisoEmp = New VERAG_PROG_ALLGEMEIN.cMitarbeiter(emp.externid)
 

UID/Mitarbeiter/usrCntlMitarbeiter.vb

@@ -212,7 +212,7 @@ Public Class usrCntlMitarbeiter
             dgvTimasNew.DataSource = dt
 
         Else
-            Dim timas As New cTimasAPI()
+            Dim timas As New cTimasAPI("timas")
             timas.getEmployeeList(dt)
             dgvTimasNew.DataSource = dt
 
@@ -715,7 +715,6 @@ Public Class usrCntlMitarbeiter
     Private Sub uploadToWiki()
 
         Me.Cursor = Cursors.WaitCursor
-        Dim token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcGkiOjEsImdycCI6MSwiaWF0IjoxNjg3OTMzNDU3LCJleHAiOjE3MTk0OTEwNTcsImF1ZCI6InVybjp3aWtpLmpzIiwiaXNzIjoidXJuOndpa2kuanMifQ.ul2loFYVHdco2Ia2LcS4nme4PdgcuU6QKrunucECebX5LhcsSyuEg-lKiP2X3JXW57Ym4oCBjamDd5-5uqbQd9hOQ5CDO6yqK2r8TPNxivK29oAl2wfcHaKOe7QNti0yRlMpomJjc_5qaegeeLjN5w-lYbbqtSz_6y8GkPPr0P3l4coIk5IzngGazj8XLYGGN6y5qT4s8IR0sNhfz0hJAlIeVTeFKl8KFZMpFKvBnOjkL0GYOYjrHzPLSUAhe8hCGVcA7rWsweVjjvOclFDDFwZ0SwOY0TZqvz-LOsZ3V7ucQaT3flAjuHiEhODGJguQRBs67U8lVO2cxbJJyR3FUA"
         Dim dgv As New DataGridView
 
         If TabControl1.SelectedIndex = 0 Then
@@ -748,11 +747,25 @@ Public Class usrCntlMitarbeiter
 
         End If
 
+        Dim SQL As New SQL
+        Dim API As New DataTable
+        Dim apiSettingsloaded As Boolean = False
+        Dim API_STRING
+
+        API = SQL.loadDgvBySql("SELECT top(1) * FROM tblAPIEinstellungen WHERE api_program='WIKI' and api_productive ='" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "0", "1") & "'", "ADMIN")
+        If API.Rows.Count = 0 Then
+            MsgBox("keine gültigen API-Einstellungen für WIKI gefunden!")
+        Else
+            apiSettingsloaded = True
+            API_STRING = API.Rows(0).Item("api_url")
+        End If
+
+        If apiSettingsloaded = False Then Exit Sub
 
         For Each row As DataGridViewRow In dgv.Rows
             If row.Cells("mit_foto_DocId").Value > 0 Then
                 Dim file = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(row.Cells("mit_foto_DocId").Value)
-                Dim succeess = uploadPictureToWIKI(token, 4, file) 'Folder 4 -> Mitarbeiterfotos
+                Dim succeess = uploadPictureToWIKI(API, 4, file) 'Folder 4 -> Mitarbeiterfotos
             End If
 
         Next
@@ -768,12 +781,13 @@ Public Class usrCntlMitarbeiter
 
 
 
-    Private Function uploadPictureToWIKI(authenticationToken As String, folderIDx As Integer, image As String) As String
+    Private Function uploadPictureToWIKI(API As DataTable, folderIDx As Integer, image As String) As String
         Try
 
             VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
 
-            Dim API_STRING = "https://wiki.verag.ag"
+            Dim API_String = API.Rows(0).Item("api_url")
+
             Dim rest As New Chilkat.Rest
             Dim success As Boolean
             Dim failureDesc As String
@@ -782,7 +796,7 @@ Public Class usrCntlMitarbeiter
             Dim bTls As Boolean = True
             Dim port As Integer = 443
             Dim bAutoReconnect As Boolean = True
-            success = rest.Connect(API_STRING, port, bTls, bAutoReconnect)
+            success = rest.Connect(API_String, port, bTls, bAutoReconnect)
             If (success <> True) Then
                 Debug.WriteLine("ConnectFailReason: " & rest.ConnectFailReason)
                 Debug.WriteLine(rest.LastErrorText)
@@ -792,7 +806,7 @@ Public Class usrCntlMitarbeiter
 
             API_STRING &= "/u"
 
-            rest.AddHeader("Authorization", "Bearer " & authenticationToken)
+            rest.AddHeader("Authorization", "Bearer " & API.Rows(0).Item("api_token"))
             rest.AddHeader("Content-Type", "multipart/form-data")
 
             Dim filename = New IO.FileInfo(image).Name