Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

UID/ADMIN.vbproj

@@ -1071,6 +1071,7 @@
     <None Include="Resources\TiMaS-Paket-Time.png" />
     <None Include="Resources\active_directory2_logo.png" />
     <None Include="Resources\ok.png" />
+    <None Include="Resources\fragezeichen.png" />
     <Content Include="uid.ico" />
   </ItemGroup>
   <ItemGroup>

UID/My Project/Resources.Designer.vb

@@ -364,6 +364,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property fragezeichen() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("fragezeichen", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

UID/My Project/Resources.resx

@@ -310,4 +310,7 @@
   <data name="ok" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="fragezeichen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fragezeichen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

UID/cSqlDb.vb

@@ -1621,6 +1621,7 @@ Public Class cMitarbeiter
 
 
                 cmd.Parameters.AddWithValue("@mit_ChatEasteregg", m.mit_ChatEasteregg)
+                cmd.Parameters.AddWithValue("@mit_ChatEasteregg2", m.mit_ChatEasteregg2)
                 cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_SettingsTstmp ", If(m.mit_MAVerzeichnis_SettingsTstmp, DBNull.Value))
                 cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowGebDat ", m.mit_MAVerzeichnis_allowGebDat)
                 cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowWohnadresse ", m.mit_MAVerzeichnis_allowWohnadresse)
@@ -1723,6 +1724,7 @@ Public Class cMitarbeiter
 
 
                 cmd.Parameters.AddWithValue("@mit_ChatEasteregg", m.mit_ChatEasteregg)
+                cmd.Parameters.AddWithValue("@mit_ChatEasteregg2", m.mit_ChatEasteregg2)
                 cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_SettingsTstmp ", If(m.mit_MAVerzeichnis_SettingsTstmp, DBNull.Value))
                 cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowGebDat ", m.mit_MAVerzeichnis_allowGebDat)
                 cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowWohnadresse ", m.mit_MAVerzeichnis_allowWohnadresse)

UID/frmAPIEinstellungen.Designer.vb

@@ -22,6 +22,7 @@ Partial Class frmAPIEinstellungen
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAPIEinstellungen))
         Me.Label2 = New System.Windows.Forms.Label()
         Me.txtSuche = New System.Windows.Forms.TextBox()
         Me.btnOK = New System.Windows.Forms.Button()
@@ -29,7 +30,9 @@ Partial Class frmAPIEinstellungen
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()
         Me.cbxProduktivsystem = New System.Windows.Forms.CheckBox()
+        Me.PictureBox5 = New System.Windows.Forms.PictureBox()
         CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'Label2
@@ -50,7 +53,7 @@ Partial Class frmAPIEinstellungen
         '
         'btnOK
         '
-        Me.btnOK.Location = New System.Drawing.Point(1037, 450)
+        Me.btnOK.Location = New System.Drawing.Point(1255, 450)
         Me.btnOK.Name = "btnOK"
         Me.btnOK.Size = New System.Drawing.Size(109, 23)
         Me.btnOK.TabIndex = 20
@@ -67,13 +70,13 @@ Partial Class frmAPIEinstellungen
         Me.DataGridView.Location = New System.Drawing.Point(12, 49)
         Me.DataGridView.MultiSelect = False
         Me.DataGridView.Name = "DataGridView"
-        Me.DataGridView.Size = New System.Drawing.Size(1134, 399)
+        Me.DataGridView.Size = New System.Drawing.Size(1352, 399)
         Me.DataGridView.TabIndex = 19
         '
         'Label1
         '
         Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(661, 7)
+        Me.Label1.Location = New System.Drawing.Point(879, 7)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(485, 13)
         Me.Label1.TabIndex = 23
@@ -83,7 +86,7 @@ Partial Class frmAPIEinstellungen
         'Label3
         '
         Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(661, 26)
+        Me.Label3.Location = New System.Drawing.Point(879, 26)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(265, 13)
         Me.Label3.TabIndex = 24
@@ -99,11 +102,22 @@ Partial Class frmAPIEinstellungen
         Me.cbxProduktivsystem.Text = "Produktivsysteme"
         Me.cbxProduktivsystem.UseVisualStyleBackColor = True
         '
+        'PictureBox5
+        '
+        Me.PictureBox5.BackgroundImage = Global.ADMIN.My.Resources.Resources.fragezeichen
+        Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox5.Location = New System.Drawing.Point(1337, 23)
+        Me.PictureBox5.Name = "PictureBox5"
+        Me.PictureBox5.Size = New System.Drawing.Size(27, 22)
+        Me.PictureBox5.TabIndex = 131
+        Me.PictureBox5.TabStop = False
+        '
         'frmAPIEinstellungen
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1158, 485)
+        Me.ClientSize = New System.Drawing.Size(1376, 485)
+        Me.Controls.Add(Me.PictureBox5)
         Me.Controls.Add(Me.cbxProduktivsystem)
         Me.Controls.Add(Me.Label3)
         Me.Controls.Add(Me.Label1)
@@ -111,9 +125,11 @@ Partial Class frmAPIEinstellungen
         Me.Controls.Add(Me.txtSuche)
         Me.Controls.Add(Me.btnOK)
         Me.Controls.Add(Me.DataGridView)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "frmAPIEinstellungen"
         Me.Text = "API Verwaltung"
         CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -126,4 +142,5 @@ Partial Class frmAPIEinstellungen
     Friend WithEvents Label1 As Label
     Friend WithEvents Label3 As Label
     Friend WithEvents cbxProduktivsystem As CheckBox
+    Friend WithEvents PictureBox5 As PictureBox
 End Class

UID/frmAPIEinstellungen.vb

@@ -29,10 +29,10 @@ Public Class frmAPIEinstellungen
 
             If sqlwhere = "" Then
 
-                APIBind.initBinding("SELECT [api_active],[api_productive], [api_program],[api_id],[api_url] ,[api_user],[api_password] ,[api_UseToken],[api_token] ,[api_description] FROM " & table & " WHERE api_productive = " & IIf(cbxProduktivsystem.Checked, "1", "0"), table)
+                APIBind.initBinding("SELECT [api_active],[api_productive], [api_program],[api_id],[api_url] ,[api_user],[api_password] ,[api_UseToken],[api_token] ,[api_description], [api_debugpath] FROM " & table & " WHERE api_productive = " & IIf(cbxProduktivsystem.Checked, "1", "0"), table)
             Else
 
-                APIBind.initBinding("Select [api_active], [api_productive], [api_program], [api_id], [api_url], [api_user], [api_password], [api_useToken], [api_token], [api_description]  FROM " & table & " WHERE api_productive = " & IIf(cbxProduktivsystem.Checked, "1", "0") & sqlwhere, table)
+                APIBind.initBinding("Select [api_active], [api_productive], [api_program], [api_id], [api_url], [api_user], [api_password], [api_useToken], [api_token], [api_description], [api_debugpath]  FROM " & table & " WHERE api_productive = " & IIf(cbxProduktivsystem.Checked, "1", "0") & sqlwhere, table)
 
             End If
 
@@ -61,20 +61,34 @@ Public Class frmAPIEinstellungen
                     .Columns("api_Token").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
                     .Columns("api_description").HeaderText = "Beschreibung"
                     .Columns("api_description").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                    .Columns("api_debugpath").HeaderText = "Debug-File"
+                    .Columns("api_debugpath").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
 
 
                     If .Columns("isRunning") Is Nothing Then
 
                         Dim c As New DataGridViewImageColumn
                         c.Name = "isRunning" : c.HeaderText = "Online"
-                        c.Image = My.Resources.wait : c.ImageLayout = DataGridViewImageCellLayout.Zoom
+                        c.Image = New Bitmap(1, 1)
                         c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
                         c.DefaultCellStyle.Tag = "Online"
                         .Columns.Add(c)
 
                     End If
 
+                    If .Columns("pathToFile") Is Nothing Then
+
+                        Dim c As New DataGridViewImageColumn
+                        c.Name = "pathToFile" : c.HeaderText = "Debug-Pfad"
+                        c.Image = New Bitmap(1, 1)
+                        c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
+                        c.DefaultCellStyle.Tag = "pathToFile"
+                        .Columns.Add(c)
+
+                    End If
+
                     For Each r As DataGridViewRow In .Rows
+
                         If r.Cells("api_url").Value Is DBNull.Value Then
                             r.DefaultCellStyle.ForeColor = Color.Gray
                         ElseIf CBool(r.Cells("api_active").Value) = False Then
@@ -86,6 +100,13 @@ Public Class frmAPIEinstellungen
                         Else
                             DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.del
                         End If
+
+
+                        If r.Cells("api_debugpath").Value IsNot DBNull.Value AndAlso r.Cells("api_debugpath").Value IsNot Nothing AndAlso (r.Cells("api_debugpath").Value.ToString.StartsWith("\\") Or r.Cells("api_debugpath").Value.ToString.StartsWith("C:\")) Then
+                            DirectCast(r.Cells("pathToFile"), DataGridViewImageCell).Value = My.Resources.search
+
+                        End If
+
                     Next
                 End If
 
@@ -95,7 +116,7 @@ Public Class frmAPIEinstellungen
 
 
         Catch ex As Exception
-            MsgBox(ex.Message)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
 
     End Sub
@@ -108,7 +129,7 @@ Public Class frmAPIEinstellungen
             e.Row.Cells("api_token").Value = False
 
         Catch ex As Exception
-            MsgBox(ex.Message)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
         End Try
     End Sub
 
@@ -205,7 +226,22 @@ Public Class frmAPIEinstellungen
 
     End Sub
 
-    Private Sub DataGridView_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles DataGridView.CellContentDoubleClick
+    Private Sub DataGridView_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles DataGridView.CellDoubleClick
+        Me.Cursor = Cursors.WaitCursor
+        Dim tmprowindex As Integer = e.RowIndex
+        If DataGridView.Columns(e.ColumnIndex).Name = "pathToFile" Then
 
+            If DataGridView.CurrentRow.Cells("api_debugpath").Value IsNot DBNull.Value AndAlso (DataGridView.CurrentRow.Cells("api_debugpath").Value.ToString.StartsWith("\\") Or DataGridView.CurrentRow.Cells("api_debugpath").Value.ToString.StartsWith("C:\")) Then
+                Process.Start(DataGridView.CurrentRow.Cells("api_debugpath").Value)
+            End If
+        Else
+
+        End If
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click
+        Dim webAddress As String = "https://wiki.verag.ag/de/software/Offene_Punkte#aviso-schnittstellen-zu-fremdsystemen"
+        Process.Start(webAddress)
     End Sub
 End Class

UID/usrCntlDatenarchiv.vb

@@ -147,7 +147,7 @@ Public Class usrCntlDatenarchiv
 
                     Dim c As New DataGridViewImageColumn
                     c.Name = "open" : c.HeaderText = "open"
-                    c.Image = My.Resources.wait : c.ImageLayout = DataGridViewImageCellLayout.Zoom
+                    c.Image = New Bitmap(1, 1)
                     c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
                     c.DefaultCellStyle.Tag = "open"
                     .Columns.Add(c)
@@ -157,9 +157,8 @@ Public Class usrCntlDatenarchiv
                 For Each r As DataGridViewRow In .Rows
 
                     If r.Cells("Param_value").Value IsNot DBNull.Value AndAlso r.Cells("Param_value").Value.ToString.StartsWith("\\") Then
-                        DirectCast(r.Cells("open"), DataGridViewImageCell).Value = My.Resources.stift
+                        DirectCast(r.Cells("open"), DataGridViewImageCell).Value = My.Resources.search
-                    Else
+
-                        DirectCast(r.Cells("open"), DataGridViewImageCell).Value = My.Resources.del
                     End If
                 Next
 

initATLASAufschubkonten/cUTA.vb

@@ -3,6 +3,7 @@ Imports System.Globalization
 Imports System.IO
 Imports System.Reflection
 Imports System.Text.RegularExpressions
+Imports com.esendex.sdk
 Imports DocumentFormat.OpenXml.Bibliography
 Imports DocumentFormat.OpenXml.EMMA
 Imports DocumentFormat.OpenXml.VariantTypes
@@ -1241,7 +1242,7 @@ Public Class cUTA
         ARCHIV_PFAD = cUTA.Paramter.GET_PARAM_ByName("ARCHIV_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
         VERARBEITUNG_PFAD = cUTA.Paramter.GET_PARAM_ByName("VERARBEITUNG_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
         ZIEL_PFAD = cUTA.Paramter.GET_PARAM_ByName("ZIEL_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
-        If Not io.Directory.Exists(VERARBEITUNG_PFAD) Then io.Directory.CreateDirectory(VERARBEITUNG_PFAD)
+        If Not IO.Directory.Exists(VERARBEITUNG_PFAD) Then IO.Directory.CreateDirectory(VERARBEITUNG_PFAD)
 
         Return Paramter.getFTPConenction(API_STRING, API, programName)
 

initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb

@@ -354,7 +354,8 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
                                         End If
 
                                         'copy file to lydia 
-                                        Dim filepathToLydia = "\\share01\F\Juricevic Datensicherung\RMC_RECHNUNGEN\"
+
+                                        Dim filepathToLydia = IIf(rmc.PDFRECHNUNGEN <> "", rmc.PDFRECHNUNGEN, "\\share01\F\Juricevic Datensicherung\RMC_RECHNUNGEN\")
                                         If Dateiname.ToString.ToLower.Contains("nto") Then
                                             frmStartOptions.copyFile(d, filepathToLydia & "NETTO\")
                                         Else
@@ -512,7 +513,7 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
                 If filepath <> "" Then
                     Dim anhenge As New List(Of String)
                     anhenge.Add(filepath)
-                    VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("juricevic@verag.ag", "Wölfl-UIDNr", "Im Anhang die zu prüfenden Kunden von WÖLFL " & vbNewLine & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge)
+                    VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("juricevic@verag.ag", "Wölfl-UIDNr", "Im Anhang die zu prüfenden Kunden von WÖLFL für Importdatei: " & fi.Name & vbNewLine & "Pro Importdatei wird ein Email generiert/gesendet" & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge)
                 End If
 
             End If