diff --git a/VERAGAddIn/My Project/Resources.Designer.vb b/VERAGAddIn/My Project/Resources.Designer.vb index 45f055f..362b1fa 100644 --- a/VERAGAddIn/My Project/Resources.Designer.vb +++ b/VERAGAddIn/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ @@ -110,6 +110,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property pdf_gray() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("pdf_gray", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/VERAGAddIn/My Project/Resources.resx b/VERAGAddIn/My Project/Resources.resx index 62b09cf..a944688 100644 --- a/VERAGAddIn/My Project/Resources.resx +++ b/VERAGAddIn/My Project/Resources.resx @@ -118,25 +118,28 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Aviso.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\665209_email_512x512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Aviso1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\665209_email_512x512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pdf_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/VERAGAddIn/Resources/pdf_gray.png b/VERAGAddIn/Resources/pdf_gray.png new file mode 100644 index 0000000..30b8686 Binary files /dev/null and b/VERAGAddIn/Resources/pdf_gray.png differ diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj index 892be78..b0b5c05 100644 --- a/VERAGAddIn/VERAGAddIn.vbproj +++ b/VERAGAddIn/VERAGAddIn.vbproj @@ -330,6 +330,7 @@ + diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb index 405f5e4..2c647bd 100644 --- a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb +++ b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb @@ -30,25 +30,24 @@ Partial Class frmAvisoFormularAnfuegen Me.btnCancel = New System.Windows.Forms.Button() Me.cbVMTypen = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) - Me.pbMail = New System.Windows.Forms.PictureBox() - Me.pbAnhaenge = New System.Windows.Forms.PictureBox() Me.MyPanel2 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) Me.lblVMId = New System.Windows.Forms.Label() Me.UsrCntlKundenZollVollmachten1 = New SDL.usrCntlKundenZollVollmachten() Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.pbAnhaenge = New System.Windows.Forms.PictureBox() Me.MyPanel1.SuspendLayout() - CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() Me.MyPanel2.SuspendLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' '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.Location = New System.Drawing.Point(12, 15) + 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.Name = "lblKunden" Me.lblKunden.Size = New System.Drawing.Size(44, 13) Me.lblKunden.TabIndex = 2 @@ -80,6 +79,7 @@ Partial Class frmAvisoFormularAnfuegen Me.KdSearchBox._ValueKdAndName = True Me.KdSearchBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.KdSearchBox.dgvpos = "LEFT" + Me.KdSearchBox.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.KdSearchBox.HideSelection = False Me.KdSearchBox.KdName = "" Me.KdSearchBox.KdNr = "-1" @@ -89,7 +89,7 @@ Partial Class frmAvisoFormularAnfuegen Me.KdSearchBox.Name = "KdSearchBox" Me.KdSearchBox.nurAktive = True Me.KdSearchBox.searchActive = True - Me.KdSearchBox.Size = New System.Drawing.Size(495, 20) + Me.KdSearchBox.Size = New System.Drawing.Size(495, 23) Me.KdSearchBox.TabIndex = 4 Me.KdSearchBox.TIMER_SEARCH = True Me.KdSearchBox.usrcntl = Nothing @@ -111,15 +111,15 @@ Partial Class frmAvisoFormularAnfuegen 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, 21) + Me.cbVMTypen.Size = New System.Drawing.Size(492, 24) Me.cbVMTypen.TabIndex = 35 ' 'MyPanel1 ' - Me.MyPanel1.Controls.Add(Me.pbMail) Me.MyPanel1.Controls.Add(Me.pbAnhaenge) Me.MyPanel1.Controls.Add(Me.btnOK) Me.MyPanel1.Controls.Add(Me.btnCancel) @@ -129,29 +129,6 @@ Partial Class frmAvisoFormularAnfuegen Me.MyPanel1.Size = New System.Drawing.Size(521, 108) Me.MyPanel1.TabIndex = 36 ' - 'pbMail - ' - Me.pbMail.Enabled = False - Me.pbMail.Image = Global.VERAGAddIn.My.Resources.Resources.email_big1 - Me.pbMail.Location = New System.Drawing.Point(12, 11) - Me.pbMail.Name = "pbMail" - Me.pbMail.Size = New System.Drawing.Size(55, 50) - Me.pbMail.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.pbMail.TabIndex = 33 - Me.pbMail.TabStop = False - ' - 'pbAnhaenge - ' - Me.pbAnhaenge.Enabled = False - Me.pbAnhaenge.Image = Global.VERAGAddIn.My.Resources.Resources.pdf - Me.pbAnhaenge.Location = New System.Drawing.Point(73, 12) - Me.pbAnhaenge.Name = "pbAnhaenge" - Me.pbAnhaenge.Size = New System.Drawing.Size(65, 50) - Me.pbAnhaenge.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.pbAnhaenge.TabIndex = 32 - Me.pbAnhaenge.TabStop = False - Me.pbAnhaenge.Visible = False - ' 'MyPanel2 ' Me.MyPanel2.Controls.Add(Me.lblVMId) @@ -168,7 +145,8 @@ Partial Class frmAvisoFormularAnfuegen ' 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.Location = New System.Drawing.Point(9, 64) + 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 @@ -210,6 +188,17 @@ Partial Class frmAvisoFormularAnfuegen Me.columnName.Name = "columnName" Me.columnName.ReadOnly = True ' + 'pbAnhaenge + ' + 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.Name = "pbAnhaenge" + Me.pbAnhaenge.Size = New System.Drawing.Size(65, 50) + Me.pbAnhaenge.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.pbAnhaenge.TabIndex = 32 + Me.pbAnhaenge.TabStop = False + ' 'frmAvisoFormularAnfuegen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -225,11 +214,10 @@ Partial Class frmAvisoFormularAnfuegen Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Formular anfügen" Me.MyPanel1.ResumeLayout(False) - CType(Me.pbMail, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).EndInit() Me.MyPanel2.ResumeLayout(False) Me.MyPanel2.PerformLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -239,7 +227,6 @@ Partial Class frmAvisoFormularAnfuegen 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 pbMail As Windows.Forms.PictureBox Friend WithEvents pbAnhaenge As Windows.Forms.PictureBox Friend WithEvents MyPanel2 As VERAG_PROG_ALLGEMEIN.MyPanel Friend WithEvents lblVMId As Windows.Forms.Label diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.vb b/VERAGAddIn/frmAvisoFormularAnfügen.vb index 8fec83a..61e4fb9 100644 --- a/VERAGAddIn/frmAvisoFormularAnfügen.vb +++ b/VERAGAddIn/frmAvisoFormularAnfügen.vb @@ -12,7 +12,6 @@ Public Class frmAvisoFormularAnfuegen Public vollmachtId As Integer = -1 Dim vollmachtartId As Integer = -1 Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim KUNDE As VERAG_PROG_ALLGEMEIN.cKunde = Nothing Public SendungsId = -1 Public Bezeichnung = "" Public PDF_MAIL = "" @@ -38,9 +37,7 @@ Public Class frmAvisoFormularAnfuegen KdSearchBox.initKdBox(Me) initAttachment() - If hasAnhaenge Then - pbAnhaenge.Visible = True - End If + If hasAnhaenge Then pbAnhaenge.Image = My.Resources.pdf End Sub @@ -97,8 +94,11 @@ Public Class frmAvisoFormularAnfuegen If Not hasAnhaenge Then - If Not vbYes = MsgBox("Die Email besitzt keinen Anhang! Soll die Email denoch gespeichert werden?", vbYesNoCancel) Then Exit Sub - + If Not vbYes = MsgBox("Diese Email besitzt keinen Anhang!" & vbCrLf & "Soll die Email denoch gespeichert werden?", vbYesNoCancel) Then + Close() + DialogResult = DialogResult.None + Exit Sub + End If End If UsrCntlKundenZollVollmachten1.btnNeu_Click(sender, e) vollmachtId = UsrCntlKundenZollVollmachten1.vmId @@ -131,5 +131,7 @@ Public Class frmAvisoFormularAnfuegen dgvAnhaenge.ClearSelection() End Sub + Private Sub pbMail_Click(sender As Object, e As EventArgs) + End Sub End Class \ No newline at end of file diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index 8145c2c..c9a71aa 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -8,6 +8,7 @@ Imports VERAGAddIn.ThisAddIn Imports System.Runtime.InteropServices Imports System.Text.RegularExpressions Imports System.IO +Imports SDL Public Class VERAGRibbon Dim LOGIN_OK = False @@ -124,6 +125,7 @@ Public Class AVISO_Mail_Functions Dim pdf_mail = "" Dim SendungsId = -1 Dim Art = "" + Dim kdNr = -1 Dim ATTACHMENTS_LIST As New List(Of String) loadAttachment(mailItem, ATTACHMENTS_LIST) @@ -133,7 +135,7 @@ Public Class AVISO_Mail_Functions End If End If Dim Bezeichnung = strFileName - Dim AvisoId = getAvisoId(Bezeichnung, pdf_mail, SendungsId, Art, ATTACHMENTS_LIST, isFormular) ')getAttachmentStringList(mailItem)) + Dim AvisoId = getAvisoId(Bezeichnung, pdf_mail, SendungsId, Art, ATTACHMENTS_LIST, kdNr, isFormular) ')getAttachmentStringList(mailItem)) If AvisoId < 0 Then Exit Sub Dim BezAnhang = If(Bezeichnung <> strFileName, Bezeichnung, "") 'Wenn die Bezeichnung geändert wurde --> und wenn nur 1 Anhang, dann wird die Bezeichnung für den Anhang verwendet. @@ -144,10 +146,10 @@ 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,, Art) - saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, Art, BezAnhang) + saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung,, Art, kdNr, True) + saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, Art, BezAnhang, kdNr, True) ElseIf pdf_mail = "ONLYMAIL_DATENSERVER" Then - saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung,, Art) + saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung,, Art, kdNr) Else 'ONLYMAIL saveMail(mailItem, AvisoId, Bezeichnung,, SendungsId, Art) End If @@ -393,7 +395,7 @@ Public Class AVISO_Mail_Functions End Try End Sub - Shared Sub saveAttachmentOnDatenserver(ByRef ATTACHMENTS_LIST As List(Of String), AvisoId As Integer, Art As String, BezeichnungAnh As String) + Shared Sub saveAttachmentOnDatenserver(ByRef ATTACHMENTS_LIST As List(Of String), AvisoId As Integer, Art As String, BezeichnungAnh As String, Optional kdNr As Integer = -1, Optional multifiles As Boolean = False) Try If AvisoId > 0 Then If ATTACHMENTS_LIST.Count > 1 Then BezeichnungAnh = "" ' nur wenn 1 Anhang wird die Bezeichnung übernommen. @@ -402,8 +404,20 @@ Public Class AVISO_Mail_Functions Dim Bezeichnung = BezeichnungAnh If Bezeichnung = "" Then Bezeichnung = fi.Name - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", Bezeichnung) + Dim DS As Object = Nothing + If multifiles Then + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", Bezeichnung, kdNr, multifiles) + Else + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", Bezeichnung) + End If 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 + + Next End If @@ -606,7 +620,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 Art As String = "") + Shared Sub saveMailOnDatenserver(mailItem As Outlook.MailItem, AvisoId As Integer, Optional bezeichnung As String = "", Optional saveAttachments As Boolean = True, Optional Art As String = "", Optional kdNr As Integer = -1, Optional multifiles As Boolean = False) Try If AvisoId > 0 Then @@ -616,11 +630,18 @@ Public Class AVISO_Mail_Functions mailItem.SaveAs(strTmpPath, Outlook.OlSaveAsType.olMSG) - - 'If AVISO.frmSendungAnhangImport.saveToDS(AvisoId, bezeichnung, strTmpPath, Art, "MSG",,,, If(SendungsId, SendungsId, Nothing)) Then - ' End If - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", bezeichnung) + Dim DS As Object = Nothing + If multifiles Then + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", bezeichnung, kdNr, multifiles) + Else + DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", bezeichnung) + End If Dim path = DS.uploadDataToDATENSERVER(strTmpPath) + If path Then + Dim c As New cKundenVollmachten(AvisoId) + c.kdvm_datenarchivId = DS.da_id + c.SAVE() + End If ' Clean up the temporary .MSG file from the user's temporary folder @@ -636,18 +657,20 @@ Public Class AVISO_Mail_Functions End Sub - Shared Function getAvisoId(ByRef Bezeichnung, ByRef pdf_mail, ByRef SendungsId, ByRef Art, ByRef Att, ByVal isFormular) As Integer + Shared Function getAvisoId(ByRef Bezeichnung, ByRef pdf_mail, ByRef SendungsId, ByRef Art, ByRef Att, ByVal isFormular, ByRef kdNr) As Integer If (isFormular = True) Then Dim frmAvisoFormularAnfuegen As New frmAvisoFormularAnfuegen(Bezeichnung) frmAvisoFormularAnfuegen.ATT = Att If frmAvisoFormularAnfuegen.ShowDialog = DialogResult.OK Then Dim AvisoId = frmAvisoFormularAnfuegen.vollmachtId + kdNr = frmAvisoFormularAnfuegen.KdNr SendungsId = frmAvisoFormularAnfuegen.SendungsId Bezeichnung = frmAvisoFormularAnfuegen.Bezeichnung pdf_mail = frmAvisoFormularAnfuegen.PDF_MAIL Att = frmAvisoFormularAnfuegen.ATT + Return AvisoId End If