From 08c4d0f6b2e6c993c43e3f4e4d754570bec02f9e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 24 Oct 2023 11:24:56 +0200 Subject: [PATCH] =?UTF-8?q?EORI-Antrag=20f=C3=BCr=20Privatpersonen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usrcntlEORI_Antrag.Designer.vb | 25 +++++++ .../FormulareBaukasten/usrcntlEORI_Antrag.vb | 17 ++++- SDL/Formulare/KDFormulare/frmFormulare.vb | 71 ++++++++++++++++--- 3 files changed, 103 insertions(+), 10 deletions(-) diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb index 748fc2ce..f22f2f57 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb @@ -62,6 +62,8 @@ Partial Class usrcntlEORI_Antrag Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() Me.Label14 = New System.Windows.Forms.Label() Me.cbxDatum = New System.Windows.Forms.CheckBox() + Me.cboPrivatperson = New System.Windows.Forms.CheckBox() + Me.gebDatum = New System.Windows.Forms.DateTimePicker() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -470,6 +472,7 @@ Partial Class usrcntlEORI_Antrag 'lblHerrFrau ' Me.lblHerrFrau.AutoSize = True + Me.lblHerrFrau.Cursor = System.Windows.Forms.Cursors.Arrow Me.lblHerrFrau.Location = New System.Drawing.Point(16, 67) Me.lblHerrFrau.Name = "lblHerrFrau" Me.lblHerrFrau.Size = New System.Drawing.Size(56, 13) @@ -629,12 +632,32 @@ Partial Class usrcntlEORI_Antrag Me.cbxDatum.TabIndex = 70 Me.cbxDatum.UseVisualStyleBackColor = True ' + 'cboPrivatperson + ' + Me.cboPrivatperson.AutoSize = True + Me.cboPrivatperson.Location = New System.Drawing.Point(678, 12) + Me.cboPrivatperson.Name = "cboPrivatperson" + Me.cboPrivatperson.Size = New System.Drawing.Size(112, 17) + Me.cboPrivatperson.TabIndex = 71 + Me.cboPrivatperson.Text = "für Privatpersonen" + Me.cboPrivatperson.UseVisualStyleBackColor = True + ' + 'gebDatum + ' + Me.gebDatum.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.gebDatum.Location = New System.Drawing.Point(100, 147) + Me.gebDatum.Name = "gebDatum" + Me.gebDatum.Size = New System.Drawing.Size(78, 20) + Me.gebDatum.TabIndex = 72 + ' 'usrcntlEORI_Antrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.WhiteSmoke Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.gebDatum) + Me.Controls.Add(Me.cboPrivatperson) Me.Controls.Add(Me.cbxDatum) Me.Controls.Add(Me.Label14) Me.Controls.Add(Me.DateTimePicker1) @@ -722,4 +745,6 @@ Partial Class usrcntlEORI_Antrag Friend WithEvents DateTimePicker1 As DateTimePicker Friend WithEvents Label14 As Label Friend WithEvents cbxDatum As CheckBox + Friend WithEvents cboPrivatperson As CheckBox + Friend WithEvents gebDatum As DateTimePicker End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb index e203cd0d..aed83a7f 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.vb @@ -8,7 +8,6 @@ Public Event MOVE_UP(c As Control) Public Event MOVE_DOWN(c As Control) - Public KdNR As Integer = -1 Public Sub ChangeKDNr(kdnr As Integer) _ Implements FormualrInterface.ChangeKDNr @@ -67,6 +66,8 @@ cbxAntragsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Änderung", "Änderung")) cbxAntragsart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Beendigung", "Beendigung")) + cboPrivatperson.Checked = False + If KdNR > 0 Then initKdNR(KdNR) End If @@ -107,4 +108,18 @@ End Sub + Private Sub cboPrivatperson_CheckedChanged(sender As Object, e As EventArgs) Handles cboPrivatperson.CheckedChanged + If cboPrivatperson.Checked Then + Label2.Text = "Geburtsdat:" + txtUid.Visible = False + gebDatum.Visible = True + lblHerrFrau.Text = "Vor - Nachname:" + + Else + Label2.Text = "UID-Nr:" + txtUid.Visible = True + gebDatum.Visible = False + lblHerrFrau.Text = "Herr/Frau:" + End If + End Sub End Class diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index a537f35f..0682c70a 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -4186,7 +4186,10 @@ Public Class FormularManagerNEU Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) - Dim top = -5S + Dim top = 0 + If usrCntl.cboPrivatperson.Checked Then top = -2 + + Select Case usrCntl.cboSprache._value Case "EN" @@ -4197,7 +4200,6 @@ Public Class FormularManagerNEU Case "Neuzugang" listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 139, 38, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) - Case "Änderung" listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 139, 45, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) @@ -4237,21 +4239,62 @@ Public Class FormularManagerNEU Case Else + + Select Case usrCntl.cbxAntragsart._value Case "Neuzugang" - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 43, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 43 + top, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) Case "Änderung" - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 50, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 50 + top, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) Case "Beendigung" - listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 57, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("X", 138, 57 + top, 6, 6, "bold", 16, , itextsharp.text.Element.ALIGN_CENTER)) End Select - If usrCntl.DateTimePicker1 IsNot Nothing AndAlso IsDate((usrCntl.DateTimePicker1.Value)) Then + If usrCntl.cboPrivatperson.Checked 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 + top, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Month, 145, 82 + top, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Year, 157, 82 + top, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + End If + + If usrCntl.gebDatum IsNot Nothing AndAlso IsDate((usrCntl.gebDatum.Value)) Then + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.gebDatum.Value).Day, 25, 133, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.gebDatum.Value).Month, 35, 133, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.gebDatum.Value).Year, 47, 133, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + End If + + + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEori.Text, 25, 84 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT)) + + '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)) + + + 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.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)) + + + + Else + + 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)) @@ -4276,6 +4319,9 @@ Public Class FormularManagerNEU listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 25, 173, 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)) + + End If + End Select @@ -4283,9 +4329,16 @@ Public Class FormularManagerNEU Case "EN" Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag_EN", listTowrite) - Case Else - Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag", listTowrite) - End Select + Case Else + If usrCntl.cboPrivatperson.Checked Then + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag_Privat", listTowrite) + Else + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "EORI_Antrag", listTowrite) + End If + + + + End Select