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

initATLASAufschubkonten/frmStartOptions.Designer.vb

@@ -195,6 +195,7 @@ Partial Class frmStartOptions
         Me.lblRoutineManager = New System.Windows.Forms.Label()
         Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Button21 = New System.Windows.Forms.Button()
+        Me.LinkLabel48 = New System.Windows.Forms.LinkLabel()
         Me.pnl.SuspendLayout()
         CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tbcntr.SuspendLayout()
@@ -232,6 +233,7 @@ Partial Class frmStartOptions
         '
         Me.pnl.BackColor = System.Drawing.Color.White
         Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.LinkLabel48)
         Me.pnl.Controls.Add(Me.cbxVermerk)
         Me.pnl.Controls.Add(Me.cbxDatevTest)
         Me.pnl.Controls.Add(Me.cbxDatevOpen)
@@ -2406,6 +2408,17 @@ Partial Class frmStartOptions
         Me.Button21.Text = "AAS Sendung 24h"
         Me.Button21.UseVisualStyleBackColor = True
         '
+        'LinkLabel48
+        '
+        Me.LinkLabel48.AutoSize = True
+        Me.LinkLabel48.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.LinkLabel48.Location = New System.Drawing.Point(405, 135)
+        Me.LinkLabel48.Name = "LinkLabel48"
+        Me.LinkLabel48.Size = New System.Drawing.Size(129, 13)
+        Me.LinkLabel48.TabIndex = 77
+        Me.LinkLabel48.TabStop = True
+        Me.LinkLabel48.Text = "ZOLARIS Anh. UNISPED"
+        '
         'frmStartOptions
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2629,4 +2642,5 @@ Partial Class frmStartOptions
     Friend WithEvents LinkLabel46 As LinkLabel
     Friend WithEvents LinkLabel47 As LinkLabel
     Friend WithEvents PictureBox21 As PictureBox
+    Friend WithEvents LinkLabel48 As LinkLabel
 End Class

initATLASAufschubkonten/frmStartOptions.vb

@@ -332,7 +332,32 @@ Public Class frmStartOptions
             Case "ezoll_anhaenge"
                 Dim f As New frmInfo(PARAM)
                 f.Show()
+
                 VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+                importFileFromEZOLL(Now) 'VERAG
+
+
+                VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
+                importFileFromEZOLL(Now)
+
+                closeMe()
+
+
+            Case "ezoll_anhaenge_verag"
+                Dim f As New frmInfo(PARAM)
+                f.Show()
+                VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+
+                importFileFromEZOLL(Now)
+
+                closeMe()
+
+
+            Case "ezoll_anhaenge_unisped"
+                Dim f As New frmInfo(PARAM)
+                f.Show()
+                VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+                VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
 
                 importFileFromEZOLL(Now)
 
@@ -480,10 +505,13 @@ Public Class frmStartOptions
     End Function
     Function importFileFromEZOLL(datum As Date) As Boolean
         Try
-
+            Dim db = "EZOLL"
+            Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+                Case "UNISPED" : db = "EZOLL_UNISPED"
+            End Select
             Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
             Dim dt As DataTable = sql.loadDgvBySql("SELECT [zzAktivitaet].LizenzNr,[zzAktivitaet].Operatorid,[zzAktivitaet].AnmID,MsgTyp,[zzAktivitaet].ErstelltAm,pfad,LRN,CRN ,[zzAktivitaet].VorgangID   FROM [zzAktivitaet]     INNER JOIN zsAnmRefs On zsAnmrefs.AnmID=zzAktivitaet.AnmID 
-                                                where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00'  and pfad is not null", "EZOLL", 200)
+                                                where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00'  and pfad is not null", db, 200)
             If dt IsNot Nothing Then
                 For Each row In dt.Rows
                     Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"), row("LizenzNr"))
@@ -526,7 +554,12 @@ Public Class frmStartOptions
                                 If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD)
 
                                 destFull = ""
-                                copyFile(cDHF_Anhaenge.pfad.Replace("C:\", "\\Ezoll\c$\"), ZIEL_PFAD, destFull)
+                                Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+
+                                    Case "UNISPED" : copyFile(cDHF_Anhaenge.pfad.Replace("C:\", "\\SRV04.unisu.at\c$\"), ZIEL_PFAD, destFull)
+                                    Case Else : copyFile(cDHF_Anhaenge.pfad.Replace("C:\", "\\Ezoll\c$\"), ZIEL_PFAD, destFull)
+
+                                End Select
 
                                 If destFull <> "" Then
                                     If DS.insertDataToDATENSERVER(destFull) Then
@@ -3887,4 +3920,11 @@ Public Class frmStartOptions
         Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try
         Me.Cursor = Cursors.Default
     End Sub
+
+    Private Sub LinkLabel48_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel48.LinkClicked
+        Dim f = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
+        importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), If(CheckBox3.Checked, Now.AddMonths(-1), Now)))
+        VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = f
+    End Sub
 End Class