From 79c4e4e37c5e84cc66303737bdf1bed1be253a7b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 12 Apr 2023 16:58:16 +0200 Subject: [PATCH] AddIn --- .../frmAvisoFormularAnfügen.Designer.vb | 279 +++++++++-------- VERAGAddIn/frmAvisoFormularAnfügen.vb | 291 +++++++++++++++--- VERAGAddIn/rbnMailItem.Designer.vb | 30 +- VERAGAddIn/rbnMailItem.vb | 4 +- VERAGAddIn/rbnVERAG.Designer.vb | 50 ++- VERAGAddIn/rbnVERAG.vb | 165 ++++++---- 6 files changed, 547 insertions(+), 272 deletions(-) diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb index 1c3aa0b..72da95d 100644 --- a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb +++ b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb @@ -26,88 +26,77 @@ Partial Class frmAvisoFormularAnfuegen Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAvisoFormularAnfuegen)) + Me.lblVMId = New System.Windows.Forms.Label() + Me.cbVMTypen = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.panelKunden = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.Label1 = New System.Windows.Forms.Label() + Me.lblWarning = New System.Windows.Forms.Label() + Me.lblKunden = New System.Windows.Forms.Label() + Me.KdSearchBox = New VERAG_PROG_ALLGEMEIN.KdSearchBox() + Me.pnlDetails = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.pnlBottom = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.pbAnhaenge = New System.Windows.Forms.PictureBox() Me.lblMultiAttachements = New System.Windows.Forms.Label() Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.UsrCntlKundenZollVollmachten1 = New SDL.usrCntlKundenZollVollmachten() - Me.MyPanel2 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) - Me.lblWarning = New System.Windows.Forms.Label() - Me.lblVMId = New System.Windows.Forms.Label() - Me.lblKunden = New System.Windows.Forms.Label() - Me.KdSearchBox = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.cbVMTypen = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) - Me.pbAnhaenge = New System.Windows.Forms.PictureBox() Me.btnOK = New System.Windows.Forms.Button() Me.btnCancel = New System.Windows.Forms.Button() - Me.Label1 = New System.Windows.Forms.Label() - CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() - Me.MyPanel2.SuspendLayout() - Me.MyPanel1.SuspendLayout() + Me.panelKunden.SuspendLayout() + Me.pnlBottom.SuspendLayout() CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() + Me.MyPanel1.SuspendLayout() Me.SuspendLayout() ' - 'lblMultiAttachements + 'lblVMId ' - Me.lblMultiAttachements.AutoSize = True - Me.lblMultiAttachements.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMultiAttachements.ForeColor = System.Drawing.Color.Red - Me.lblMultiAttachements.Location = New System.Drawing.Point(9, 465) - Me.lblMultiAttachements.Name = "lblMultiAttachements" - Me.lblMultiAttachements.Size = New System.Drawing.Size(342, 13) - Me.lblMultiAttachements.TabIndex = 38 - Me.lblMultiAttachements.Text = "Anhang markieren, der explizit als PDF-Anhang gespeichert werden soll" + Me.lblVMId.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.lblVMId.AutoSize = True + Me.lblVMId.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblVMId.Location = New System.Drawing.Point(12, 53) + Me.lblVMId.Name = "lblVMId" + Me.lblVMId.Size = New System.Drawing.Size(69, 13) + Me.lblVMId.TabIndex = 36 + Me.lblVMId.Text = "Vollmacht-Art" ' - 'dgvAnhaenge + 'cbVMTypen ' - Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvAnhaenge.AllowUserToAddRows = False - Me.dgvAnhaenge.AllowUserToDeleteRows = False - Me.dgvAnhaenge.AllowUserToResizeColumns = False - Me.dgvAnhaenge.AllowUserToResizeRows = False - Me.dgvAnhaenge.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.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White - Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvAnhaenge.ColumnHeadersVisible = False - Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName}) - Me.dgvAnhaenge.Location = New System.Drawing.Point(0, 483) - Me.dgvAnhaenge.Name = "dgvAnhaenge" - Me.dgvAnhaenge.ReadOnly = True - Me.dgvAnhaenge.RowHeadersVisible = False - Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvAnhaenge.Size = New System.Drawing.Size(514, 36) - Me.dgvAnhaenge.TabIndex = 39 - Me.dgvAnhaenge.Visible = False + Me.cbVMTypen._allowedValuesFreiText = Nothing + Me.cbVMTypen._allowFreiText = False + Me.cbVMTypen._value = "" + Me.cbVMTypen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.cbVMTypen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbVMTypen.FormattingEnabled = True + Me.cbVMTypen.Location = New System.Drawing.Point(12, 73) + Me.cbVMTypen.Name = "cbVMTypen" + Me.cbVMTypen.Size = New System.Drawing.Size(492, 24) + Me.cbVMTypen.TabIndex = 35 ' - 'columnName + 'panelKunden ' - Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.columnName.HeaderText = "Name" - Me.columnName.Name = "columnName" - Me.columnName.ReadOnly = True + Me.panelKunden.Controls.Add(Me.lblVMId) + Me.panelKunden.Controls.Add(Me.cbVMTypen) + Me.panelKunden.Controls.Add(Me.Label1) + Me.panelKunden.Controls.Add(Me.lblWarning) + Me.panelKunden.Controls.Add(Me.lblKunden) + Me.panelKunden.Controls.Add(Me.KdSearchBox) + Me.panelKunden.Dock = System.Windows.Forms.DockStyle.Top + Me.panelKunden.Location = New System.Drawing.Point(0, 0) + Me.panelKunden.Name = "panelKunden" + Me.panelKunden.Size = New System.Drawing.Size(519, 105) + Me.panelKunden.TabIndex = 37 ' - 'UsrCntlKundenZollVollmachten1 + 'Label1 ' - Me.UsrCntlKundenZollVollmachten1.Location = New System.Drawing.Point(0, 120) - Me.UsrCntlKundenZollVollmachten1.Name = "UsrCntlKundenZollVollmachten1" - Me.UsrCntlKundenZollVollmachten1.Size = New System.Drawing.Size(514, 342) - Me.UsrCntlKundenZollVollmachten1.TabIndex = 38 - ' - 'MyPanel2 - ' - Me.MyPanel2.Controls.Add(Me.Label1) - Me.MyPanel2.Controls.Add(Me.lblWarning) - Me.MyPanel2.Controls.Add(Me.lblVMId) - Me.MyPanel2.Controls.Add(Me.lblKunden) - Me.MyPanel2.Controls.Add(Me.KdSearchBox) - Me.MyPanel2.Controls.Add(Me.cbVMTypen) - Me.MyPanel2.Dock = System.Windows.Forms.DockStyle.Top - Me.MyPanel2.Location = New System.Drawing.Point(0, 0) - Me.MyPanel2.Name = "MyPanel2" - Me.MyPanel2.Size = New System.Drawing.Size(521, 114) - Me.MyPanel2.TabIndex = 37 + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.ForeColor = System.Drawing.Color.Red + Me.Label1.Location = New System.Drawing.Point(407, 4) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(100, 20) + Me.Label1.TabIndex = 38 + Me.Label1.Text = "Testsystem" ' 'lblWarning ' @@ -118,23 +107,12 @@ Partial Class frmAvisoFormularAnfuegen Me.lblWarning.Size = New System.Drawing.Size(0, 13) Me.lblWarning.TabIndex = 37 ' - 'lblVMId - ' - Me.lblVMId.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.lblVMId.AutoSize = True - Me.lblVMId.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblVMId.Location = New System.Drawing.Point(12, 61) - Me.lblVMId.Name = "lblVMId" - Me.lblVMId.Size = New System.Drawing.Size(69, 13) - Me.lblVMId.TabIndex = 36 - Me.lblVMId.Text = "Vollmacht-Art" - ' 'lblKunden ' Me.lblKunden.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.lblKunden.AutoSize = True Me.lblKunden.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblKunden.Location = New System.Drawing.Point(12, 9) + Me.lblKunden.Location = New System.Drawing.Point(12, 4) Me.lblKunden.Name = "lblKunden" Me.lblKunden.Size = New System.Drawing.Size(44, 13) Me.lblKunden.TabIndex = 2 @@ -162,7 +140,7 @@ Partial Class frmAvisoFormularAnfuegen Me.KdSearchBox.KdNr = "-1" Me.KdSearchBox.kdNrField = Nothing Me.KdSearchBox.KdNrNullInt = Nothing - Me.KdSearchBox.Location = New System.Drawing.Point(12, 32) + Me.KdSearchBox.Location = New System.Drawing.Point(12, 27) Me.KdSearchBox.Name = "KdSearchBox" Me.KdSearchBox.nurAktive = True Me.KdSearchBox.searchActive = True @@ -171,46 +149,91 @@ Partial Class frmAvisoFormularAnfuegen Me.KdSearchBox.TIMER_SEARCH = True Me.KdSearchBox.usrcntl = Nothing ' - 'cbVMTypen + 'pnlDetails ' - Me.cbVMTypen._allowedValuesFreiText = Nothing - Me.cbVMTypen._allowFreiText = False - Me.cbVMTypen._value = "" - Me.cbVMTypen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.cbVMTypen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbVMTypen.FormattingEnabled = True - Me.cbVMTypen.Location = New System.Drawing.Point(12, 81) - Me.cbVMTypen.Name = "cbVMTypen" - Me.cbVMTypen.Size = New System.Drawing.Size(492, 24) - Me.cbVMTypen.TabIndex = 35 + Me.pnlDetails.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnlDetails.Location = New System.Drawing.Point(0, 103) + Me.pnlDetails.Name = "pnlDetails" + Me.pnlDetails.Size = New System.Drawing.Size(518, 426) + Me.pnlDetails.TabIndex = 38 ' - 'MyPanel1 + 'pnlBottom ' - Me.MyPanel1.Controls.Add(Me.pbAnhaenge) - Me.MyPanel1.Controls.Add(Me.btnOK) - Me.MyPanel1.Controls.Add(Me.btnCancel) - Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Bottom - Me.MyPanel1.Location = New System.Drawing.Point(0, 523) - Me.MyPanel1.Name = "MyPanel1" - Me.MyPanel1.Size = New System.Drawing.Size(521, 108) - Me.MyPanel1.TabIndex = 36 + Me.pnlBottom.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.pnlBottom.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnlBottom.Controls.Add(Me.pbAnhaenge) + Me.pnlBottom.Controls.Add(Me.lblMultiAttachements) + Me.pnlBottom.Controls.Add(Me.dgvAnhaenge) + Me.pnlBottom.Location = New System.Drawing.Point(0, 530) + Me.pnlBottom.Name = "pnlBottom" + Me.pnlBottom.Size = New System.Drawing.Size(519, 158) + Me.pnlBottom.TabIndex = 39 ' 'pbAnhaenge ' + Me.pbAnhaenge.Anchor = System.Windows.Forms.AnchorStyles.Bottom Me.pbAnhaenge.Enabled = False Me.pbAnhaenge.Image = Global.VERAGAddIn.My.Resources.Resources.pdf_gray - Me.pbAnhaenge.Location = New System.Drawing.Point(15, 11) + Me.pbAnhaenge.Location = New System.Drawing.Point(12, 106) Me.pbAnhaenge.Name = "pbAnhaenge" - Me.pbAnhaenge.Size = New System.Drawing.Size(65, 50) + Me.pbAnhaenge.Size = New System.Drawing.Size(63, 52) Me.pbAnhaenge.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.pbAnhaenge.TabIndex = 32 Me.pbAnhaenge.TabStop = False ' + 'lblMultiAttachements + ' + Me.lblMultiAttachements.AutoSize = True + Me.lblMultiAttachements.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblMultiAttachements.ForeColor = System.Drawing.Color.Red + Me.lblMultiAttachements.Location = New System.Drawing.Point(15, 2) + Me.lblMultiAttachements.Name = "lblMultiAttachements" + Me.lblMultiAttachements.Size = New System.Drawing.Size(342, 13) + Me.lblMultiAttachements.TabIndex = 38 + Me.lblMultiAttachements.Text = "Anhang markieren, der explizit als PDF-Anhang gespeichert werden soll" + ' + 'dgvAnhaenge + ' + Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvAnhaenge.AllowUserToAddRows = False + Me.dgvAnhaenge.AllowUserToDeleteRows = False + Me.dgvAnhaenge.AllowUserToResizeColumns = False + Me.dgvAnhaenge.AllowUserToResizeRows = False + Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White + Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvAnhaenge.ColumnHeadersVisible = False + Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName}) + Me.dgvAnhaenge.Location = New System.Drawing.Point(12, 19) + Me.dgvAnhaenge.Name = "dgvAnhaenge" + Me.dgvAnhaenge.ReadOnly = True + Me.dgvAnhaenge.RowHeadersVisible = False + Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvAnhaenge.Size = New System.Drawing.Size(492, 30) + Me.dgvAnhaenge.TabIndex = 39 + Me.dgvAnhaenge.Visible = False + ' + 'columnName + ' + Me.columnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.columnName.HeaderText = "Name" + Me.columnName.Name = "columnName" + Me.columnName.ReadOnly = True + ' + 'MyPanel1 + ' + Me.MyPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.MyPanel1.Controls.Add(Me.btnOK) + Me.MyPanel1.Controls.Add(Me.btnCancel) + Me.MyPanel1.Location = New System.Drawing.Point(0, 689) + Me.MyPanel1.Name = "MyPanel1" + Me.MyPanel1.Size = New System.Drawing.Size(518, 50) + Me.MyPanel1.TabIndex = 40 + ' 'btnOK ' Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnOK.Location = New System.Drawing.Point(409, 65) + Me.btnOK.Location = New System.Drawing.Point(409, 7) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(105, 40) Me.btnOK.TabIndex = 3 @@ -221,61 +244,51 @@ Partial Class frmAvisoFormularAnfuegen ' Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnCancel.Location = New System.Drawing.Point(3, 67) + Me.btnCancel.Location = New System.Drawing.Point(3, 9) Me.btnCancel.Name = "btnCancel" Me.btnCancel.Size = New System.Drawing.Size(116, 40) Me.btnCancel.TabIndex = 31 Me.btnCancel.Text = "Abbrechen" Me.btnCancel.UseVisualStyleBackColor = True ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.ForeColor = System.Drawing.Color.Red - Me.Label1.Location = New System.Drawing.Point(407, 4) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(100, 20) - Me.Label1.TabIndex = 38 - Me.Label1.Text = "Testsystem" - ' 'frmAvisoFormularAnfuegen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(521, 631) - Me.Controls.Add(Me.lblMultiAttachements) - Me.Controls.Add(Me.dgvAnhaenge) - Me.Controls.Add(Me.UsrCntlKundenZollVollmachten1) - Me.Controls.Add(Me.MyPanel2) + Me.ClientSize = New System.Drawing.Size(519, 741) Me.Controls.Add(Me.MyPanel1) + Me.Controls.Add(Me.pnlBottom) + Me.Controls.Add(Me.pnlDetails) + Me.Controls.Add(Me.panelKunden) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmAvisoFormularAnfuegen" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Vollmacht anfügen" - CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit() - Me.MyPanel2.ResumeLayout(False) - Me.MyPanel2.PerformLayout() - Me.MyPanel1.ResumeLayout(False) + Me.panelKunden.ResumeLayout(False) + Me.panelKunden.PerformLayout() + Me.pnlBottom.ResumeLayout(False) + Me.pnlBottom.PerformLayout() CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit() + Me.MyPanel1.ResumeLayout(False) Me.ResumeLayout(False) - Me.PerformLayout() End Sub Friend WithEvents lblKunden As Windows.Forms.Label - Friend WithEvents btnOK As Windows.Forms.Button Friend WithEvents KdSearchBox As VERAG_PROG_ALLGEMEIN.KdSearchBox - Friend WithEvents btnCancel As Windows.Forms.Button Friend WithEvents cbVMTypen As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents MyPanel1 As VERAG_PROG_ALLGEMEIN.MyPanel - Friend WithEvents pbAnhaenge As Windows.Forms.PictureBox - Friend WithEvents MyPanel2 As VERAG_PROG_ALLGEMEIN.MyPanel + Friend WithEvents panelKunden As VERAG_PROG_ALLGEMEIN.MyPanel Friend WithEvents lblVMId As Windows.Forms.Label - Friend WithEvents UsrCntlKundenZollVollmachten1 As SDL.usrCntlKundenZollVollmachten - Friend WithEvents dgvAnhaenge As VERAG_PROG_ALLGEMEIN.MyDatagridview - Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents lblWarning As Windows.Forms.Label - Friend WithEvents lblMultiAttachements As Windows.Forms.Label Friend WithEvents Label1 As Windows.Forms.Label + Friend WithEvents pnlDetails As MyPanel + Friend WithEvents pnlBottom As MyPanel + Friend WithEvents pbAnhaenge As Windows.Forms.PictureBox + Friend WithEvents lblMultiAttachements As Windows.Forms.Label + Friend WithEvents dgvAnhaenge As MyDatagridview + Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn + Friend WithEvents MyPanel1 As MyPanel + Friend WithEvents btnOK As Windows.Forms.Button + Friend WithEvents btnCancel As Windows.Forms.Button End Class diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.vb b/VERAGAddIn/frmAvisoFormularAnfügen.vb index 1c971d5..f8ff9df 100644 --- a/VERAGAddIn/frmAvisoFormularAnfügen.vb +++ b/VERAGAddIn/frmAvisoFormularAnfügen.vb @@ -1,8 +1,11 @@ Imports System.Collections Imports System.Data +Imports System.Diagnostics.Tracing Imports System.Drawing +Imports System.Net Imports System.Windows.Forms Imports System.Windows.Forms.VisualStyles.VisualStyleElement.Button +Imports Microsoft.Office.Tools.Ribbon Imports SDL Imports VERAG_PROG_ALLGEMEIN @@ -10,7 +13,7 @@ Imports VERAG_PROG_ALLGEMEIN Public Class frmAvisoFormularAnfuegen Public KdNr As Integer = -1 - Public vollmachtId As Integer = -1 + Public AvisoId As Integer = -1 Dim vollmachtartId As Integer = -1 Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Public SendungsId = -1 @@ -18,6 +21,13 @@ Public Class frmAvisoFormularAnfuegen Public PDF_MAIL = "" Public ATT As List(Of String) Public hasAnhaenge As Boolean = False + Public button As RibbonButton + Dim UsrCntlKundenZollVollmachten1 As usrCntlKundenZollVollmachten + Dim UsrCntlVertraege1 As usrcntlVertraege + Dim UsrCntlGestellungsgarantien1 As usrcntlGestellungsgarantien + Dim frmDefaultSize As Size = New Size(535, 750) + Dim dgvAnhaengeSize As Size = New Size(495, 30) + Sub New() @@ -26,23 +36,62 @@ Public Class frmAvisoFormularAnfuegen End Sub - Sub New(Bezeichnung) + Sub New(Bezeichnung, sender) InitializeComponent() Me.Bezeichnung = Bezeichnung + button = sender + initForm() + + + End Sub + Sub initForm() + + Me.pnlDetails.AutoSizeMode = AutoSizeMode.GrowAndShrink + Me.pnlDetails.AutoSize = True + + + Select Case button.Name + + Case "btnVollmachten" + + UsrCntlKundenZollVollmachten1 = New usrCntlKundenZollVollmachten() + UsrCntlKundenZollVollmachten1.AutoSize = False + Me.pnlDetails.Controls.Add(UsrCntlKundenZollVollmachten1) + Me.Text = "Vollmachten einfügen" + + + Case "btnVertraege" + UsrCntlVertraege1 = New usrcntlVertraege() + AddHandler UsrCntlVertraege1.clickOK, AddressOf btnOK_Click + Me.pnlDetails.Controls.Add(UsrCntlVertraege1) + Me.Text = "Verträge einfügen" + + + Case "btnGestellungsgarantien" + UsrCntlGestellungsgarantien1 = New usrcntlGestellungsgarantien() + AddHandler UsrCntlGestellungsgarantien1.clickOK, AddressOf btnOK_Click + Me.Text = "Gestellungsgarantien einfügen" + 'UsrCntlGestellungsgarantien1.AutoSize = False + Me.pnlDetails.Controls.Add(UsrCntlGestellungsgarantien1) + + + Case Else + MsgBox("Funktion nicht unterstützt!") + Me.DialogResult = DialogResult.Cancel + Me.Close() + + End Select End Sub Private Sub frmAvisoFormularAnfuegen_Load(sender As Object, e As EventArgs) Handles MyBase.Load - - - KdSearchBox.initKdBox(Me) initAttachment() + KdSearchBox.initKdBox(Me) If hasAnhaenge Then pbAnhaenge.Image = My.Resources.pdf - End Sub @@ -59,7 +108,22 @@ Public Class frmAvisoFormularAnfuegen Sub init() If KdNr > 0 Then - initVollmachtarten(KdNr) + Select Case button.Name + + Case "btnVollmachten" + + initVollmachtarten(KdNr) + + Case "btnVertraege" + + UsrCntlVertraege1.initDGVVertraege(KdNr) + + Case "btnGestellungsgarantien" + + UsrCntlGestellungsgarantien1.initDGVGestGarantie(KdNr) + + End Select + End If End Sub @@ -92,17 +156,15 @@ Public Class frmAvisoFormularAnfuegen End If End Sub + Dim test As usrcntlGestellungsgarantien.clickOKEventHandler() Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click - If Not checkMandatoryFields() Then - DialogResult = DialogResult.None - Exit Sub - End If + If Not hasAnhaenge Then - If Not vbYes = MsgBox("Diese Email besitzt keinen Anhang!" & vbCrLf & "Soll die Email denoch gespeichert werden?", vbYesNoCancel) Then + If Not vbYes = MsgBox("Diese Email besitzt keinen Anhang!" & vbCrLf & "Soll die Email denoch als Anhang gespeichert werden?", vbYesNoCancel) Then Close() DialogResult = DialogResult.None Exit Sub @@ -110,22 +172,101 @@ Public Class frmAvisoFormularAnfuegen End If - Dim i = dgvAnhaenge.SelectedCells.Item(0).RowIndex + Dim i = 0 + If dgvAnhaenge.SelectedCells.Count > 0 Then i = dgvAnhaenge.SelectedCells.Item(0).RowIndex If i > 0 Then AddAttachmentOnLastIndex(ATT, i) End If + If Not checkMandatoryFields() Then + DialogResult = DialogResult.None + Exit Sub + End If - UsrCntlKundenZollVollmachten1.btnNeu_Click(sender, e) - vollmachtId = UsrCntlKundenZollVollmachten1.vmId + Select Case button.Name - Close() + Case "btnVollmachten" + + UsrCntlKundenZollVollmachten1.btnNeu_Click(sender, e) + AvisoId = UsrCntlKundenZollVollmachten1.vmId + + Close() + + Case "btnVertraege" + + If sender.Text = "Hinzufügen" Then + + setAvisoIdForVertrage() + Me.DialogResult = DialogResult.OK + + ElseIf UsrCntlVertraege1.dgvVertraege.SelectedRows.Count = 1 Then + + For Each row As DataGridViewRow In UsrCntlVertraege1.dgvVertraege.SelectedRows + If row.Cells("kv_datenarchivId").Value IsNot DBNull.Value Then + setAvisoIdForVertrage() + End If + Next + Me.DialogResult = DialogResult.OK + Close() + Else + Close() + End If + + + + Close() + + Case "btnGestellungsgarantien" + + If sender.Text = "Hinzufügen" Then + + setAvisoIdForGestellungen() + Me.DialogResult = DialogResult.OK + + ElseIf UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows.Count = 1 Then + + For Each row As DataGridViewRow In UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows + + If row.Cells("gg_datenarchivId").Value Is DBNull.Value Then + 'Or CInt(row.Cells("gg_datenarchivId").Value) < 0 + setAvisoIdForGestellungen() + End If + + Next + Me.DialogResult = DialogResult.OK + Close() + Else + + Close() + End If + + + + End Select End Sub + Private Sub setAvisoIdForGestellungen() + If UsrCntlGestellungsgarantien1.Gid > 0 Then + AvisoId = UsrCntlGestellungsgarantien1.Gid + ElseIf UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows.Count = 1 Then + AvisoId = UsrCntlGestellungsgarantien1.dgvGestGarantie.SelectedRows(0).Cells("gg_id").Value + End If + + End Sub + + Private Sub setAvisoIdForVertrage() + If UsrCntlVertraege1.Vid > 0 Then + AvisoId = UsrCntlVertraege1.Vid + ElseIf UsrCntlVertraege1.dgvVertraege.SelectedRows.Count = 1 Then + AvisoId = UsrCntlVertraege1.dgvVertraege.SelectedRows(0).Cells("kv_id").Value + End If + + End Sub + Private Sub AddAttachmentOnLastIndex(ByRef a As List(Of String), tmpIndex As Integer) If (a IsNot Nothing) AndAlso (a.Count > 1) Then Dim list As New List(Of String) @@ -144,37 +285,85 @@ Public Class frmAvisoFormularAnfuegen Sub initAttachment() dgvAnhaenge.Rows.Clear() + + If ATT Is Nothing Then + Exit Sub + End If + If ATT.Count = 0 Then hasAnhaenge = False PDF_MAIL = "ONLYMAIL_DATENSERVER" Else hasAnhaenge = True - PDF_MAIL = "PDF_DATENSERVER" + If button.Name = "btnVollmachten" Then + PDF_MAIL = "PDF_DATENSERVER" + Else + PDF_MAIL = "ONLYPDF_DATENSERVER" + End If + For Each a In ATT - Dim display = a - If a.Contains("\") Then - Dim sp = a.Split("\") - display = sp(sp.Count - 1) - End If - dgvAnhaenge.Rows.Add({display}) - Next - End If + Dim display = a + If a.Contains("\") Then + Dim sp = a.Split("\") + display = sp(sp.Count - 1) + End If + dgvAnhaenge.Rows.Add({display}) + Next + End If - If dgvAnhaenge.Rows.Count >= 2 Then + Dim addHeightfrm = 180 + Dim addHeightdgv = 50 + If dgvAnhaenge.Rows.Count > 1 Then dgvAnhaenge.Visible = True lblMultiAttachements.Visible = True - Me.Size = New Size(537, 720) - dgvAnhaenge.Size = New Size(514, 86) + + + Select Case button.Name + + Case "btnVollmachten" + + Me.Size = New Size(frmDefaultSize.Width, frmDefaultSize.Height + addHeightdgv) + pnlDetails.Size = New Size(pnlDetails.Width, pnlDetails.Height + addHeightdgv) + dgvAnhaenge.Size = New Size(dgvAnhaengeSize.Width, dgvAnhaengeSize.Height + addHeightdgv) + + Case "btnVertraege" + Me.Size = New Size(frmDefaultSize.Width, frmDefaultSize.Height - addHeightfrm) + pnlDetails.Size = New Size(pnlDetails.Width, pnlDetails.Height - addHeightfrm) + dgvAnhaenge.Size = New Size(dgvAnhaengeSize.Width, dgvAnhaengeSize.Height + addHeightdgv) + + Case "btnGestellungsgarantien" + Me.Size = New Size(frmDefaultSize.Width, frmDefaultSize.Height - addHeightfrm) + pnlDetails.Size = New Size(pnlDetails.Width, pnlDetails.Height - addHeightfrm) + dgvAnhaenge.Size = New Size(dgvAnhaengeSize.Width, dgvAnhaengeSize.Height + addHeightdgv) + End Select + + Else dgvAnhaenge.Visible = False lblMultiAttachements.Visible = False - dgvAnhaenge.Size = New Size(514, 36) - Me.Size = New Size(537, 670) + Select Case button.Name + + Case "btnVollmachten" + + Me.Size = frmDefaultSize + dgvAnhaenge.Size = dgvAnhaengeSize + Case "btnVertraege" + pnlDetails.Size = New Size(pnlDetails.Width, pnlDetails.Height - addHeightfrm - addHeightdgv) + Me.Size = New Size(frmDefaultSize.Width, frmDefaultSize.Height - addHeightfrm) + dgvAnhaenge.Size = dgvAnhaengeSize + + Case "btnGestellungsgarantien" + pnlDetails.Size = New Size(pnlDetails.Width, pnlDetails.Height - addHeightfrm - addHeightdgv) + Me.Size = New Size(frmDefaultSize.Width, frmDefaultSize.Height - addHeightfrm) + dgvAnhaenge.Size = dgvAnhaengeSize + End Select + + End If - dgvAnhaenge.ClearSelection() + dgvAnhaenge.ClearSelection() End Sub Private Function checkMandatoryFields() As Boolean @@ -188,15 +377,24 @@ Public Class frmAvisoFormularAnfuegen Return valid End If - If cbVMTypen._value = "" Then - lblWarning.Text = "Vollmachttyp auswählen" - Return valid - End If - If UsrCntlKundenZollVollmachten1.txtGueltigVon.Text = "" Then - lblWarning.Text = "Gültig von-Datum hinterlegen!" - Return valid - End If + Select Case button.Name + + Case "btnVollmachten" + + If cbVMTypen._value = "" Then + lblWarning.Text = "Vollmachttyp auswählen" + Return valid + End If + + If UsrCntlKundenZollVollmachten1.txtGueltigVon.Text = "" Then + lblWarning.Text = "Gültig von-Datum hinterlegen!" + Return valid + End If + + + Case Else + End Select lblWarning.Text = "" @@ -208,5 +406,20 @@ Public Class frmAvisoFormularAnfuegen Private Sub frmAvisoFormularAnfuegen_Shown(sender As Object, e As EventArgs) Handles Me.Shown KdSearchBox.Focus() Label1.Visible = cAllgemein.TESTSYSTEM + If button.Name = "btnVollmachten" Then + lblVMId.Visible = True + cbVMTypen.Visible = True + Else + lblVMId.Visible = False + cbVMTypen.Visible = False + End If + End Sub + + Private Sub pnlDetails_ControlAdded(sender As Object, e As ControlEventArgs) + For Each control As Control In Controls + pnlDetails.Size = control.Size + Next + End Sub + End Class \ No newline at end of file diff --git a/VERAGAddIn/rbnMailItem.Designer.vb b/VERAGAddIn/rbnMailItem.Designer.vb index 72c2f65..06d8465 100644 --- a/VERAGAddIn/rbnMailItem.Designer.vb +++ b/VERAGAddIn/rbnMailItem.Designer.vb @@ -44,11 +44,11 @@ Me.components = New System.ComponentModel.Container() Me.Tab1 = Me.Factory.CreateRibbonTab Me.Group1 = Me.Factory.CreateRibbonGroup + Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) Me.Button1 = Me.Factory.CreateRibbonButton - Me.Button2 = Me.Factory.CreateRibbonButton + Me.btnAvisoMail2 = Me.Factory.CreateRibbonButton Me.btnInfo = Me.Factory.CreateRibbonButton Me.btnUnsichtbar = Me.Factory.CreateRibbonButton - Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) Me.Tab1.SuspendLayout() Me.Group1.SuspendLayout() Me.SuspendLayout() @@ -63,12 +63,17 @@ 'Group1 ' Me.Group1.Items.Add(Me.Button1) - Me.Group1.Items.Add(Me.Button2) + Me.Group1.Items.Add(Me.btnAvisoMail2) Me.Group1.Items.Add(Me.btnInfo) Me.Group1.Items.Add(Me.btnUnsichtbar) Me.Group1.Label = "AVISO" Me.Group1.Name = "Group1" ' + 'NotifyIcon1 + ' + Me.NotifyIcon1.Text = "NotifyIcon1" + Me.NotifyIcon1.Visible = True + ' 'Button1 ' Me.Button1.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge @@ -77,13 +82,13 @@ Me.Button1.Name = "Button1" Me.Button1.ShowImage = True ' - 'Button2 + 'btnAvisoMail2 ' - Me.Button2.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge - Me.Button2.Image = Global.VERAGAddIn.My.Resources.Resources._665209_email_512x512 - Me.Button2.Label = "Mail an Aviso anfügen" - Me.Button2.Name = "Button2" - Me.Button2.ShowImage = True + Me.btnAvisoMail2.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge + Me.btnAvisoMail2.Image = Global.VERAGAddIn.My.Resources.Resources._665209_email_512x512 + Me.btnAvisoMail2.Label = "Mail an Aviso anfügen" + Me.btnAvisoMail2.Name = "btnAvisoMail2" + Me.btnAvisoMail2.ShowImage = True ' 'btnInfo ' @@ -96,11 +101,6 @@ Me.btnUnsichtbar.Name = "btnUnsichtbar" Me.btnUnsichtbar.Visible = False ' - 'NotifyIcon1 - ' - Me.NotifyIcon1.Text = "NotifyIcon1" - Me.NotifyIcon1.Visible = True - ' 'rbnMailItem ' Me.Name = "rbnMailItem" @@ -119,7 +119,7 @@ Friend WithEvents Tab1 As Microsoft.Office.Tools.Ribbon.RibbonTab Friend WithEvents Group1 As Microsoft.Office.Tools.Ribbon.RibbonGroup Friend WithEvents Button1 As Microsoft.Office.Tools.Ribbon.RibbonButton - Friend WithEvents Button2 As Microsoft.Office.Tools.Ribbon.RibbonButton + Friend WithEvents btnAvisoMail2 As Microsoft.Office.Tools.Ribbon.RibbonButton Friend WithEvents btnInfo As Microsoft.Office.Tools.Ribbon.RibbonButton Friend WithEvents NotifyIcon1 As Windows.Forms.NotifyIcon Friend WithEvents btnUnsichtbar As Microsoft.Office.Tools.Ribbon.RibbonButton diff --git a/VERAGAddIn/rbnMailItem.vb b/VERAGAddIn/rbnMailItem.vb index 9848fd1..3eb0567 100644 --- a/VERAGAddIn/rbnMailItem.vb +++ b/VERAGAddIn/rbnMailItem.vb @@ -41,11 +41,11 @@ Public Class rbnMailItem End If End Sub - Private Sub Button2_Click(sender As Object, e As RibbonControlEventArgs) Handles Button2.Click + Private Sub Button2_Click(sender As Object, e As RibbonControlEventArgs) Handles btnAvisoMail2.Click If LOGIN_OK Then Try Dim INSPECTOR As Outlook.Inspector = e.Control.Context - AVISO_Mail_Functions.addMailToAviso(INSPECTOR.CurrentItem) + AVISO_Mail_Functions.addMailToAviso(INSPECTOR.CurrentItem, sender) 'Me.Context Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) diff --git a/VERAGAddIn/rbnVERAG.Designer.vb b/VERAGAddIn/rbnVERAG.Designer.vb index a6ada52..3d8b3cb 100644 --- a/VERAGAddIn/rbnVERAG.Designer.vb +++ b/VERAGAddIn/rbnVERAG.Designer.vb @@ -45,9 +45,11 @@ Me.VERAG = Me.Factory.CreateRibbonGroup Me.Button2 = Me.Factory.CreateRibbonButton Me.btnPdfPrint = Me.Factory.CreateRibbonButton - Me.Button3 = Me.Factory.CreateRibbonButton + Me.btnAvisoMail = Me.Factory.CreateRibbonButton Me.btnAttachFormular = Me.Factory.CreateRibbonSplitButton - Me.btnVM = Me.Factory.CreateRibbonButton + Me.btnVollmachten = Me.Factory.CreateRibbonButton + Me.btnVertraege = Me.Factory.CreateRibbonButton + Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton Me.SplitButton1 = Me.Factory.CreateRibbonSplitButton Me.Button1 = Me.Factory.CreateRibbonButton Me.Button4 = Me.Factory.CreateRibbonButton @@ -66,7 +68,7 @@ ' Me.VERAG.Items.Add(Me.Button2) Me.VERAG.Items.Add(Me.btnPdfPrint) - Me.VERAG.Items.Add(Me.Button3) + Me.VERAG.Items.Add(Me.btnAvisoMail) Me.VERAG.Items.Add(Me.btnAttachFormular) Me.VERAG.Items.Add(Me.SplitButton1) Me.VERAG.Label = "AVISO" @@ -88,27 +90,41 @@ Me.btnPdfPrint.Name = "btnPdfPrint" Me.btnPdfPrint.ShowImage = True ' - 'Button3 + 'btnAvisoMail ' - Me.Button3.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge - Me.Button3.Image = Global.VERAGAddIn.My.Resources.Resources._665209_email_512x512 - Me.Button3.Label = "Mail an Aviso anfügen" - Me.Button3.Name = "Button3" - Me.Button3.ShowImage = True + Me.btnAvisoMail.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge + Me.btnAvisoMail.Image = Global.VERAGAddIn.My.Resources.Resources._665209_email_512x512 + Me.btnAvisoMail.Label = "Mail an Aviso anfügen" + Me.btnAvisoMail.Name = "btnAvisoMail" + Me.btnAvisoMail.ShowImage = True ' 'btnAttachFormular ' Me.btnAttachFormular.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge Me.btnAttachFormular.Image = Global.VERAGAddIn.My.Resources.Resources.pdf - Me.btnAttachFormular.Items.Add(Me.btnVM) + Me.btnAttachFormular.Items.Add(Me.btnVollmachten) + Me.btnAttachFormular.Items.Add(Me.btnVertraege) + Me.btnAttachFormular.Items.Add(Me.btnGestellungsgarantien) Me.btnAttachFormular.Label = "Formulare anhängen" Me.btnAttachFormular.Name = "btnAttachFormular" ' - 'btnVM + 'btnVollmachten ' - Me.btnVM.Label = "Vollmacht anhängen" - Me.btnVM.Name = "btnVM" - Me.btnVM.ShowImage = True + Me.btnVollmachten.Label = "Vollmachten" + Me.btnVollmachten.Name = "btnVollmachten" + Me.btnVollmachten.ShowImage = True + ' + 'btnVertraege + ' + Me.btnVertraege.Label = "Verträge/Unterlagen" + Me.btnVertraege.Name = "btnVertraege" + Me.btnVertraege.ShowImage = True + ' + 'btnGestellungsgarantien + ' + Me.btnGestellungsgarantien.Label = "Gestellungsgarantien" + Me.btnGestellungsgarantien.Name = "btnGestellungsgarantien" + Me.btnGestellungsgarantien.ShowImage = True ' 'SplitButton1 ' @@ -151,10 +167,12 @@ Friend WithEvents btnPdfPrint As Microsoft.Office.Tools.Ribbon.RibbonButton Friend WithEvents SplitButton1 As Microsoft.Office.Tools.Ribbon.RibbonSplitButton Friend WithEvents Button1 As Microsoft.Office.Tools.Ribbon.RibbonButton - Friend WithEvents Button3 As Microsoft.Office.Tools.Ribbon.RibbonButton + Friend WithEvents btnAvisoMail As Microsoft.Office.Tools.Ribbon.RibbonButton Friend WithEvents Button4 As Microsoft.Office.Tools.Ribbon.RibbonButton Friend WithEvents btnAttachFormular As Microsoft.Office.Tools.Ribbon.RibbonSplitButton - Friend WithEvents btnVM As Microsoft.Office.Tools.Ribbon.RibbonButton + Friend WithEvents btnVollmachten As Microsoft.Office.Tools.Ribbon.RibbonButton + Friend WithEvents btnVertraege As Microsoft.Office.Tools.Ribbon.RibbonButton + Friend WithEvents btnGestellungsgarantien As Microsoft.Office.Tools.Ribbon.RibbonButton End Class Partial Class ThisRibbonCollection diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index db6cb07..00914f3 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -35,7 +35,7 @@ Public Class VERAGRibbon Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load - cAllgemein.TESTSYSTEM = False + cAllgemein.TESTSYSTEM = True LOGIN_OK = AVISO_Mail_Functions.initFirmaUser() End Sub @@ -74,14 +74,8 @@ Public Class VERAGRibbon End Sub - Sub Button3_Click(sender As Object, e As RibbonControlEventArgs) Handles Button3.Click - If LOGIN_OK Then AVISO_Mail_Functions.addMailToAviso_Hauptfenster() - End Sub - - Private Sub btnVM_Click(sender As Object, e As RibbonControlEventArgs) Handles btnVM.Click - If LOGIN_OK Then AVISO_Mail_Functions.addMailToAviso_Hauptfenster(True) - - + Sub Button3_Click(sender As Object, e As RibbonControlEventArgs) Handles btnAvisoMail.Click, btnVollmachten.Click, btnGestellungsgarantien.Click, btnVertraege.Click + If LOGIN_OK Then AVISO_Mail_Functions.addMailToAviso_Hauptfenster(sender) End Sub Public Function testConnection() As Boolean @@ -101,7 +95,7 @@ End Class Public Class AVISO_Mail_Functions - Shared Sub addMailToAviso_Hauptfenster(Optional isFormular As Boolean = False) + Shared Sub addMailToAviso_Hauptfenster(sender As Object) Try Dim explorer As Outlook.Explorer = Globals.ThisAddIn.Application.ActiveExplorer Dim selection As Outlook.Selection = explorer.Selection @@ -115,9 +109,9 @@ Public Class AVISO_Mail_Functions Dim mailItem As Outlook.MailItem = selectedItem mailItem = DirectCast(mailItem, Outlook.MailItem) - addMailToAviso(mailItem, isFormular) + addMailToAviso(mailItem, sender) Else - MsgBox("Die markierte Email kann nicht verarbeitet werden!" & vbNewLine & "Bitte andere Mail verwenden.") + MsgBox("Die markierte Email kann nicht verarbeitet werden!" & vbNewLine & "Bitte andere Email verwenden.") End If End If @@ -136,7 +130,7 @@ Public Class AVISO_Mail_Functions Return att End Function - Shared Sub addMailToAviso(mailItem As Outlook.MailItem, Optional isFormular As Boolean = False) + Shared Sub addMailToAviso(mailItem As Outlook.MailItem, sender As Object) Try If mailItem IsNot Nothing Then ' Remove special characters from the file name and make sure it is not longer than 100 characters @@ -160,11 +154,8 @@ Public Class AVISO_Mail_Functions End If Dim Bezeichnung = strFileName Dim AvisoId = Nothing - If isFormular Then - AvisoId = getAvisoFormularId(Bezeichnung, pdf_mail, Art, ATTACHMENTS_LIST, kdNr) ')getAttachmentStringList(mailItem)) - Else - AvisoId = getAvisoId(Bezeichnung, pdf_mail, SendungsId, Art, ATTACHMENTS_LIST) ')getAttachmentStringList(mailItem)) - End If + + AvisoId = getAvisoId(Bezeichnung, pdf_mail, SendungsId, Art, ATTACHMENTS_LIST, kdNr, sender) ' If AvisoId < 0 Then Exit Sub @@ -176,10 +167,12 @@ Public Class AVISO_Mail_Functions saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art) saveAttachment(ATTACHMENTS_LIST, AvisoId, SendungsId, Art, BezAnhang) ElseIf pdf_mail = "PDF_DATENSERVER" Then - saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung,, kdNr) - saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, kdNr) + saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender,, kdNr) + saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr) + ElseIf pdf_mail = "ONLYPDF_DATENSERVER" Then + saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr) ElseIf pdf_mail = "ONLYMAIL_DATENSERVER" Then - saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung,, kdNr) + saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender, , kdNr) Else 'ONLYMAIL saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art) End If @@ -425,7 +418,7 @@ Public Class AVISO_Mail_Functions End Try End Sub - Shared Sub saveAttachmentOnDatenserver(ByRef ATTACHMENTS_LIST As List(Of String), AvisoId As Integer, BezeichnungAnh As String, Optional kdNr As Integer = -1) + Shared Sub saveAttachmentOnDatenserver(ByRef ATTACHMENTS_LIST As List(Of String), AvisoId As Integer, BezeichnungAnh As String, Optional sender As Object = Nothing, Optional kdNr As Integer = -1) Try If AvisoId > 0 Then If ATTACHMENTS_LIST.Count > 1 Then BezeichnungAnh = "" ' nur wenn 1 Anhang wird die Bezeichnung übernommen. @@ -434,16 +427,7 @@ Public Class AVISO_Mail_Functions Dim Bezeichnung = BezeichnungAnh If Bezeichnung = "" Then Bezeichnung = fi.Name - - Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", Bezeichnung, kdNr) - Dim path = DS.uploadDataToDATENSERVER(fi.FullName) - If path Then - Dim c As New cKundenVollmachten(AvisoId) - c.kdvm_datenarchivId = DS.da_id - c.SAVE() - End If - - + uploadAttachments(sender, AvisoId, fi.FullName, Bezeichnung, kdNr) Next End If @@ -647,7 +631,7 @@ Public Class AVISO_Mail_Functions End Try End Sub - Shared Sub saveMailOnDatenserver(mailItem As Outlook.MailItem, AvisoId As Integer, Optional bezeichnung As String = "", Optional saveAttachments As Boolean = True, Optional kdNr As Integer = -1) + Shared Sub saveMailOnDatenserver(mailItem As Outlook.MailItem, AvisoId As Integer, Optional bezeichnung As String = "", Optional sender As Object = Nothing, Optional saveAttachments As Boolean = True, Optional kdNr As Integer = -1) Try If AvisoId > 0 Then @@ -657,14 +641,8 @@ Public Class AVISO_Mail_Functions mailItem.SaveAs(strTmpPath, Outlook.OlSaveAsType.olMSG) - Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", bezeichnung, kdNr) - Dim path = DS.uploadDataToDATENSERVER(strTmpPath) - If path Then - Dim c As New cKundenVollmachten(AvisoId) - c.kdvm_emailId = DS.da_id - c.SAVE() - End If + uploadAttachments(sender, AvisoId, strTmpPath, bezeichnung, kdNr) ' Clean up the temporary .MSG file from the user's temporary folder System.IO.File.Delete(strTmpPath) @@ -679,45 +657,98 @@ Public Class AVISO_Mail_Functions End Sub - Shared Function getAvisoId(ByRef Bezeichnung, ByRef pdf_mail, ByRef SendungsId, ByRef Art, ByRef Att) As Integer + Shared Function getAvisoId(ByRef Bezeichnung, ByRef pdf_mail, ByRef SendungsId, ByRef Art, ByRef Att, ByRef kdNr, ByVal sender) As Integer - Dim frmAvisoAnfügen As New frmAvisoAnfuegen(Bezeichnung) - frmAvisoAnfügen.ATT = Att - If frmAvisoAnfügen.ShowDialog = DialogResult.OK Then - Dim AvisoId = frmAvisoAnfügen.AvisoId - SendungsId = frmAvisoAnfügen.SendungsId - Bezeichnung = frmAvisoAnfügen.Bezeichnung - pdf_mail = frmAvisoAnfügen.PDF_MAIL - Art = frmAvisoAnfügen.cboArt._value - Att = frmAvisoAnfügen.ATT + Select Case sender.name + Case "btnAvisoMail", "btnAvisoMail2" + Dim frmAvisoAnfügen As New frmAvisoAnfuegen(Bezeichnung) + frmAvisoAnfügen.ATT = Att + If frmAvisoAnfügen.ShowDialog = DialogResult.OK Then + Dim AvisoId = frmAvisoAnfügen.AvisoId + SendungsId = frmAvisoAnfügen.SendungsId + Bezeichnung = frmAvisoAnfügen.Bezeichnung + pdf_mail = frmAvisoAnfügen.PDF_MAIL + Art = frmAvisoAnfügen.cboArt._value + Att = frmAvisoAnfügen.ATT + + + Return AvisoId + End If + Return -1 + + Case Else + Dim frmAvisoFormularAnfuegen As New frmAvisoFormularAnfuegen(Bezeichnung, sender) + frmAvisoFormularAnfuegen.ATT = Att + If frmAvisoFormularAnfuegen.ShowDialog = DialogResult.OK Then + Dim AvisoId = frmAvisoFormularAnfuegen.AvisoId + kdNr = frmAvisoFormularAnfuegen.KdNr + Bezeichnung = frmAvisoFormularAnfuegen.Bezeichnung + pdf_mail = frmAvisoFormularAnfuegen.PDF_MAIL + Att = frmAvisoFormularAnfuegen.ATT + + Return AvisoId + + End If + + Return -1 + + End Select - Return AvisoId - End If - Return -1 End Function - Shared Function getAvisoFormularId(ByRef Bezeichnung, ByRef pdf_mail, ByRef Art, ByRef Att, ByRef kdNr) As Integer - - Dim frmAvisoFormularAnfuegen As New frmAvisoFormularAnfuegen(Bezeichnung) - frmAvisoFormularAnfuegen.ATT = Att - If frmAvisoFormularAnfuegen.ShowDialog = DialogResult.OK Then - Dim AvisoId = frmAvisoFormularAnfuegen.vollmachtId - kdNr = frmAvisoFormularAnfuegen.KdNr - Bezeichnung = frmAvisoFormularAnfuegen.Bezeichnung - pdf_mail = frmAvisoFormularAnfuegen.PDF_MAIL - Att = frmAvisoFormularAnfuegen.ATT - - Return AvisoId + Shared Sub uploadAttachments(sender As Object, AvisoId As Integer, strTmpPath As String, Optional bezeichnung As String = "", Optional kdNr As Integer = -1) + If sender Is Nothing Then + Exit Sub End If - Return -1 - End Function + Dim button = sender + + Select Case button.Name + + Case "btnVollmachten" + Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", bezeichnung, kdNr) + Dim path = DS.uploadDataToDATENSERVER(strTmpPath) + If path Then + Dim c As New cKundenVollmachten(AvisoId) + If bezeichnung.EndsWith(".pdf") Then + c.kdvm_datenarchivId = DS.da_id + Else + c.kdvm_emailId = DS.da_id + End If + + c.SAVE() + End If + + Case "btnVertraege" + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & AvisoId, kdNr) + Dim path = DS.uploadDataToDATENSERVER(strTmpPath) + If path Then + Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(AvisoId) + KV.kv_datenarchivId = DS.da_id + KV.SAVE() + End If + + + Case "btnGestellungsgarantien" + + Dim gg As New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(AvisoId) + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "GESTELLUNGS_GARANTIEN", "", "", "", "GG_" & gg.gg_Zollamt, kdNr) + Dim path = DS.uploadDataToDATENSERVER(strTmpPath) + If path Then + gg.gg_datenarchivId = DS.da_id + gg.SAVE() + End If + + End Select + + End Sub End Class