From 424316755ebf67788faa64f619229c11bb63dde2 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 13 Dec 2023 17:02:22 +0100 Subject: [PATCH 1/3] Asfinag --- .../frmAsfinag_NachrichtenVerarbeitung.vb | 3 +-- initATLASAufschubkonten/frmStartOptions.vb | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb index a9251e4..33346a6 100644 --- a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb @@ -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() diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 1fcc167..ce7eda3 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -480,13 +480,13 @@ Public Class frmStartOptions Case "ASFINAG_IMPORT" Dim f As New frmInfo(PARAM) f.Show() - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + 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) + 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() @@ -3826,6 +3826,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, From ea2a2e7803929fc1005133f4596d52f77bfa29a5 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 15 Dec 2023 16:46:06 +0100 Subject: [PATCH 2/3] Asfinag autom. Import --- initATLASAufschubkonten/frmStartOptions.vb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index ce7eda3..4985a02 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -478,6 +478,20 @@ Public Class frmStartOptions closeMe() Case "ASFINAG_IMPORT" + Dim f As New frmInfo(PARAM) + f.Show() + 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, 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() + + Case "ASFINAG_IMPORT_TEST" Dim f As New frmInfo(PARAM) f.Show() VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True From d23bb31812a03631fa9437035322f2c9d9abdd8c Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 18 Dec 2023 09:43:46 +0100 Subject: [PATCH 3/3] Nachkommastellen Dienstplan --- UID/Dienstplan/frmDiestAddMa.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UID/Dienstplan/frmDiestAddMa.vb b/UID/Dienstplan/frmDiestAddMa.vb index 4525796..64bf778 100644 --- a/UID/Dienstplan/frmDiestAddMa.vb +++ b/UID/Dienstplan/frmDiestAddMa.vb @@ -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 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") btnOK.Enabled = False Else