edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-12-18 15:29:31 +01:00
parent 17d24140cb d23bb31812
commit 7b639ea564
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UID/Dienstplan/frmDiestAddMa.vb
View File

@@ -744,7 +744,7 @@ Public Class frmDiestAddMa
If dgvAbwWStd.CurrentRow.Cells("dstaw_std").Value IsNot Nothing AndAlso IsNumeric(dgvAbwWStd.CurrentRow.Cells("dstaw_std").Value) Then If dgvAbwWStd.CurrentRow.Cells("dstaw_std").Value IsNot Nothing AndAlso IsNumeric(dgvAbwWStd.CurrentRow.Cells("dstaw_std").Value) Then
If Math.Floor(dgvAbwWStd.CurrentRow.Cells("dstaw_std").Value) <> 0 Then If Math.Floor(dgvAbwWStd.CurrentRow.Cells("dstaw_std").Value) <> 0 Then
If dgvAbwWStd.CurrentRow.Cells("dstaw_std").Value Mod 1 <> 0.5 Then If dgvAbwWStd.CurrentRow.Cells("dstaw_std").Value Mod 1 <> 0.5 And dgvAbwWStd.CurrentRow.Cells("dstaw_std").Value Mod 1 <> 0 Then
MsgBox("Fehler, nur 0.5 als Nachkommastelle erlaubt") MsgBox("Fehler, nur 0.5 als Nachkommastelle erlaubt")
btnOK.Enabled = False btnOK.Enabled = False
Else Else

3
initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb
View File

@@ -221,10 +221,9 @@ Public Class frmAsfinag_NachrichtenVerabeitung
Private Sub frmTCNachrichtenVerarbeitung_Shown(sender As Object, e As EventArgs) Handles Me.Shown Private Sub frmTCNachrichtenVerarbeitung_Shown(sender As Object, e As EventArgs) Handles Me.Shown
If allowClose Then If allowClose Then
Me.Refresh() Me.Refresh()
Button2.PerformClick() Button2.PerformClick()
System.Threading.Thread.Sleep(2000)
Button1.PerformClick() Button1.PerformClick()
System.Threading.Thread.Sleep(20000) System.Threading.Thread.Sleep(20000)
Me.Close() Me.Close()

19
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -483,10 +483,24 @@ Public Class frmStartOptions
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
Dim autoclose As Boolean = True Dim autoclose As Boolean = True
Dim testFTP As Boolean = VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM 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() fmCLF.Show()
AddHandler fmCLF.FormClosed, AddressOf closeMe 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() fmTTR.Show()
AddHandler fmTTR.FormClosed, AddressOf closeMe AddHandler fmTTR.FormClosed, AddressOf closeMe
closeMe() closeMe()
@@ -3826,6 +3840,7 @@ Public Class frmStartOptions
Dim frm As New Form Dim frm As New Form
Dim dgv As New DataGridView() Dim dgv As New DataGridView()
Dim dt As DataTable = SQL.loadDgvBySql("SELECT dbo.CLFBody.PKHistory, Dim dt As DataTable = SQL.loadDgvBySql("SELECT dbo.CLFBody.PKHistory,
dbo.CLFBody.ImportDate,
dbo.CLFBody.PKFileName, dbo.CLFBody.PKFileName,
dbo.CLFBody.PKLine, dbo.CLFBody.PKLine,
dbo.CLFBody.RecordType, dbo.CLFBody.RecordType,