Azet, TimasAPI, Asfinag

2023-08-28 17:14:53 +02:00
parent 7f403e3604
commit 03638e668e
8 changed files with 178 additions and 110 deletions
--- a/VERAG_PROG_ALLGEMEIN/App.config
+++ b/VERAG_PROG_ALLGEMEIN/App.config
@@ -44,7 +44,9 @@
    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ADMINConnectionString_DEV"
      connectionString="Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" />
    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ADMINConnectionString"
-      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" />
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" />
+    <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AsfinagConnectionString"
+      connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" />
  </connectionStrings>
  <startup> 
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
--- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
@@ -76,6 +76,19 @@ Public Class SQL
        End If
    End Function

+    Public Shared Function GetAsfinagConnectionString(TESTSYSTEM) As String
+        If TESTSYSTEM Then
+            Return My.MySettings.Default.AsfinagConnectionString()
+        Else
+            Try
+                Return My.MySettings.Default.FMZOLL_PRODConnectionString
+            Catch ex As Exception
+                '   Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
+                Return "Data Source=192.168.0.91\Asfinag;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"
+            End Try
+        End If
+    End Function
+
    Public Shared Function GetFDConnectionString() As String
        If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
            Return My.MySettings.Default.FDConnectionString
@@ -212,6 +225,19 @@ Public Class SQL
        End Try
        Return Nothing

+    End Function
+
+    Public Shared Function GetNewOpenConnectionAsfinag(Optional pooling As Boolean = True) As SqlConnection
+        Dim cn As New SqlConnection()
+        Try
+            cn.ConnectionString = GetFMZOLLConnectionString() & IIf(pooling, "", ";pooling=false")
+            cn.Open()
+            Return cn
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+        Return Nothing
+
    End Function
    Public Shared Function GetNewOpenConnectionWEB(Optional pooling As Boolean = True) As SqlConnection
        Dim cn As New SqlConnection()
@@ -237,6 +263,19 @@ Public Class SQL
        End Try
        Return Nothing

+    End Function
+
+    Public Shared Function GetNewOpenConnectionFAsfinag_SYSTEM(TESTSYSTEM As Boolean, Optional pooling As Boolean = True) As SqlConnection
+        Dim cn As New SqlConnection()
+        Try
+            cn.ConnectionString = GetAsfinagConnectionString(TESTSYSTEM) & IIf(pooling, "", ";pooling=false")
+            cn.Open()
+            Return cn
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "SQL CONNECTION | " & cn.ConnectionString.Replace("BmWr501956", "*******").Replace("yp/THDd?xM+pZ$", "*******") & " | Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+        End Try
+        Return Nothing
+
    End Function
    Public Shared Function GetNewOpenConnectionSCANCANON(Optional pooling As Boolean = True) As SqlConnection
        Dim cn As New SqlConnection()
@@ -423,6 +462,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "DISPO" : conn = GetNewOpenConnectionDISPO()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
@@ -433,6 +473,7 @@ Public Class SQL
                Case "WEB" : conn = GetNewOpenConnectionWEB()
                Case "FIBU", "SYSKA" : conn = GetNewOpenConnectionSYSKA()

+
                Case "AVISO_ATILLA"
                    conn.ConnectionString = "Data Source=172.16.0.98;Initial Catalog=AVISO_ATILLA;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"
                    conn.Open()
@@ -466,6 +507,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "DISPO" : conn = GetNewOpenConnectionDISPO()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
@@ -501,6 +543,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
                Case "EZOLL" : conn = GetNewOpenConnectionEZOLL()
@@ -567,6 +610,7 @@ Public Class SQL
                    Case "SDL" : conn = GetNewOpenConnectionSDL()
                    Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                    Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                    Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                    Case "DISPO" : conn = GetNewOpenConnectionDISPO()
                    Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                    Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
@@ -618,6 +662,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "DISPO" : conn = GetNewOpenConnectionDISPO()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
@@ -661,6 +706,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
                Case "EZOLL" : conn = GetNewOpenConnectionEZOLL()
@@ -701,6 +747,7 @@ Public Class SQL
            Case "SDL" : conn = GetNewOpenConnectionSDL()
            Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
            Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+            Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
            Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
            Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
            Case "EZOLL" : conn = GetNewOpenConnectionEZOLL()
@@ -735,6 +782,7 @@ Public Class SQL
            Case "SDL" : conn = GetNewOpenConnectionSDL()
            Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
            Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+            Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
            Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
            Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
            Case "EZOLL" : conn = GetNewOpenConnectionEZOLL()
@@ -798,6 +846,7 @@ Public Class SQL
                Case "SDL" : conn = GetNewOpenConnectionSDL()
                Case "FMZOLL" : conn = GetNewOpenConnectionFMZOLL()
                Case "ADMIN" : conn = GetNewOpenConnectionADMIN()
+                Case "ASFINAG" : conn = GetNewOpenConnectionAsfinag()
                Case "ATLAS" : conn = GetNewOpenConnectionATLAS()
                Case "ATLAS_SBG" : conn = GetNewOpenConnectionATLAS_SBG()
                Case "EZOLL" : conn = GetNewOpenConnectionEZOLL()
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Public NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -345,6 +345,17 @@ Namespace My
                Return CType(Me("ADMINConnectionString"),String)
            End Get
        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false"& _ 
+            ";User ID=AppUser;Password=yp/THDd?xM+pZ$;")>  _
+        Public ReadOnly Property AsfinagConnectionString() As String
+            Get
+                Return CType(Me("AsfinagConnectionString"),String)
+            End Get
+        End Property
    End Class
 End Namespace

--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -152,5 +152,12 @@
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
      <Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</Value>
    </Setting>
+    <Setting Name="AsfinagConnectionString" Type="(Connection string)" Scope="Application">
+      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
+  &lt;ConnectionString&gt;Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;&lt;/ConnectionString&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+      <Value Profile="(Default)">Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</Value>
+    </Setting>
  </Settings>
 </SettingsFile>
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
@@ -34,6 +34,8 @@ Public Class cATEZ_NCTS_DATA
    Public Property SendungsId As Integer
    Public Property atezId As String
    Public Property json As String
+    Public Property dakosy_ref As String
+    Public Property selectedDocuments As String

    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

@@ -67,6 +69,8 @@ Public Class cATEZ_NCTS_DATA
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("status", status))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("erstellung", erstellung))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("json", json))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("dakosy_ref", dakosy_ref))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("selectedDocuments", selectedDocuments))

        Return list
    End Function
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
@@ -222,12 +222,12 @@ Public Class cTimasAPI
            Dim json As New Chilkat.JsonObject
            success = json.UpdateString("externid", mitarbeiter.mit_id)
            success = json.UpdateString("markingColor", "#3acc2d")
-            success = json.UpdateString("pnr1", mitarbeiter.mit_PersonalNr)
+            success = json.UpdateString("pnr1", mitarbeiter.mit_PersonalNr) 'für Personalverr.
            'success = json.UpdateString("pnr2", "ZZ-3A-Q")
            success = json.UpdateString("firstname", mitarbeiter.mit_vname)
            success = json.UpdateString("lastname", mitarbeiter.mit_nname)
            success = json.UpdateString("gender", IIf(mitarbeiter.mit_geschlecht = "m", "male", "female"))
-            'success = json.UpdateInt("card", 42)
+            success = json.UpdateInt("card", mitarbeiter.mit_id)
            success = json.UpdateString("info", mitarbeiter.mit_firma & " - " & mitarbeiter.mit_abteilung)
            'success = json.UpdateString("clientNumber", "5600-02")
            'success = json.UpdateInt("rfid", 178230359)
@@ -237,7 +237,7 @@ Public Class cTimasAPI

            success = json.UpdateString("entry", CDate(mitarbeiter.mit_einstiegsdatum).ToString("yyyy-MM-dd"))
            success = json.UpdateNull("exit")
-            success = json.UpdateString("importSign", "Iimport from Aviso")
+            success = json.UpdateString("importSign", "Import from Aviso")
            success = json.UpdateString("login", mitarbeiter.mit_AliasAD_Username)
            success = json.UpdateBool("loginActive", 1)
            success = json.UpdateString("email", mitarbeiter.mit_email)
@@ -452,7 +452,7 @@ Public Class cTimasAPI
        End If

        If Not mitarbeiter.mit_timasId > 0 Then
-            info = "Mitarbeiter besitzt keine TImas-Zuordnung"
+            info = "Mitarbeiter besitzt keine Timas-Zuordnung"
            Return timeEntryCreated
        End If