diff --git a/Aviso/frmSendungsDokumentanforderung.Designer.vb b/Aviso/frmSendungsDokumentanforderung.Designer.vb index 7ad328b..38a1cd2 100644 --- a/Aviso/frmSendungsDokumentanforderung.Designer.vb +++ b/Aviso/frmSendungsDokumentanforderung.Designer.vb @@ -42,8 +42,6 @@ Partial Class frmSendungsDokumentanforderung Me.nudCustomerUploadValidityHours = New System.Windows.Forms.NumericUpDown() Me.cmbCustomerUploadLanguage = New System.Windows.Forms.ComboBox() Me.lblCustomerUploadLanguage = New System.Windows.Forms.Label() - Me.cmbCustomerUploadEmailTemplate = New System.Windows.Forms.ComboBox() - Me.lblCustomerUploadEmailTemplate = New System.Windows.Forms.Label() Me.txtCustomerUploadEmailText = New System.Windows.Forms.TextBox() Me.lblCustomerUploadEmailText = New System.Windows.Forms.Label() Me.btnVermerkSetzen = New System.Windows.Forms.Button() @@ -59,18 +57,16 @@ 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.Location = New System.Drawing.Point(12, 34) Me.flpDokumenteFehlenMain.Margin = New System.Windows.Forms.Padding(0) Me.flpDokumenteFehlenMain.Name = "flpDokumenteFehlenMain" - Me.flpDokumenteFehlenMain.Size = New System.Drawing.Size(675, 138) + Me.flpDokumenteFehlenMain.Size = New System.Drawing.Size(450, 90) Me.flpDokumenteFehlenMain.TabIndex = 0 ' 'cbxSonstDok ' Me.cbxSonstDok.AutoSize = True - Me.cbxSonstDok.Location = New System.Drawing.Point(18, 191) + Me.cbxSonstDok.Location = New System.Drawing.Point(12, 126) Me.cbxSonstDok.Name = "cbxSonstDok" Me.cbxSonstDok.Size = New System.Drawing.Size(83, 17) Me.cbxSonstDok.TabIndex = 1 @@ -79,19 +75,16 @@ 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.Location = New System.Drawing.Point(95, 124) Me.txtSonstigesDokumentFehlt.MaxLength = 80 Me.txtSonstigesDokumentFehlt.Name = "txtSonstigesDokumentFehlt" - Me.txtSonstigesDokumentFehlt.Size = New System.Drawing.Size(336, 20) + Me.txtSonstigesDokumentFehlt.Size = New System.Drawing.Size(198, 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.Location = New System.Drawing.Point(308, 126) Me.cbxNichtLeserlich.Name = "cbxNichtLeserlich" Me.cbxNichtLeserlich.Size = New System.Drawing.Size(90, 17) Me.cbxNichtLeserlich.TabIndex = 3 @@ -102,7 +95,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.Location = New System.Drawing.Point(96, 146) Me.lblErrDokument.Name = "lblErrDokument" Me.lblErrDokument.Size = New System.Drawing.Size(157, 13) Me.lblErrDokument.TabIndex = 4 @@ -122,11 +115,9 @@ 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.Location = New System.Drawing.Point(6, 159) Me.pnlDocumentEditor.Name = "pnlDocumentEditor" - Me.pnlDocumentEditor.Size = New System.Drawing.Size(687, 201) + Me.pnlDocumentEditor.Size = New System.Drawing.Size(458, 134) Me.pnlDocumentEditor.TabIndex = 5 ' 'flpDocumentTabs @@ -137,7 +128,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.Size = New System.Drawing.Size(454, 39) Me.flpDocumentTabs.TabIndex = 0 Me.flpDocumentTabs.WrapContents = False ' @@ -145,7 +136,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.Location = New System.Drawing.Point(7, 42) Me.lblDocumentEditorTitle.Name = "lblDocumentEditorTitle" Me.lblDocumentEditorTitle.Size = New System.Drawing.Size(101, 13) Me.lblDocumentEditorTitle.TabIndex = 1 @@ -154,7 +145,7 @@ Partial Class frmSendungsDokumentanforderung 'lblDocumentEditorName ' Me.lblDocumentEditorName.AutoSize = True - Me.lblDocumentEditorName.Location = New System.Drawing.Point(10, 87) + Me.lblDocumentEditorName.Location = New System.Drawing.Point(7, 64) Me.lblDocumentEditorName.Name = "lblDocumentEditorName" Me.lblDocumentEditorName.Size = New System.Drawing.Size(85, 13) Me.lblDocumentEditorName.TabIndex = 2 @@ -162,16 +153,16 @@ Partial Class frmSendungsDokumentanforderung ' 'txtDocumentEditorName ' - Me.txtDocumentEditorName.Location = New System.Drawing.Point(155, 84) + Me.txtDocumentEditorName.Location = New System.Drawing.Point(109, 61) Me.txtDocumentEditorName.MaxLength = 120 Me.txtDocumentEditorName.Name = "txtDocumentEditorName" - Me.txtDocumentEditorName.Size = New System.Drawing.Size(206, 20) + Me.txtDocumentEditorName.Size = New System.Drawing.Size(128, 20) Me.txtDocumentEditorName.TabIndex = 3 ' 'lblDocumentEditorAnhangsart ' Me.lblDocumentEditorAnhangsart.AutoSize = True - Me.lblDocumentEditorAnhangsart.Location = New System.Drawing.Point(377, 87) + Me.lblDocumentEditorAnhangsart.Location = New System.Drawing.Point(247, 64) Me.lblDocumentEditorAnhangsart.Name = "lblDocumentEditorAnhangsart" Me.lblDocumentEditorAnhangsart.Size = New System.Drawing.Size(64, 13) Me.lblDocumentEditorAnhangsart.TabIndex = 4 @@ -180,15 +171,15 @@ Partial Class frmSendungsDokumentanforderung 'cmbDocumentEditorAnhangsart ' Me.cmbDocumentEditorAnhangsart.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cmbDocumentEditorAnhangsart.Location = New System.Drawing.Point(468, 84) + Me.cmbDocumentEditorAnhangsart.Location = New System.Drawing.Point(319, 61) Me.cmbDocumentEditorAnhangsart.Name = "cmbDocumentEditorAnhangsart" - Me.cmbDocumentEditorAnhangsart.Size = New System.Drawing.Size(205, 21) + Me.cmbDocumentEditorAnhangsart.Size = New System.Drawing.Size(124, 21) Me.cmbDocumentEditorAnhangsart.TabIndex = 5 ' 'lblDocumentEditorInfo ' Me.lblDocumentEditorInfo.AutoSize = True - Me.lblDocumentEditorInfo.Location = New System.Drawing.Point(10, 115) + Me.lblDocumentEditorInfo.Location = New System.Drawing.Point(7, 88) Me.lblDocumentEditorInfo.Name = "lblDocumentEditorInfo" Me.lblDocumentEditorInfo.Size = New System.Drawing.Size(80, 13) Me.lblDocumentEditorInfo.TabIndex = 6 @@ -196,10 +187,10 @@ Partial Class frmSendungsDokumentanforderung ' 'txtDocumentEditorInfo ' - Me.txtDocumentEditorInfo.Location = New System.Drawing.Point(155, 112) + Me.txtDocumentEditorInfo.Location = New System.Drawing.Point(109, 85) Me.txtDocumentEditorInfo.MaxLength = 500 Me.txtDocumentEditorInfo.Name = "txtDocumentEditorInfo" - Me.txtDocumentEditorInfo.Size = New System.Drawing.Size(518, 20) + Me.txtDocumentEditorInfo.Size = New System.Drawing.Size(334, 20) Me.txtDocumentEditorInfo.TabIndex = 7 Me.txtDocumentEditorInfo.Text = "Bitte das Dokument hochladen." ' @@ -207,7 +198,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.Location = New System.Drawing.Point(7, 112) Me.lblDocumentEditorStatus.Name = "lblDocumentEditorStatus" Me.lblDocumentEditorStatus.Size = New System.Drawing.Size(339, 13) Me.lblDocumentEditorStatus.TabIndex = 8 @@ -217,7 +208,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.Location = New System.Drawing.Point(6, 298) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(202, 17) Me.Label5.TabIndex = 6 @@ -227,7 +218,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.Location = New System.Drawing.Point(216, 300) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(207, 13) Me.Label20.TabIndex = 7 @@ -236,10 +227,9 @@ 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.Location = New System.Drawing.Point(340, 321) Me.btnCustomerUploadLink.Name = "btnCustomerUploadLink" - Me.btnCustomerUploadLink.Size = New System.Drawing.Size(143, 30) + Me.btnCustomerUploadLink.Size = New System.Drawing.Size(124, 23) Me.btnCustomerUploadLink.TabIndex = 11 Me.btnCustomerUploadLink.Text = "Link kopieren" Me.btnCustomerUploadLink.UseVisualStyleBackColor = True @@ -247,28 +237,25 @@ 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.Location = New System.Drawing.Point(340, 346) Me.btnCustomerUploadEmail.Name = "btnCustomerUploadEmail" - Me.btnCustomerUploadEmail.Size = New System.Drawing.Size(143, 30) + Me.btnCustomerUploadEmail.Size = New System.Drawing.Size(124, 23) 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.Location = New System.Drawing.Point(82, 348) Me.txtCustomerUploadEmail.MaxLength = 255 Me.txtCustomerUploadEmail.Name = "txtCustomerUploadEmail" - Me.txtCustomerUploadEmail.Size = New System.Drawing.Size(409, 20) + Me.txtCustomerUploadEmail.Size = New System.Drawing.Size(254, 20) Me.txtCustomerUploadEmail.TabIndex = 12 ' 'lblCustomerUploadEmail ' Me.lblCustomerUploadEmail.AutoSize = True - Me.lblCustomerUploadEmail.Location = New System.Drawing.Point(9, 510) + Me.lblCustomerUploadEmail.Location = New System.Drawing.Point(6, 351) Me.lblCustomerUploadEmail.Name = "lblCustomerUploadEmail" Me.lblCustomerUploadEmail.Size = New System.Drawing.Size(54, 13) Me.lblCustomerUploadEmail.TabIndex = 10 @@ -277,7 +264,7 @@ Partial Class frmSendungsDokumentanforderung 'lblCustomerUploadValidityHours ' Me.lblCustomerUploadValidityHours.AutoSize = True - Me.lblCustomerUploadValidityHours.Location = New System.Drawing.Point(262, 471) + Me.lblCustomerUploadValidityHours.Location = New System.Drawing.Point(178, 325) Me.lblCustomerUploadValidityHours.Name = "lblCustomerUploadValidityHours" Me.lblCustomerUploadValidityHours.Size = New System.Drawing.Size(66, 13) Me.lblCustomerUploadValidityHours.TabIndex = 9 @@ -285,11 +272,11 @@ Partial Class frmSendungsDokumentanforderung ' 'nudCustomerUploadValidityHours ' - Me.nudCustomerUploadValidityHours.Location = New System.Drawing.Point(352, 469) + Me.nudCustomerUploadValidityHours.Location = New System.Drawing.Point(262, 323) 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.Size = New System.Drawing.Size(74, 20) Me.nudCustomerUploadValidityHours.TabIndex = 10 Me.nudCustomerUploadValidityHours.Value = New Decimal(New Integer() {168, 0, 0, 0}) ' @@ -298,15 +285,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.Location = New System.Drawing.Point(82, 322) Me.cmbCustomerUploadLanguage.Name = "cmbCustomerUploadLanguage" - Me.cmbCustomerUploadLanguage.Size = New System.Drawing.Size(108, 21) + Me.cmbCustomerUploadLanguage.Size = New System.Drawing.Size(80, 21) Me.cmbCustomerUploadLanguage.TabIndex = 9 ' 'lblCustomerUploadLanguage ' Me.lblCustomerUploadLanguage.AutoSize = True - Me.lblCustomerUploadLanguage.Location = New System.Drawing.Point(9, 472) + Me.lblCustomerUploadLanguage.Location = New System.Drawing.Point(6, 325) Me.lblCustomerUploadLanguage.Name = "lblCustomerUploadLanguage" Me.lblCustomerUploadLanguage.Size = New System.Drawing.Size(72, 13) Me.lblCustomerUploadLanguage.TabIndex = 8 @@ -314,51 +301,28 @@ 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.Location = New System.Drawing.Point(82, 374) 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.Size = New System.Drawing.Size(254, 44) Me.txtCustomerUploadEmailText.TabIndex = 14 - Me.txtCustomerUploadEmailText.Text = "" - ' + Me.txtCustomerUploadEmailText.Text = "Bitte laden Sie die angeforderten Dokumente über den Link hoch." + ' 'lblCustomerUploadEmailText ' Me.lblCustomerUploadEmailText.AutoSize = True - Me.lblCustomerUploadEmailText.Location = New System.Drawing.Point(9, 573) + Me.lblCustomerUploadEmailText.Location = New System.Drawing.Point(6, 377) Me.lblCustomerUploadEmailText.Name = "lblCustomerUploadEmailText" Me.lblCustomerUploadEmailText.Size = New System.Drawing.Size(63, 13) Me.lblCustomerUploadEmailText.TabIndex = 15 Me.lblCustomerUploadEmailText.Text = "E-Mail Text:" ' - 'cmbCustomerUploadEmailTemplate - ' - Me.cmbCustomerUploadEmailTemplate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cmbCustomerUploadEmailTemplate.FormattingEnabled = True - Me.cmbCustomerUploadEmailTemplate.Location = New System.Drawing.Point(132, 543) - Me.cmbCustomerUploadEmailTemplate.Name = "cmbCustomerUploadEmailTemplate" - Me.cmbCustomerUploadEmailTemplate.Size = New System.Drawing.Size(564, 21) - Me.cmbCustomerUploadEmailTemplate.TabIndex = 19 - Me.cmbCustomerUploadEmailTemplate.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - ' - 'lblCustomerUploadEmailTemplate - ' - Me.lblCustomerUploadEmailTemplate.AutoSize = True - Me.lblCustomerUploadEmailTemplate.Location = New System.Drawing.Point(9, 546) - Me.lblCustomerUploadEmailTemplate.Name = "lblCustomerUploadEmailTemplate" - Me.lblCustomerUploadEmailTemplate.Size = New System.Drawing.Size(63, 13) - Me.lblCustomerUploadEmailTemplate.TabIndex = 20 - Me.lblCustomerUploadEmailTemplate.Text = "Vorlage:" - ' 'lblKontaktEmails ' Me.lblKontaktEmails.AutoSize = True - Me.lblKontaktEmails.Location = New System.Drawing.Point(9, 628) + Me.lblKontaktEmails.Location = New System.Drawing.Point(6, 427) Me.lblKontaktEmails.Name = "lblKontaktEmails" Me.lblKontaktEmails.Size = New System.Drawing.Size(245, 13) Me.lblKontaktEmails.TabIndex = 17 @@ -371,25 +335,21 @@ 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.Location = New System.Drawing.Point(9, 445) 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.Size = New System.Drawing.Size(455, 84) 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.Location = New System.Drawing.Point(340, 535) Me.btnVermerkSetzen.Name = "btnVermerkSetzen" - Me.btnVermerkSetzen.Size = New System.Drawing.Size(143, 36) + Me.btnVermerkSetzen.Size = New System.Drawing.Size(124, 30) Me.btnVermerkSetzen.TabIndex = 16 Me.btnVermerkSetzen.Text = "Vermerk setzen" Me.btnVermerkSetzen.UseVisualStyleBackColor = True @@ -398,7 +358,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.Location = New System.Drawing.Point(9, 9) Me.lblTitel.Name = "lblTitel" Me.lblTitel.Size = New System.Drawing.Size(156, 17) Me.lblTitel.TabIndex = 18 @@ -408,15 +368,12 @@ 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.ClientSize = New System.Drawing.Size(474, 576) Me.Controls.Add(Me.dgvKontaktEmails) Me.Controls.Add(Me.lblKontaktEmails) Me.Controls.Add(Me.lblTitel) Me.Controls.Add(Me.btnVermerkSetzen) Me.Controls.Add(Me.lblCustomerUploadEmailText) - Me.Controls.Add(Me.cmbCustomerUploadEmailTemplate) Me.Controls.Add(Me.txtCustomerUploadEmailText) Me.Controls.Add(Me.lblCustomerUploadLanguage) Me.Controls.Add(Me.cmbCustomerUploadLanguage) @@ -479,8 +436,5 @@ Partial Class frmSendungsDokumentanforderung Friend WithEvents btnVermerkSetzen As Button Friend WithEvents lblTitel As Label Friend WithEvents lblKontaktEmails As Label - Friend WithEvents cmbCustomerUploadEmailTemplate As ComboBox - Friend WithEvents lblCustomerUploadEmailTemplate As Label Friend WithEvents dgvKontaktEmails As DataGridView - End Class diff --git a/Aviso/frmSendungsDokumentanforderung.vb b/Aviso/frmSendungsDokumentanforderung.vb index 1ed4c40..1277d14 100644 --- a/Aviso/frmSendungsDokumentanforderung.vb +++ b/Aviso/frmSendungsDokumentanforderung.vb @@ -6,11 +6,9 @@ Imports System.Text Imports Newtonsoft.Json Imports Newtonsoft.Json.Linq Imports VERAG_PROG_ALLGEMEIN -Imports AVISO.AvisoStatusFunctions Public Class frmSendungsDokumentanforderung Private ReadOnly AvisoDAL As New cAvisoDAL - Private ReadOnly _admin As New cADMIN Public Property AvisoID As Integer Public Property SendungID As Integer @@ -37,7 +35,6 @@ Public Class frmSendungsDokumentanforderung Private ReadOnly _kontaktEmailRows As New List(Of KontaktEmailRow) Private ReadOnly _kundenFirmaByNr As New Dictionary(Of Integer, String) Private _kontaktRolleTabs As TabControl - Private _emailTemplates As DataTable Public Sub New(ByVal avisoIdValue As Integer, ByVal sendungIdValue As Integer, state As DokumentanforderungState) InitializeComponent() @@ -63,78 +60,11 @@ Public Class frmSendungsDokumentanforderung InitializeDocumentEditor() SetupDynamicAnforderungCheckboxes() - LoadEmailTemplates() ApplyStateToUi(_stateToApply) InitializeKontaktEmailGrid() LoadKontaktEmails() End Sub - Private Sub LoadEmailTemplates() - Try - Dim sql As String = "SELECT [txt_Id], [txt_bezeichnung], [txt_sprache], [txt_text] FROM [tblTextkonserve] WHERE txt_kategorie = 'FRM_DOKUMENTANFORDERUNG_MailText' ORDER BY [txt_bezeichnung], [txt_sprache]" - _emailTemplates = (New VERAG_PROG_ALLGEMEIN.SQL).loadDgvBySql(sql, "FMZOLL", 1000, True) - - cmbCustomerUploadEmailTemplate.Items.Clear() - If _emailTemplates IsNot Nothing AndAlso _emailTemplates.Rows.Count > 0 Then - Dim bezeichnungen As New HashSet(Of String)() - For Each row As DataRow In _emailTemplates.Rows - Dim bezeichnung As String = If(IsDBNull(row("txt_bezeichnung")), "", CStr(row("txt_bezeichnung"))).Trim() - If bezeichnung <> "" AndAlso Not bezeichnungen.Contains(bezeichnung) Then - bezeichnungen.Add(bezeichnung) - cmbCustomerUploadEmailTemplate.Items.Add(bezeichnung) - End If - Next - End If - - If cmbCustomerUploadEmailTemplate.Items.Count > 0 Then - cmbCustomerUploadEmailTemplate.SelectedIndex = 0 - End If - Catch ex As Exception - ' Fehler beim Laden ignorieren, Vorlagen bleiben leer - End Try - End Sub - - Private Sub UpdateEmailText() - If _emailTemplates Is Nothing OrElse _emailTemplates.Rows.Count = 0 Then Return - - Dim selectedTemplate = If(cmbCustomerUploadEmailTemplate.SelectedItem, "").ToString() - Dim selectedLang = If(cmbCustomerUploadLanguage.SelectedItem, "").ToString().ToLowerInvariant() - If selectedLang = "" Then selectedLang = "de" - - If selectedTemplate <> "" Then - ' Suche nach passender Vorlage und Sprache - Dim foundText As String = "" - 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 - foundText = If(IsDBNull(row("txt_text")), "", CStr(row("txt_text"))) - Exit For - End If - ' Fallback auf 'de' oder die erste gefundene Sprache, falls die gesuchte nicht existiert - If foundText = "" OrElse String.Equals(sprache, "de", StringComparison.OrdinalIgnoreCase) Then - foundText = If(IsDBNull(row("txt_text")), "", CStr(row("txt_text"))) - End If - End If - Next - - If foundText <> "" Then - txtCustomerUploadEmailText.Text = foundText.Replace("\n", vbCrLf) - End If - End If - End Sub - - Private Sub cmbCustomerUploadEmailTemplate_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbCustomerUploadEmailTemplate.SelectedIndexChanged - UpdateEmailText() - End Sub - - Private Sub cmbCustomerUploadLanguage_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbCustomerUploadLanguage.SelectedIndexChanged - UpdateEmailText() - End Sub - Private Sub ResolveContextIds() If AvisoID > 0 AndAlso SendungID <> 0 Then Return @@ -505,10 +435,10 @@ Public Class frmSendungsDokumentanforderung Private Sub ConfigureAnforderungCheckbox(cb As CheckBox, container As Control) cb.AutoSize = False - cb.Height = 24 - Dim usableWidth = Math.Max(180, container.Width - 24) - Dim cbWidth = CInt(Math.Floor((usableWidth - 12) / 4)) - cb.Width = Math.Max(120, Math.Min(cbWidth, 320)) + cb.Height = 18 + Dim usableWidth = Math.Max(120, container.Width - 20) + Dim cbWidth = CInt(Math.Floor((usableWidth - 4) / 3)) + cb.Width = Math.Max(80, Math.Min(cbWidth, 220)) End Sub Private Sub DocumentEditorInputChanged(sender As Object, e As EventArgs) @@ -858,95 +788,10 @@ Public Class frmSendungsDokumentanforderung txtSonstigesDokumentFehlt.Focus() Exit Sub End If - If Not SaveSelectedVermerke() Then - Exit Sub - End If DialogResult = DialogResult.OK Close() End Sub - Private Function SaveSelectedVermerke() As Boolean - Try - If AvisoID <= 0 Then - MsgBox("Aviso konnte nicht ermittelt werden.", vbExclamation) - Return False - End If - - Dim sendungsText = GetSendungsAnzeigeText() - - For Each cb In _anforderungCheckboxes - If cb Is Nothing OrElse Not cb.Checked Then Continue For - - Dim codeId As Integer = 0 - If Not Integer.TryParse(If(cb.Tag, "").ToString(), codeId) Then Continue For - If codeId <= 0 Then Continue For - - Dim text = GetBackendVermerkText(codeId, If(cb.Text, "").Trim()) - If text = "" Then Continue For - text = AppendSendungIfMissing(text, sendungsText) - - insertSendungsVermerk(SendungID, AvisoID, text, codeId) - Next - - If cbxSonstDok.Checked Then - Dim customDocName = If(txtSonstigesDokumentFehlt.Text, "").Trim() - If customDocName <> "" Then - Dim text = GetBackendVermerkText(25, "") - If text = "" Then - text = customDocName - Else - text = text.Replace("''", "'" & customDocName & "'") - If InStr(text, customDocName, CompareMethod.Text) = 0 Then - text &= " [" & customDocName & "]" - End If - End If - text = AppendSendungIfMissing(text, sendungsText) - insertSendungsVermerk(SendungID, AvisoID, text, 25) - End If - End If - - If cbxNichtLeserlich.Checked Then - Dim text = GetBackendVermerkText(42, If(cbxNichtLeserlich.Text, "").Trim()) - text = AppendSendungIfMissing(text, sendungsText) - If text <> "" Then - insertSendungsVermerk(SendungID, AvisoID, text, 42) - End If - End If - - Return True - Catch ex As Exception - MsgBox("Vermerk konnte nicht gespeichert werden: " & ex.Message, vbExclamation) - Return False - End Try - End Function - - Private Function GetSendungsAnzeigeText() As String - If SendungID <= 0 Then Return "KOMPLETT" - Try - Return _admin.getValueTxtBySql(" SELECT convert(varchar(2),[tblSnd_PosUnterNr]) +' - ' +isnull([tblSnd_Empfaenger],'') FROM tblSendungen WHERE [tblSnd_SendungID]=" & SendungID, "AVISO").Trim() - Catch - Return SendungID.ToString() - End Try - End Function - - Private Function GetBackendVermerkText(codeId As Integer, fallback As String) As String - If _backendBezeichnungByCodeId.ContainsKey(codeId) Then - Dim value = If(_backendBezeichnungByCodeId(codeId), "").Trim() - If value <> "" Then - Return value - End If - End If - Return If(fallback, "").Trim() - End Function - - Private Function AppendSendungIfMissing(text As String, sendungsText As String) As String - Dim value = If(text, "").Trim() - Dim snd = If(sendungsText, "").Trim() - If value = "" OrElse snd = "" Then Return value - If InStr(value, "sendung", CompareMethod.Text) > 0 Then Return value - Return value & " bei Sendung '" & snd & "'" - End Function - Private Sub btnCustomerUploadLink_Click(sender As Object, e As EventArgs) Handles btnCustomerUploadLink.Click Dim validityHours = CInt(nudCustomerUploadValidityHours.Value) Dim config = GetCustomerPortalApiConfig() @@ -1430,7 +1275,7 @@ Public Class frmSendungsDokumentanforderung Public Property NichtLeserlichChecked As Boolean Public Property CustomerUploadEmail As String Public Property CustomerUploadLanguage As String = "de" - Public Property CustomerUploadEmailText As String = "" + Public Property CustomerUploadEmailText As String = "Bitte laden Sie die angeforderten Dokumente über den Link hoch." Public Property CustomerUploadValidityHours As Integer = 168 End Class End Class