From 227ff9592a9319234c80bb000abb0c8c8824df68 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 22 Nov 2023 16:02:59 +0100 Subject: [PATCH] Asfinag, ZE-MA-Ansicht --- .../usrCntlMitarbeiter.Designer.vb | 28 +++--- UID/Mitarbeiter/usrCntlMitarbeiter.vb | 2 +- UID/My Project/AssemblyInfo.vb | 4 +- initATLASAufschubkonten/cAsfinag.vb | 15 ++-- ...sfinag_NachrichtenVerarbeitung.Designer.vb | 90 +++++++++---------- .../frmAsfinag_NachrichtenVerarbeitung.vb | 27 ++---- .../frmStartOptions.Designer.vb | 60 ++++++++----- initATLASAufschubkonten/frmStartOptions.vb | 24 ++--- 8 files changed, 125 insertions(+), 125 deletions(-) diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb index 2b762aa..c4e43f8 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb @@ -47,6 +47,7 @@ Partial Class usrCntlMitarbeiter Me.TabPage8 = New System.Windows.Forms.TabPage() Me.dgvTimasNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() + Me.cbxZE = New System.Windows.Forms.CheckBox() Me.cbx = New System.Windows.Forms.CheckBox() Me.txtSuche = New System.Windows.Forms.TextBox() Me.Button1 = New System.Windows.Forms.Button() @@ -57,7 +58,6 @@ Partial Class usrCntlMitarbeiter Me.UserKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BerechtigungenSetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.cbxZE = New System.Windows.Forms.CheckBox() Me.Panel2.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() @@ -347,6 +347,19 @@ Partial Class usrCntlMitarbeiter Me.Panel1.Size = New System.Drawing.Size(889, 36) Me.Panel1.TabIndex = 26 ' + 'cbxZE + ' + Me.cbxZE.AutoSize = True + Me.cbxZE.Checked = True + Me.cbxZE.CheckState = System.Windows.Forms.CheckState.Indeterminate + Me.cbxZE.Location = New System.Drawing.Point(659, 13) + Me.cbxZE.Name = "cbxZE" + Me.cbxZE.Size = New System.Drawing.Size(133, 17) + Me.cbxZE.TabIndex = 51 + Me.cbxZE.Text = "Zeiterfassung-Account" + Me.cbxZE.ThreeState = True + Me.cbxZE.UseVisualStyleBackColor = True + ' 'cbx ' Me.cbx.AutoSize = True @@ -424,19 +437,6 @@ Partial Class usrCntlMitarbeiter Me.ContextMenuStrip2.Name = "ContextMenuStrip2" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' - 'cbxZE - ' - Me.cbxZE.AutoSize = True - Me.cbxZE.Checked = True - Me.cbxZE.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxZE.Location = New System.Drawing.Point(659, 13) - Me.cbxZE.Name = "cbxZE" - Me.cbxZE.Size = New System.Drawing.Size(133, 17) - Me.cbxZE.TabIndex = 51 - Me.cbxZE.Text = "Zeiterfassung-Account" - Me.cbxZE.ThreeState = True - Me.cbxZE.UseVisualStyleBackColor = True - ' 'usrCntlMitarbeiter ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb index 61a37d5..412f049 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb @@ -856,7 +856,7 @@ Public Class usrCntlMitarbeiter Me.Cursor = Cursors.Default End Sub - Private Sub cbxZE_CheckedChanged(sender As Object, e As EventArgs) Handles cbxZE.CheckedChanged + Private Sub cbxZE_CheckStateChanged(sender As Object, e As EventArgs) Handles cbxZE.CheckStateChanged Tabelle_anzeigen() End Sub End Class diff --git a/UID/My Project/AssemblyInfo.vb b/UID/My Project/AssemblyInfo.vb index fb584f0..a4a363b 100644 --- a/UID/My Project/AssemblyInfo.vb +++ b/UID/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/initATLASAufschubkonten/cAsfinag.vb b/initATLASAufschubkonten/cAsfinag.vb index b050bce..0b18139 100644 --- a/initATLASAufschubkonten/cAsfinag.vb +++ b/initATLASAufschubkonten/cAsfinag.vb @@ -1,12 +1,6 @@ Imports System.Data.SqlClient -Imports System.Data.SqlTypes -Imports System.Diagnostics.Eventing Imports System.IO Imports System.Reflection -Imports System.Security.Cryptography -Imports com.itextpdf.text.pdf -Imports DocumentFormat.OpenXml.VariantTypes -Imports RoutineManager.cAsfinag Imports VERAG_PROG_ALLGEMEIN Public Class cAsfinag @@ -1357,8 +1351,9 @@ Public Class cAsfinag ' zielPfad = SERVER_Path & "\" & Now.ToString("yyyyMMdd_HHmmss_") & fi.Name 'End While IO.File.Copy(f, zielPfad & "\" & fi.Name, True) - If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM And IO.File.Exists(zielPfad & "\" & fi.Name) Then - IO.File.Move(BEREITSTELLUNG_PFAD & "\" & fi.Name, ARCHIV_PFAD & "\" & fi.Name) + If IO.File.Exists(zielPfad & "\" & fi.Name) Then + If Not IO.Directory.Exists(ARCHIV_PFAD & "\" & Now.Year & "\" & filename & "\") Then IO.Directory.CreateDirectory(ARCHIV_PFAD & "\" & Now.Year & "\" & filename & "\") + IO.File.Move(BEREITSTELLUNG_PFAD & "\" & fi.Name, ARCHIV_PFAD & "\" & Now.Year & "\" & filename & "\" & fi.Name) End If cnt += 1 End If @@ -1419,7 +1414,7 @@ Public Class cAsfinag For Each f In IO.Directory.GetFiles(SERVERPath) Dim fi As New IO.FileInfo(f) - If fi.Name.ToLower.Contains(fileType) Then + If fi.Name.ToUpper.Contains(fileType) Then If Not fi.Name.StartsWith(".") Then Dim zielPfad = VERARBEITUNG_PFAD & "\" & fi.Name While IO.File.Exists(zielPfad) @@ -1431,7 +1426,7 @@ Public Class cAsfinag End If Dim filename = frmStartOptions.cut_file((New FileInfo(zielPfad)).Name) - If filename.ToLower.Contains(fileType) Then + If filename.ToUpper.Contains(fileType) Then filenameList.Add(filename) cnt += 1 End If diff --git a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.Designer.vb b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.Designer.vb index 17148e2..7b1995d 100644 --- a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.Designer.vb +++ b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.Designer.vb @@ -26,10 +26,8 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAsfinag_NachrichtenVerabeitung)) Me.btn = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() + Me.lblTestsystem = New System.Windows.Forms.Label() Me.lblDatenCnt = New System.Windows.Forms.Label() - Me.dgvEinarbeitung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Label9 = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() Me.Label7 = New System.Windows.Forms.Label() @@ -40,7 +38,9 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Me.btnOK = New System.Windows.Forms.Button() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.lblTestsystem = New System.Windows.Forms.Label() + Me.dgvEinarbeitung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.pnl.SuspendLayout() CType(Me.dgvEinarbeitung, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -85,6 +85,18 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Me.pnl.Size = New System.Drawing.Size(456, 319) Me.pnl.TabIndex = 1 ' + 'lblTestsystem + ' + Me.lblTestsystem.AutoSize = True + Me.lblTestsystem.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblTestsystem.ForeColor = System.Drawing.Color.Red + Me.lblTestsystem.Location = New System.Drawing.Point(274, 8) + Me.lblTestsystem.Name = "lblTestsystem" + Me.lblTestsystem.Size = New System.Drawing.Size(89, 13) + Me.lblTestsystem.TabIndex = 20 + Me.lblTestsystem.Text = "TESTSYSTEM" + Me.lblTestsystem.Visible = False + ' 'lblDatenCnt ' Me.lblDatenCnt.AutoSize = True @@ -96,35 +108,6 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Me.lblDatenCnt.Text = "0" Me.lblDatenCnt.Visible = False ' - 'dgvEinarbeitung - ' - Me.dgvEinarbeitung.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvEinarbeitung.AllowUserToAddRows = False - Me.dgvEinarbeitung.AllowUserToDeleteRows = False - Me.dgvEinarbeitung.AllowUserToOrderColumns = True - Me.dgvEinarbeitung.AllowUserToResizeColumns = False - Me.dgvEinarbeitung.AllowUserToResizeRows = False - Me.dgvEinarbeitung.BackgroundColor = System.Drawing.Color.White - Me.dgvEinarbeitung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvEinarbeitung.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.Column1}) - Me.dgvEinarbeitung.Location = New System.Drawing.Point(12, 164) - Me.dgvEinarbeitung.Name = "dgvEinarbeitung" - Me.dgvEinarbeitung.RowHeadersVisible = False - Me.dgvEinarbeitung.Size = New System.Drawing.Size(291, 145) - Me.dgvEinarbeitung.TabIndex = 18 - ' - 'clmnArt - ' - Me.clmnArt.HeaderText = "Dateiname" - Me.clmnArt.Name = "clmnArt" - Me.clmnArt.Width = 150 - ' - 'Column1 - ' - Me.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.Column1.HeaderText = "Status" - Me.Column1.Name = "Column1" - ' 'Label9 ' Me.Label9.AutoSize = True @@ -152,9 +135,9 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label7.Location = New System.Drawing.Point(8, 34) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(90, 13) + Me.Label7.Size = New System.Drawing.Size(134, 13) Me.Label7.TabIndex = 13 - Me.Label7.Text = "Daten sichern:" + Me.Label7.Text = "Daten vom FTP laden:" ' 'ListBox3 ' @@ -226,17 +209,34 @@ Partial Class frmAsfinag_NachrichtenVerabeitung Me.Label1.TabIndex = 8 Me.Label1.Text = "Einarbeitung:" ' - 'lblTestsystem + 'dgvEinarbeitung ' - Me.lblTestsystem.AutoSize = True - Me.lblTestsystem.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblTestsystem.ForeColor = System.Drawing.Color.Red - Me.lblTestsystem.Location = New System.Drawing.Point(274, 8) - Me.lblTestsystem.Name = "lblTestsystem" - Me.lblTestsystem.Size = New System.Drawing.Size(89, 13) - Me.lblTestsystem.TabIndex = 20 - Me.lblTestsystem.Text = "TESTSYSTEM" - Me.lblTestsystem.Visible = False + Me.dgvEinarbeitung.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvEinarbeitung.AllowUserToAddRows = False + Me.dgvEinarbeitung.AllowUserToDeleteRows = False + Me.dgvEinarbeitung.AllowUserToOrderColumns = True + Me.dgvEinarbeitung.AllowUserToResizeColumns = False + Me.dgvEinarbeitung.AllowUserToResizeRows = False + Me.dgvEinarbeitung.BackgroundColor = System.Drawing.Color.White + Me.dgvEinarbeitung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvEinarbeitung.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.Column1}) + Me.dgvEinarbeitung.Location = New System.Drawing.Point(12, 164) + Me.dgvEinarbeitung.Name = "dgvEinarbeitung" + Me.dgvEinarbeitung.RowHeadersVisible = False + Me.dgvEinarbeitung.Size = New System.Drawing.Size(291, 145) + Me.dgvEinarbeitung.TabIndex = 18 + ' + 'clmnArt + ' + Me.clmnArt.HeaderText = "Dateiname" + Me.clmnArt.Name = "clmnArt" + Me.clmnArt.Width = 150 + ' + 'Column1 + ' + Me.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.Column1.HeaderText = "Status" + Me.Column1.Name = "Column1" ' 'frmAsfinag_NachrichtenVerabeitung ' diff --git a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb index 4bab09b..8742bc2 100644 --- a/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmAsfinag_NachrichtenVerarbeitung.vb @@ -1,24 +1,13 @@ Imports System.IO -Imports System.Globalization -Imports System.Xml -Imports Renci.SshNet -Imports System.Net -Imports System.Text -Imports System.ComponentModel -Imports RoutineManager.cAsfinag -Imports DocumentFormat.OpenXml.Drawing.Charts -Imports DocumentFormat.OpenXml.VariantTypes Public Class frmAsfinag_NachrichtenVerabeitung Dim cntDatenEingelesen As Integer = 0 Dim dsNichtErkannt As Integer = 0 Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim allowClose = False - ' Dim DY_PFAD = "C:\Users\DEVELOPER1\Desktop\test\TEST\" Dim PARTNERSYSTEM = "ASFINAG" Dim FileType As String Dim asfinag As New cAsfinag() - Dim Dateiname = "" Sub New(FileType) @@ -49,7 +38,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung For Each d In System.IO.Directory.GetFiles(asfinag.VERARBEITUNG_PFAD) Dim filename = frmStartOptions.cut_file(d) - If filename.ToLower.Contains(FileType) Then + If filename.ToUpper.Contains(FileType) Then Dim targetsystem As String = "nicht definiert" If filename.Substring(0, 1) = "T" Then targetsystem = "Test" @@ -59,7 +48,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung ListBox3.Items.Add(filename) End If - Me.Refresh() + Me.Refresh() Next End If @@ -154,7 +143,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung MsgBoxStyle.DefaultButton2 = MsgBoxStyle.OkOnly) Exit Sub - ElseIf FileType = "clf" Then + ElseIf FileType = "CLF" Then If asfinag.readAndSaveCLF(objFileRead, fi) Then addDGVEinarbeitung(fi.Name, "OK") @@ -164,7 +153,7 @@ Public Class frmAsfinag_NachrichtenVerabeitung End If - ElseIf FileType = "ttr" Then + ElseIf FileType = "TTR" Then If asfinag.readAndSaveTTR(objFileRead, fi) Then addDGVEinarbeitung(fi.Name, "OK") @@ -178,13 +167,13 @@ Public Class frmAsfinag_NachrichtenVerabeitung End If If found Then - If Not IO.Directory.Exists(asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\") Then IO.Directory.CreateDirectory(asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\") - frmStartOptions.moveFile(d, asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\", asfinag.VERARBEITUNG_PFAD) + If Not IO.Directory.Exists(asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & FileType) Then IO.Directory.CreateDirectory(asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & FileType & "\") + frmStartOptions.moveFile(d, asfinag.ARCHIV_PFAD & "\" & Now.Year & "\" & FileType & "\", asfinag.VERARBEITUNG_PFAD) cntDatenEingelesen += 1 Else If Not found Then - If Not IO.Directory.Exists(asfinag.ERROR_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\") Then IO.Directory.CreateDirectory(asfinag.ERROR_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\") - frmStartOptions.moveFile(d, asfinag.ERROR_PFAD & "\" & Now.Year & "\" & Now.ToString("MMdd") & "\", asfinag.VERARBEITUNG_PFAD) + If Not IO.Directory.Exists(asfinag.ERROR_PFAD & "\" & Now.Year & "\" & FileType & "\") Then IO.Directory.CreateDirectory(asfinag.ERROR_PFAD & "\" & Now.Year & "\" & FileType & "\") + frmStartOptions.moveFile(d, asfinag.ERROR_PFAD & "\" & Now.Year & "\" & FileType & "\", asfinag.VERARBEITUNG_PFAD) ' nciht gefunden, oder durch ERROR nicht eingearbt,. dsNichtErkannt += 1 End If diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index e4d8f41..b06c3f1 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmStartOptions Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions)) Me.pnl = New System.Windows.Forms.Panel() + Me.LinkLabel48 = New System.Windows.Forms.LinkLabel() Me.cbxVermerk = New System.Windows.Forms.CheckBox() Me.cbxDatevTest = New System.Windows.Forms.CheckBox() Me.cbxDatevOpen = New System.Windows.Forms.CheckBox() @@ -195,7 +196,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.CheckBox8 = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbcntr.SuspendLayout() @@ -304,6 +305,17 @@ Partial Class frmStartOptions Me.pnl.Size = New System.Drawing.Size(861, 827) Me.pnl.TabIndex = 0 ' + '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" + ' 'cbxVermerk ' Me.cbxVermerk.AutoSize = True @@ -1966,6 +1978,7 @@ Partial Class frmStartOptions ' 'TabPage4 ' + Me.TabPage4.Controls.Add(Me.CheckBox8) Me.TabPage4.Controls.Add(Me.PictureBox21) Me.TabPage4.Controls.Add(Me.LinkLabel47) Me.TabPage4.Controls.Add(Me.LinkLabel46) @@ -1988,7 +2001,7 @@ Partial Class frmStartOptions ' Me.PictureBox21.BackgroundImage = CType(resources.GetObject("PictureBox21.BackgroundImage"), System.Drawing.Image) Me.PictureBox21.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox21.Location = New System.Drawing.Point(99, 115) + Me.PictureBox21.Location = New System.Drawing.Point(99, 132) Me.PictureBox21.Name = "PictureBox21" Me.PictureBox21.Size = New System.Drawing.Size(18, 18) Me.PictureBox21.TabIndex = 40 @@ -1999,7 +2012,7 @@ Partial Class frmStartOptions ' Me.LinkLabel47.AutoSize = True Me.LinkLabel47.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel47.Location = New System.Drawing.Point(17, 115) + Me.LinkLabel47.Location = New System.Drawing.Point(17, 132) Me.LinkLabel47.Name = "LinkLabel47" Me.LinkLabel47.Size = New System.Drawing.Size(72, 13) Me.LinkLabel47.TabIndex = 39 @@ -2010,7 +2023,7 @@ Partial Class frmStartOptions ' Me.LinkLabel46.AutoSize = True Me.LinkLabel46.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel46.Location = New System.Drawing.Point(17, 91) + Me.LinkLabel46.Location = New System.Drawing.Point(17, 108) Me.LinkLabel46.Name = "LinkLabel46" Me.LinkLabel46.Size = New System.Drawing.Size(120, 13) Me.LinkLabel46.TabIndex = 38 @@ -2021,7 +2034,7 @@ Partial Class frmStartOptions ' Me.PictureBox19.BackgroundImage = CType(resources.GetObject("PictureBox19.BackgroundImage"), System.Drawing.Image) Me.PictureBox19.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox19.Location = New System.Drawing.Point(321, 68) + Me.PictureBox19.Location = New System.Drawing.Point(110, 214) Me.PictureBox19.Name = "PictureBox19" Me.PictureBox19.Size = New System.Drawing.Size(18, 18) Me.PictureBox19.TabIndex = 37 @@ -2032,7 +2045,7 @@ Partial Class frmStartOptions ' Me.PictureBox18.BackgroundImage = CType(resources.GetObject("PictureBox18.BackgroundImage"), System.Drawing.Image) Me.PictureBox18.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox18.Location = New System.Drawing.Point(321, 38) + Me.PictureBox18.Location = New System.Drawing.Point(110, 184) Me.PictureBox18.Name = "PictureBox18" Me.PictureBox18.Size = New System.Drawing.Size(18, 18) Me.PictureBox18.TabIndex = 36 @@ -2043,7 +2056,7 @@ Partial Class frmStartOptions ' Me.LinkLabel41.AutoSize = True Me.LinkLabel41.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel41.Location = New System.Drawing.Point(228, 68) + Me.LinkLabel41.Location = New System.Drawing.Point(17, 214) Me.LinkLabel41.Name = "LinkLabel41" Me.LinkLabel41.Size = New System.Drawing.Size(82, 13) Me.LinkLabel41.TabIndex = 35 @@ -2054,7 +2067,7 @@ Partial Class frmStartOptions ' Me.LinkLabel42.AutoSize = True Me.LinkLabel42.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel42.Location = New System.Drawing.Point(228, 43) + Me.LinkLabel42.Location = New System.Drawing.Point(17, 189) Me.LinkLabel42.Name = "LinkLabel42" Me.LinkLabel42.Size = New System.Drawing.Size(87, 13) Me.LinkLabel42.TabIndex = 34 @@ -2064,9 +2077,9 @@ Partial Class frmStartOptions 'Label23 ' Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label23.Location = New System.Drawing.Point(228, 16) + Me.Label23.Location = New System.Drawing.Point(17, 162) Me.Label23.Name = "Label23" - Me.Label23.Size = New System.Drawing.Size(296, 16) + Me.Label23.Size = New System.Drawing.Size(111, 19) Me.Label23.TabIndex = 33 Me.Label23.Text = "Export" ' @@ -2074,7 +2087,7 @@ Partial Class frmStartOptions ' Me.LinkLabel43.AutoSize = True Me.LinkLabel43.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel43.Location = New System.Drawing.Point(17, 68) + Me.LinkLabel43.Location = New System.Drawing.Point(17, 85) Me.LinkLabel43.Name = "LinkLabel43" Me.LinkLabel43.Size = New System.Drawing.Size(102, 13) Me.LinkLabel43.TabIndex = 32 @@ -2085,7 +2098,7 @@ Partial Class frmStartOptions ' Me.LinkLabel44.AutoSize = True Me.LinkLabel44.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel44.Location = New System.Drawing.Point(17, 43) + Me.LinkLabel44.Location = New System.Drawing.Point(17, 60) Me.LinkLabel44.Name = "LinkLabel44" Me.LinkLabel44.Size = New System.Drawing.Size(126, 13) Me.LinkLabel44.TabIndex = 31 @@ -2096,7 +2109,7 @@ Partial Class frmStartOptions ' Me.Label24.AutoSize = True Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label24.Location = New System.Drawing.Point(17, 16) + Me.Label24.Location = New System.Drawing.Point(17, 33) Me.Label24.Name = "Label24" Me.Label24.Size = New System.Drawing.Size(42, 13) Me.Label24.TabIndex = 30 @@ -2408,16 +2421,18 @@ Partial Class frmStartOptions Me.Button21.Text = "AAS Sendung 24h" Me.Button21.UseVisualStyleBackColor = True ' - 'LinkLabel48 + 'CheckBox8 ' - 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" + Me.CheckBox8.AutoSize = True + Me.CheckBox8.Checked = True + Me.CheckBox8.CheckState = System.Windows.Forms.CheckState.Checked + Me.CheckBox8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CheckBox8.Location = New System.Drawing.Point(20, 13) + Me.CheckBox8.Name = "CheckBox8" + Me.CheckBox8.Size = New System.Drawing.Size(79, 17) + Me.CheckBox8.TabIndex = 76 + Me.CheckBox8.Text = "Testsystem" + Me.CheckBox8.UseVisualStyleBackColor = True ' 'frmStartOptions ' @@ -2643,4 +2658,5 @@ Partial Class frmStartOptions Friend WithEvents LinkLabel47 As LinkLabel Friend WithEvents PictureBox21 As PictureBox Friend WithEvents LinkLabel48 As LinkLabel + Friend WithEvents CheckBox8 As CheckBox End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index a2d0155..70320cf 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -3232,14 +3232,14 @@ Public Class frmStartOptions ' Kfz Kennzeichen einlesen. - Dim strSQLASFINAG = "SELECT cardNumber, ValidTo, OBUID, vehicleLicensePlate, nationality, contractDate, vehicleCategory, emissionCategory, status FROM vwCLFBody" Dim dtAsfinag As DataTable = SQl.loadDgvBySql_Param(strSQLASFINAG, "ASFINAG") - If dtAsfinag.Rows.Count < 1 Then - Return False - End If + ' ???????? + 'If dtAsfinag.Rows.Count < 1 Then + ' Return False + 'End If For Each row As DataRow In dtAsfinag.Rows @@ -3264,7 +3264,7 @@ Public Class frmStartOptions Else SDL.Änderungsdatum = Now End If - SDL.Sachbearbeiter = "ASFINAG" + SDL.Sachbearbeiter = "ASFINAG" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_TEST", "") Dim Validto = SQL.checkNullStr(row.Item("contractDate")) @@ -3595,23 +3595,23 @@ Public Class frmStartOptions Private Sub LinkLabel44_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel44.LinkClicked Me.Visible = False - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True - Dim f As New frmAsfinag_NachrichtenVerabeitung("ttr") + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked + Dim f As New frmAsfinag_NachrichtenVerabeitung("TTR") f.ShowDialog() Me.Visible = True End Sub Private Sub LinkLabel43_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel43.LinkClicked Me.Visible = False - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True - Dim f As New frmAsfinag_NachrichtenVerabeitung("clf") + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked + Dim f As New frmAsfinag_NachrichtenVerabeitung("CLF") f.ShowDialog() Me.Visible = True 'ASFINAG_LKW(False) End Sub Private Sub LinkLabel42_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel42.LinkClicked - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked Me.Cursor = Cursors.WaitCursor Dim blt = New cAsfinag.Exportist blt.initExportPfade() @@ -3620,7 +3620,7 @@ Public Class frmStartOptions End Sub Private Sub LinkLabel41_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel41.LinkClicked - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked Me.Cursor = Cursors.WaitCursor Dim blt = New cAsfinag.Exportist blt.initExportPfade() @@ -3909,7 +3909,7 @@ Public Class frmStartOptions End Function Private Sub LinkLabel47_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel47.LinkClicked - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = CheckBox8.Checked showPic(ASFINAG_LKW(False), PictureBox21) End Sub