From 222153f19eb78a274e084ed9cb56474a2a17d445 Mon Sep 17 00:00:00 2001 From: "m.ilhan" Date: Thu, 30 Apr 2026 09:26:04 +0200 Subject: [PATCH] update vermerke --- Aviso/My Project/AssemblyInfo.vb | 4 +- ...frmSendungsDokumentanforderung.Designer.vb | 69 ++++++++++++++++++- Aviso/frmSendungsDokumentanforderung.vb | 4 +- 3 files changed, 72 insertions(+), 5 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index b036dad..0b15f2d 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmSendungsDokumentanforderung.Designer.vb b/Aviso/frmSendungsDokumentanforderung.Designer.vb index c12db1d..7ad328b 100644 --- a/Aviso/frmSendungsDokumentanforderung.Designer.vb +++ b/Aviso/frmSendungsDokumentanforderung.Designer.vb @@ -59,13 +59,18 @@ Partial Class frmSendungsDokumentanforderung ' Me.flpDokumenteFehlenMain.BackColor = System.Drawing.Color.Transparent Me.flpDokumenteFehlenMain.FlowDirection = System.Windows.Forms.FlowDirection.TopDown + Me.flpDokumenteFehlenMain.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.flpDokumenteFehlenMain.Location = New System.Drawing.Point(18, 42) Me.flpDokumenteFehlenMain.Margin = New System.Windows.Forms.Padding(0) Me.flpDokumenteFehlenMain.Name = "flpDokumenteFehlenMain" + Me.flpDokumenteFehlenMain.Size = New System.Drawing.Size(675, 138) Me.flpDokumenteFehlenMain.TabIndex = 0 ' 'cbxSonstDok ' Me.cbxSonstDok.AutoSize = True + Me.cbxSonstDok.Location = New System.Drawing.Point(18, 191) Me.cbxSonstDok.Name = "cbxSonstDok" Me.cbxSonstDok.Size = New System.Drawing.Size(83, 17) Me.cbxSonstDok.TabIndex = 1 @@ -74,13 +79,19 @@ Partial Class frmSendungsDokumentanforderung ' 'txtSonstigesDokumentFehlt ' + Me.txtSonstigesDokumentFehlt.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtSonstigesDokumentFehlt.Location = New System.Drawing.Point(132, 189) Me.txtSonstigesDokumentFehlt.MaxLength = 80 Me.txtSonstigesDokumentFehlt.Name = "txtSonstigesDokumentFehlt" + Me.txtSonstigesDokumentFehlt.Size = New System.Drawing.Size(336, 20) Me.txtSonstigesDokumentFehlt.TabIndex = 2 ' 'cbxNichtLeserlich ' Me.cbxNichtLeserlich.AutoSize = True + Me.cbxNichtLeserlich.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cbxNichtLeserlich.Location = New System.Drawing.Point(596, 191) Me.cbxNichtLeserlich.Name = "cbxNichtLeserlich" Me.cbxNichtLeserlich.Size = New System.Drawing.Size(90, 17) Me.cbxNichtLeserlich.TabIndex = 3 @@ -91,6 +102,7 @@ Partial Class frmSendungsDokumentanforderung ' Me.lblErrDokument.AutoSize = True Me.lblErrDokument.ForeColor = System.Drawing.Color.Red + Me.lblErrDokument.Location = New System.Drawing.Point(133, 212) Me.lblErrDokument.Name = "lblErrDokument" Me.lblErrDokument.Size = New System.Drawing.Size(157, 13) Me.lblErrDokument.TabIndex = 4 @@ -110,7 +122,11 @@ Partial Class frmSendungsDokumentanforderung Me.pnlDocumentEditor.Controls.Add(Me.lblDocumentEditorInfo) Me.pnlDocumentEditor.Controls.Add(Me.txtDocumentEditorInfo) Me.pnlDocumentEditor.Controls.Add(Me.lblDocumentEditorStatus) + Me.pnlDocumentEditor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.pnlDocumentEditor.Location = New System.Drawing.Point(9, 226) Me.pnlDocumentEditor.Name = "pnlDocumentEditor" + Me.pnlDocumentEditor.Size = New System.Drawing.Size(687, 201) Me.pnlDocumentEditor.TabIndex = 5 ' 'flpDocumentTabs @@ -121,6 +137,7 @@ Partial Class frmSendungsDokumentanforderung Me.flpDocumentTabs.BackColor = System.Drawing.Color.FromArgb(CType(CType(220, Byte), Integer), CType(CType(220, Byte), Integer), CType(CType(220, Byte), Integer)) Me.flpDocumentTabs.Location = New System.Drawing.Point(1, 0) Me.flpDocumentTabs.Name = "flpDocumentTabs" + Me.flpDocumentTabs.Size = New System.Drawing.Size(683, 48) Me.flpDocumentTabs.TabIndex = 0 Me.flpDocumentTabs.WrapContents = False ' @@ -128,6 +145,7 @@ Partial Class frmSendungsDokumentanforderung ' Me.lblDocumentEditorTitle.AutoSize = True Me.lblDocumentEditorTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblDocumentEditorTitle.Location = New System.Drawing.Point(10, 56) Me.lblDocumentEditorTitle.Name = "lblDocumentEditorTitle" Me.lblDocumentEditorTitle.Size = New System.Drawing.Size(101, 13) Me.lblDocumentEditorTitle.TabIndex = 1 @@ -136,6 +154,7 @@ Partial Class frmSendungsDokumentanforderung 'lblDocumentEditorName ' Me.lblDocumentEditorName.AutoSize = True + Me.lblDocumentEditorName.Location = New System.Drawing.Point(10, 87) Me.lblDocumentEditorName.Name = "lblDocumentEditorName" Me.lblDocumentEditorName.Size = New System.Drawing.Size(85, 13) Me.lblDocumentEditorName.TabIndex = 2 @@ -143,13 +162,16 @@ Partial Class frmSendungsDokumentanforderung ' 'txtDocumentEditorName ' + Me.txtDocumentEditorName.Location = New System.Drawing.Point(155, 84) Me.txtDocumentEditorName.MaxLength = 120 Me.txtDocumentEditorName.Name = "txtDocumentEditorName" + Me.txtDocumentEditorName.Size = New System.Drawing.Size(206, 20) Me.txtDocumentEditorName.TabIndex = 3 ' 'lblDocumentEditorAnhangsart ' Me.lblDocumentEditorAnhangsart.AutoSize = True + Me.lblDocumentEditorAnhangsart.Location = New System.Drawing.Point(377, 87) Me.lblDocumentEditorAnhangsart.Name = "lblDocumentEditorAnhangsart" Me.lblDocumentEditorAnhangsart.Size = New System.Drawing.Size(64, 13) Me.lblDocumentEditorAnhangsart.TabIndex = 4 @@ -158,12 +180,15 @@ Partial Class frmSendungsDokumentanforderung 'cmbDocumentEditorAnhangsart ' Me.cmbDocumentEditorAnhangsart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cmbDocumentEditorAnhangsart.Location = New System.Drawing.Point(468, 84) Me.cmbDocumentEditorAnhangsart.Name = "cmbDocumentEditorAnhangsart" + Me.cmbDocumentEditorAnhangsart.Size = New System.Drawing.Size(205, 21) Me.cmbDocumentEditorAnhangsart.TabIndex = 5 ' 'lblDocumentEditorInfo ' Me.lblDocumentEditorInfo.AutoSize = True + Me.lblDocumentEditorInfo.Location = New System.Drawing.Point(10, 115) Me.lblDocumentEditorInfo.Name = "lblDocumentEditorInfo" Me.lblDocumentEditorInfo.Size = New System.Drawing.Size(80, 13) Me.lblDocumentEditorInfo.TabIndex = 6 @@ -171,8 +196,10 @@ Partial Class frmSendungsDokumentanforderung ' 'txtDocumentEditorInfo ' + Me.txtDocumentEditorInfo.Location = New System.Drawing.Point(155, 112) Me.txtDocumentEditorInfo.MaxLength = 500 Me.txtDocumentEditorInfo.Name = "txtDocumentEditorInfo" + Me.txtDocumentEditorInfo.Size = New System.Drawing.Size(518, 20) Me.txtDocumentEditorInfo.TabIndex = 7 Me.txtDocumentEditorInfo.Text = "Bitte das Dokument hochladen." ' @@ -180,6 +207,7 @@ Partial Class frmSendungsDokumentanforderung ' Me.lblDocumentEditorStatus.AutoSize = True Me.lblDocumentEditorStatus.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(102, Byte), Integer), CType(CType(153, Byte), Integer)) + Me.lblDocumentEditorStatus.Location = New System.Drawing.Point(10, 151) Me.lblDocumentEditorStatus.Name = "lblDocumentEditorStatus" Me.lblDocumentEditorStatus.Size = New System.Drawing.Size(339, 13) Me.lblDocumentEditorStatus.TabIndex = 8 @@ -189,6 +217,7 @@ Partial Class frmSendungsDokumentanforderung ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.Location = New System.Drawing.Point(9, 438) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(202, 17) Me.Label5.TabIndex = 6 @@ -198,6 +227,7 @@ Partial Class frmSendungsDokumentanforderung ' Me.Label20.AutoSize = True Me.Label20.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(102, Byte), Integer), CType(CType(153, Byte), Integer)) + Me.Label20.Location = New System.Drawing.Point(314, 442) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(207, 13) Me.Label20.TabIndex = 7 @@ -206,7 +236,10 @@ Partial Class frmSendungsDokumentanforderung 'btnCustomerUploadLink ' Me.btnCustomerUploadLink.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCustomerUploadLink.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnCustomerUploadLink.Location = New System.Drawing.Point(553, 466) Me.btnCustomerUploadLink.Name = "btnCustomerUploadLink" + Me.btnCustomerUploadLink.Size = New System.Drawing.Size(143, 30) Me.btnCustomerUploadLink.TabIndex = 11 Me.btnCustomerUploadLink.Text = "Link kopieren" Me.btnCustomerUploadLink.UseVisualStyleBackColor = True @@ -214,20 +247,28 @@ Partial Class frmSendungsDokumentanforderung 'btnCustomerUploadEmail ' Me.btnCustomerUploadEmail.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCustomerUploadEmail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnCustomerUploadEmail.Location = New System.Drawing.Point(553, 502) Me.btnCustomerUploadEmail.Name = "btnCustomerUploadEmail" + Me.btnCustomerUploadEmail.Size = New System.Drawing.Size(143, 30) Me.btnCustomerUploadEmail.TabIndex = 13 Me.btnCustomerUploadEmail.Text = "E-Mail senden" Me.btnCustomerUploadEmail.UseVisualStyleBackColor = True ' 'txtCustomerUploadEmail ' + Me.txtCustomerUploadEmail.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtCustomerUploadEmail.Location = New System.Drawing.Point(132, 507) Me.txtCustomerUploadEmail.MaxLength = 255 Me.txtCustomerUploadEmail.Name = "txtCustomerUploadEmail" + Me.txtCustomerUploadEmail.Size = New System.Drawing.Size(409, 20) Me.txtCustomerUploadEmail.TabIndex = 12 ' 'lblCustomerUploadEmail ' Me.lblCustomerUploadEmail.AutoSize = True + Me.lblCustomerUploadEmail.Location = New System.Drawing.Point(9, 510) Me.lblCustomerUploadEmail.Name = "lblCustomerUploadEmail" Me.lblCustomerUploadEmail.Size = New System.Drawing.Size(54, 13) Me.lblCustomerUploadEmail.TabIndex = 10 @@ -236,6 +277,7 @@ Partial Class frmSendungsDokumentanforderung 'lblCustomerUploadValidityHours ' Me.lblCustomerUploadValidityHours.AutoSize = True + Me.lblCustomerUploadValidityHours.Location = New System.Drawing.Point(262, 471) Me.lblCustomerUploadValidityHours.Name = "lblCustomerUploadValidityHours" Me.lblCustomerUploadValidityHours.Size = New System.Drawing.Size(66, 13) Me.lblCustomerUploadValidityHours.TabIndex = 9 @@ -243,9 +285,11 @@ Partial Class frmSendungsDokumentanforderung ' 'nudCustomerUploadValidityHours ' + Me.nudCustomerUploadValidityHours.Location = New System.Drawing.Point(352, 469) Me.nudCustomerUploadValidityHours.Maximum = New Decimal(New Integer() {168, 0, 0, 0}) Me.nudCustomerUploadValidityHours.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) Me.nudCustomerUploadValidityHours.Name = "nudCustomerUploadValidityHours" + Me.nudCustomerUploadValidityHours.Size = New System.Drawing.Size(110, 20) Me.nudCustomerUploadValidityHours.TabIndex = 10 Me.nudCustomerUploadValidityHours.Value = New Decimal(New Integer() {168, 0, 0, 0}) ' @@ -254,12 +298,15 @@ Partial Class frmSendungsDokumentanforderung Me.cmbCustomerUploadLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cmbCustomerUploadLanguage.FormattingEnabled = True Me.cmbCustomerUploadLanguage.Items.AddRange(New Object() {"de", "en", "tr", "sr", "bg"}) + Me.cmbCustomerUploadLanguage.Location = New System.Drawing.Point(132, 469) Me.cmbCustomerUploadLanguage.Name = "cmbCustomerUploadLanguage" + Me.cmbCustomerUploadLanguage.Size = New System.Drawing.Size(108, 21) Me.cmbCustomerUploadLanguage.TabIndex = 9 ' 'lblCustomerUploadLanguage ' Me.lblCustomerUploadLanguage.AutoSize = True + Me.lblCustomerUploadLanguage.Location = New System.Drawing.Point(9, 472) Me.lblCustomerUploadLanguage.Name = "lblCustomerUploadLanguage" Me.lblCustomerUploadLanguage.Size = New System.Drawing.Size(72, 13) Me.lblCustomerUploadLanguage.TabIndex = 8 @@ -267,15 +314,22 @@ Partial Class frmSendungsDokumentanforderung ' 'txtCustomerUploadEmailText ' + Me.txtCustomerUploadEmailText.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtCustomerUploadEmailText.Location = New System.Drawing.Point(132, 570) Me.txtCustomerUploadEmailText.MaxLength = 500 Me.txtCustomerUploadEmailText.Multiline = True Me.txtCustomerUploadEmailText.Name = "txtCustomerUploadEmailText" Me.txtCustomerUploadEmailText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical + Me.txtCustomerUploadEmailText.Size = New System.Drawing.Size(564, 50) Me.txtCustomerUploadEmailText.TabIndex = 14 - ' + Me.txtCustomerUploadEmailText.Text = "" + ' 'lblCustomerUploadEmailText ' Me.lblCustomerUploadEmailText.AutoSize = True + Me.lblCustomerUploadEmailText.Location = New System.Drawing.Point(9, 573) Me.lblCustomerUploadEmailText.Name = "lblCustomerUploadEmailText" Me.lblCustomerUploadEmailText.Size = New System.Drawing.Size(63, 13) Me.lblCustomerUploadEmailText.TabIndex = 15 @@ -304,6 +358,7 @@ Partial Class frmSendungsDokumentanforderung 'lblKontaktEmails ' Me.lblKontaktEmails.AutoSize = True + Me.lblKontaktEmails.Location = New System.Drawing.Point(9, 628) Me.lblKontaktEmails.Name = "lblKontaktEmails" Me.lblKontaktEmails.Size = New System.Drawing.Size(245, 13) Me.lblKontaktEmails.TabIndex = 17 @@ -316,17 +371,25 @@ Partial Class frmSendungsDokumentanforderung Me.dgvKontaktEmails.AllowUserToResizeRows = False Me.dgvKontaktEmails.BackgroundColor = System.Drawing.Color.White Me.dgvKontaktEmails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvKontaktEmails.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dgvKontaktEmails.Location = New System.Drawing.Point(9, 647) Me.dgvKontaktEmails.MultiSelect = False Me.dgvKontaktEmails.Name = "dgvKontaktEmails" Me.dgvKontaktEmails.ReadOnly = True Me.dgvKontaktEmails.RowHeadersVisible = False Me.dgvKontaktEmails.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvKontaktEmails.Size = New System.Drawing.Size(687, 170) Me.dgvKontaktEmails.TabIndex = 18 ' 'btnVermerkSetzen ' Me.btnVermerkSetzen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnVermerkSetzen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnVermerkSetzen.Location = New System.Drawing.Point(553, 823) Me.btnVermerkSetzen.Name = "btnVermerkSetzen" + Me.btnVermerkSetzen.Size = New System.Drawing.Size(143, 36) Me.btnVermerkSetzen.TabIndex = 16 Me.btnVermerkSetzen.Text = "Vermerk setzen" Me.btnVermerkSetzen.UseVisualStyleBackColor = True @@ -335,6 +398,7 @@ Partial Class frmSendungsDokumentanforderung ' Me.lblTitel.AutoSize = True Me.lblTitel.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblTitel.Location = New System.Drawing.Point(12, 14) Me.lblTitel.Name = "lblTitel" Me.lblTitel.Size = New System.Drawing.Size(156, 17) Me.lblTitel.TabIndex = 18 @@ -344,6 +408,9 @@ Partial Class frmSendungsDokumentanforderung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(711, 864) + Me.Controls.Add(Me.lblCustomerUploadEmailTemplate) + Me.Controls.Add(Me.cmbCustomerUploadEmailTemplate) Me.Controls.Add(Me.dgvKontaktEmails) Me.Controls.Add(Me.lblKontaktEmails) Me.Controls.Add(Me.lblTitel) diff --git a/Aviso/frmSendungsDokumentanforderung.vb b/Aviso/frmSendungsDokumentanforderung.vb index 1ed4c40..97dbee4 100644 --- a/Aviso/frmSendungsDokumentanforderung.vb +++ b/Aviso/frmSendungsDokumentanforderung.vb @@ -85,7 +85,7 @@ Public Class frmSendungsDokumentanforderung End If Next End If - + If cmbCustomerUploadEmailTemplate.Items.Count > 0 Then cmbCustomerUploadEmailTemplate.SelectedIndex = 0 End If @@ -107,7 +107,7 @@ Public Class frmSendungsDokumentanforderung For Each row As DataRow In _emailTemplates.Rows Dim bezeichnung = If(IsDBNull(row("txt_bezeichnung")), "", CStr(row("txt_bezeichnung"))).Trim() Dim sprache = If(IsDBNull(row("txt_sprache")), "", CStr(row("txt_sprache"))).Trim().ToLowerInvariant() - + If String.Equals(bezeichnung, selectedTemplate, StringComparison.OrdinalIgnoreCase) Then ' Wenn wir die genaue Sprache finden, nimm diese If String.Equals(sprache, selectedLang, StringComparison.OrdinalIgnoreCase) Then