Bugfix Emailverarbeitung

VERAGAddIn.sln

@@ -9,17 +9,17 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAGAddIn", "VERAGAddIn\VE
 		{A3B497BD-842C-4A2B-B398-ED1976849DF1} = {A3B497BD-842C-4A2B-B398-ED1976849DF1}
 	EndProjectSection
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Aviso", "..\..\AVISO\Aviso\Aviso\Aviso.vbproj", "{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Aviso", "..\AVISO\Aviso\Aviso\Aviso.vbproj", "{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Gemeinsames", "..\..\AVISO\Aviso\Gemeinsames\Gemeinsames.vbproj", "{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Gemeinsames", "..\AVISO\Aviso\Gemeinsames\Gemeinsames.vbproj", "{110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Parkzeit", "..\..\Parkzeit\Parkzeit\Parkzeit\Parkzeit.vbproj", "{E4190547-B222-4AE3-A0BE-A44EAEE70335}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Parkzeit", "..\Parkzeit\Parkzeit\Parkzeit\Parkzeit.vbproj", "{E4190547-B222-4AE3-A0BE-A44EAEE70335}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SDL", "..\..\SDL\SDL\SDL\SDL.vbproj", "{289BCD77-BC00-4BA1-95ED-A79176D99525}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SDL", "..\SDL\SDL\SDL\SDL.vbproj", "{289BCD77-BC00-4BA1-95ED-A79176D99525}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj", "{5B947A66-009A-4BB6-B925-F84A01045095}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj", "{5B947A66-009A-4BB6-B925-F84A01045095}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

VERAGAddIn/VERAGAddIn.vbproj

@@ -36,7 +36,7 @@
     <PublishUrl>\\ftps.verag.ag\g\ftp\programme\VERAGAddin\</PublishUrl>
     <InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
     <TargetCulture>de</TargetCulture>
-    <ApplicationVersion>1.0.1.125</ApplicationVersion>
+    <ApplicationVersion>1.0.1.127</ApplicationVersion>
     <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateInterval>0</UpdateInterval>

VERAGAddIn/frmAvisoAnfügen.Designer.vb

@@ -22,7 +22,6 @@ Partial Class frmAvisoAnfuegen
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAvisoAnfuegen))
         Me.lbl = New System.Windows.Forms.Label()
         Me.Label14 = New System.Windows.Forms.Label()
@@ -40,17 +39,19 @@ Partial Class frmAvisoAnfuegen
         Me.btnVermerke = New System.Windows.Forms.Button()
         Me.bttnSaveMail = New System.Windows.Forms.Button()
         Me.btnSaveAttachments = New System.Windows.Forms.Button()
-        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
         Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.Pfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
         Me.cboArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtSrchDat = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.dgvSendungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvSendungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
         Me.txtBezeichnung = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtAbfertigungsnummer = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.txtLKWNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.dgvAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.CheckBox2 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox3 = New System.Windows.Forms.CheckBox()
         Me.usrcntrVermerke = New AVISO.rCntrlVermerke()
         CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvSendungen, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -451,6 +452,28 @@ Partial Class frmAvisoAnfuegen
         Me.dgvAviso.Size = New System.Drawing.Size(700, 245)
         Me.dgvAviso.TabIndex = 6
         '
+        'CheckBox2
+        '
+        Me.CheckBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.CheckBox2.AutoSize = True
+        Me.CheckBox2.Location = New System.Drawing.Point(15, 932)
+        Me.CheckBox2.Name = "CheckBox2"
+        Me.CheckBox2.Size = New System.Drawing.Size(41, 17)
+        Me.CheckBox2.TabIndex = 44
+        Me.CheckBox2.Text = "QS"
+        Me.CheckBox2.UseVisualStyleBackColor = True
+        '
+        'CheckBox3
+        '
+        Me.CheckBox3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.CheckBox3.AutoSize = True
+        Me.CheckBox3.Location = New System.Drawing.Point(74, 931)
+        Me.CheckBox3.Name = "CheckBox3"
+        Me.CheckBox3.Size = New System.Drawing.Size(41, 17)
+        Me.CheckBox3.TabIndex = 45
+        Me.CheckBox3.Text = "VG"
+        Me.CheckBox3.UseVisualStyleBackColor = True
+        '
         'usrcntrVermerke
         '
         Me.usrcntrVermerke.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
@@ -467,6 +490,8 @@ Partial Class frmAvisoAnfuegen
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
         Me.ClientSize = New System.Drawing.Size(727, 961)
+        Me.Controls.Add(Me.CheckBox3)
+        Me.Controls.Add(Me.CheckBox2)
         Me.Controls.Add(Me.usrcntrVermerke)
         Me.Controls.Add(Me.btnVermerke)
         Me.Controls.Add(Me.Label5)
@@ -534,4 +559,6 @@ Partial Class frmAvisoAnfuegen
     Friend WithEvents Label5 As Windows.Forms.Label
     Friend WithEvents btnVermerke As Windows.Forms.Button
     Friend WithEvents usrcntrVermerke As AVISO.rCntrlVermerke
+    Friend WithEvents CheckBox2 As Windows.Forms.CheckBox
+    Friend WithEvents CheckBox3 As Windows.Forms.CheckBox
 End Class

VERAGAddIn/frmAvisoAnfügen.vb

@@ -1,5 +1,7 @@
 Imports System.Diagnostics
 Imports System.Windows.Forms
+Imports AVISO
+Imports VERAG_PROG_ALLGEMEIN
 Imports VERAG_PROG_ALLGEMEIN.VERAG_OUT_EZA
 
 Public Class frmAvisoAnfuegen
@@ -282,17 +284,48 @@ Public Class frmAvisoAnfuegen
         If dgvSendungen.SelectedRows.Count > 0 Then
             btnVermerke.Enabled = True
             Me.SendungsId = dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value
+            Dim SENDUNG_TMP = New VERAG_PROG_ALLGEMEIN.cSendungen(SendungsId)
             Dim AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(dgvSendungen.SelectedRows(0).Cells("tblSnd_AvisoID").Value)
             If AVISO IsNot Nothing Then
                 usrcntrVermerke.init(AVISO, SendungsId)
+
+                If SENDUNG_TMP IsNot Nothing Then
+
+                    CheckBox3.Checked = IIf(SENDUNG_TMP.tblSnd_Vorgeschrieben = Nothing, False, True)
+                    CheckBox2.Checked = IIf(SENDUNG_TMP.tblSnd_Vorbereitet = Nothing, False, True)
+                    CheckBox3.Enabled = True
+                    CheckBox2.Enabled = True
+                End If
+
+            Else
+                btnVermerke.Enabled = False
+                CheckBox3.Enabled = False
+                CheckBox2.Enabled = False
+                usrcntrVermerke.init(Nothing, -1)
             End If
-        Else
-            btnVermerke.Enabled = False
-            usrcntrVermerke.init(Nothing, -1)
         End If
 
+
     End Sub
     Private Sub dgvSendungen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSendungen.SelectionChanged
         initVermerke()
     End Sub
+
+    Private Sub CheckBox3_Click(sender As Object, e As EventArgs) Handles CheckBox3.Click, CheckBox2.Click
+        If dgvSendungen.SelectedRows.Count > 0 Then
+            Me.SendungsId = dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value
+            Dim AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(dgvSendungen.SelectedRows(0).Cells("tblSnd_AvisoID").Value)
+            If AVISO IsNot Nothing Then
+                Dim FUNC As New AvisoStatusFunctions
+
+                Select Case sender.Name
+                    Case "CheckBox3" : FUNC.setSendungVorgeschrieben(SendungsId, AVISO.AvisoID) : initVermerke()
+                    Case "CheckBox2" : FUNC.setSendungVorbereitetQS(SendungsId, AVISO.AvisoID) : initVermerke()
+                End Select
+
+            End If
+        End If
+
+
+    End Sub
 End Class

VERAGAddIn/rbnMailItem.Designer.vb

@@ -41,6 +41,7 @@
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Me.Tab1 = Me.Factory.CreateRibbonTab
         Me.Group1 = Me.Factory.CreateRibbonGroup
         Me.Button1 = Me.Factory.CreateRibbonButton
@@ -51,7 +52,7 @@
         Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton
         Me.btnInfo = Me.Factory.CreateRibbonButton
         Me.btnUnsichtbar = Me.Factory.CreateRibbonButton
-        Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon()
+        Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components)
         Me.Tab1.SuspendLayout()
         Me.Group1.SuspendLayout()
         Me.SuspendLayout()

VERAGAddIn/rbnVERAG.vb

@@ -145,6 +145,7 @@ Public Class AVISO_Mail_Functions
                     strFileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(strFileName)
                     strFileName = strFileName.Replace("?", "")
                     strFileName = strFileName.Replace(".", "")
+                    strFileName = strFileName.Replace("<EFBFBD>", "")
                     strFileName &= ".msg"
                 End If
                 'Dim strFileName As String = "Mail.msg"