Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN
This commit is contained in:
@@ -221,10 +221,9 @@ Public Class frmAsfinag_NachrichtenVerabeitung
|
||||
Private Sub frmTCNachrichtenVerarbeitung_Shown(sender As Object, e As EventArgs) Handles Me.Shown
|
||||
If allowClose Then
|
||||
Me.Refresh()
|
||||
|
||||
Button2.PerformClick()
|
||||
System.Threading.Thread.Sleep(2000)
|
||||
Button1.PerformClick()
|
||||
|
||||
System.Threading.Thread.Sleep(20000)
|
||||
|
||||
Me.Close()
|
||||
|
||||
@@ -483,10 +483,24 @@ Public Class frmStartOptions
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
Dim autoclose As Boolean = True
|
||||
Dim testFTP As Boolean = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
|
||||
Dim fmCLF As New frmAsfinag_NachrichtenVerabeitung("CLF", testFTP)
|
||||
Dim fmCLF As New frmAsfinag_NachrichtenVerabeitung("CLF", testFTP, autoclose)
|
||||
fmCLF.Show()
|
||||
AddHandler fmCLF.FormClosed, AddressOf closeMe
|
||||
Dim fmTTR As New frmAsfinag_NachrichtenVerabeitung("TTR", testFTP)
|
||||
Dim fmTTR As New frmAsfinag_NachrichtenVerabeitung("TTR", testFTP, autoclose)
|
||||
fmTTR.Show()
|
||||
AddHandler fmTTR.FormClosed, AddressOf closeMe
|
||||
closeMe()
|
||||
|
||||
Case "ASFINAG_IMPORT_TEST"
|
||||
Dim f As New frmInfo(PARAM)
|
||||
f.Show()
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||
Dim autoclose As Boolean = True
|
||||
Dim testFTP As Boolean = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM
|
||||
Dim fmCLF As New frmAsfinag_NachrichtenVerabeitung("CLF", testFTP, autoclose)
|
||||
fmCLF.Show()
|
||||
AddHandler fmCLF.FormClosed, AddressOf closeMe
|
||||
Dim fmTTR As New frmAsfinag_NachrichtenVerabeitung("TTR", testFTP, autoclose)
|
||||
fmTTR.Show()
|
||||
AddHandler fmTTR.FormClosed, AddressOf closeMe
|
||||
closeMe()
|
||||
@@ -3826,6 +3840,7 @@ Public Class frmStartOptions
|
||||
Dim frm As New Form
|
||||
Dim dgv As New DataGridView()
|
||||
Dim dt As DataTable = SQL.loadDgvBySql("SELECT dbo.CLFBody.PKHistory,
|
||||
dbo.CLFBody.ImportDate,
|
||||
dbo.CLFBody.PKFileName,
|
||||
dbo.CLFBody.PKLine,
|
||||
dbo.CLFBody.RecordType,
|
||||
|
||||
Reference in New Issue
Block a user