From 1eff800e1f0a16d6b0629dd950a04afbf977e0a7 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 6 Dec 2023 08:17:56 +0100 Subject: [PATCH] Ausertung, Formulare --- SDL/Formulare/KDFormulare/frmFormulare.vb | 24 +++++++++++---------- SDL/frmMain.vb | 2 +- SDL/mdm/frmMDMDatenverarbetiung.Designer.vb | 2 ++ SDL/mdm/frmMDMDatenverarbetiung.vb | 5 +++++ SDL/mdm/usrCntlMDMAuswertungen.vb | 3 ++- VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb | 5 ++++- 6 files changed, 27 insertions(+), 14 deletions(-) diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 78ba1204..3eb2f0c3 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -4416,27 +4416,29 @@ Public Class FormularManagerNEU 'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 25, 103, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) 'Splittung von Vor und Nachname - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text.Substring(0, usrCntl.txtHerrFrau.Text.IndexOf(" ")).Trim, 25, 96, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text.Substring(usrCntl.txtHerrFrau.Text.IndexOf(" "), usrCntl.txtHerrFrau.TextLength - usrCntl.txtHerrFrau.Text.IndexOf(" ")).Trim(), 25, 113, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + If usrCntl.txtHerrFrau.Text <> "" Then + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text.Substring(0, usrCntl.txtHerrFrau.Text.IndexOf(" ")).Trim, 25, 96, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text.Substring(usrCntl.txtHerrFrau.Text.IndexOf(" "), usrCntl.txtHerrFrau.TextLength - usrCntl.txtHerrFrau.Text.IndexOf(" ")).Trim(), 25, 113, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + End If listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtOrt.Text, 25, 158, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 25, 166, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.MyTextBox2.Text, 25, 177, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtLand.Text, 25, 147, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPLZ.Text, 45, 147, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 25, 166, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.MyTextBox2.Text, 25, 177, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtLand.Text, 25, 147, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPLZ.Text, 45, 147, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 25, 226, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 25, 210, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 25, 226, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 25, 210, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 25, 184, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT, 2)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 25, 184, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT, 2)) - Else + Else - If usrCntl.DateTimePicker1 IsNot Nothing AndAlso IsDate((usrCntl.DateTimePicker1.Value)) Then + If usrCntl.DateTimePicker1 IsNot Nothing AndAlso IsDate((usrCntl.DateTimePicker1.Value)) Then listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Day, 135, 82, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Month, 145, 82, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Year, 157, 82, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb index eb4e8d39..52819252 100644 --- a/SDL/frmMain.vb +++ b/SDL/frmMain.vb @@ -143,7 +143,7 @@ Public Class frmMain Dim timas As New cTimasAPI Dim infoMessage As String = "" Dim timeEntryExisting As Boolean = False - Dim isEndpointRunning As Boolean + Dim isEndpointRunning As Boolean = True timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, Nothing, timeEntryExisting,, isEndpointRunning) If Not timeEntryExisting AndAlso isEndpointRunning Then Dim a As MsgBoxResult = MsgBox("Für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " wurde heute noch keine Zeit erfasst!" & vbNewLine & Now.ToString() & " als Startzeit erfassen?", vbYesNo) diff --git a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb index 78c6c6fd..027fd059 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb @@ -108,6 +108,7 @@ Partial Class frmMDMDatenverarbetiung Me.cbxASFINAGNichtAbgerechnet.TabIndex = 52 Me.cbxASFINAGNichtAbgerechnet.Text = "nicht abgerechnet" Me.cbxASFINAGNichtAbgerechnet.UseVisualStyleBackColor = True + Me.cbxASFINAGNichtAbgerechnet.Visible = False ' 'cbxTestdaten ' @@ -120,6 +121,7 @@ Partial Class frmMDMDatenverarbetiung Me.cbxTestdaten.TabIndex = 51 Me.cbxTestdaten.Text = "Testdaten" Me.cbxTestdaten.UseVisualStyleBackColor = True + Me.cbxTestdaten.Visible = False ' 'Panel4 ' diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index be38fc0e..25b745ad 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -564,6 +564,9 @@ Public Class frmMDMDatenverarbetiung End If Next + cbxASFINAGNichtAbgerechnet.Visible = False + cbxTestdaten.Visible = False + Select Case Me.LIEFERANT Case "PLOSE" Panel4.Visible = True @@ -578,6 +581,8 @@ Public Class frmMDMDatenverarbetiung 'Panel3.Controls.Add(c) 'c.Dock = DockStyle.Fill Case "ASFINAG" + cbxASFINAGNichtAbgerechnet.Visible = True + cbxTestdaten.Visible = True Panel4.Visible = False pnlAsfinag.Visible = True diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 250358af..89f5a9ec 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -989,7 +989,8 @@ Public Class usrCntlMDMAuswertungen dbo.CLFBody.RecordType, dbo.CLFBody.fileNumber, dbo.CLFBody.cardNumber, - dbo.CLFBody.validTo OBUID, + dbo.CLFBody.validTo, + dbo.CLFBody.OBUID, dbo.CLFBody.vehicleLicensePlate, dbo.CLFBody.nationality, dbo.CLFBody.vehicleCategory, diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index e4eda8bb..34d1a666 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -4,6 +4,7 @@ Imports System.Net.Mail Imports System.Text Imports System.Windows.Forms Imports ClosedXML.Excel +Imports Microsoft.Office.Interop Public Class cProgramFunctions @@ -380,7 +381,9 @@ Public Class cProgramFunctions Try 'SENDEN:::::::::::::::::::::: - mySmtpsvr.Send(Msg) + Dim mailItem As Outlook.MailItem = TryCast(Msg, Outlook.MailItem) + mailItem.Display() + 'mySmtpsvr.Send(Msg) Catch ex As Exception Try 'Falls Fehler nicht beim Senden, sonder was anderes.