diff --git a/VERAGAddIn.sln b/VERAGAddIn.sln index 45d224a..390d788 100644 --- a/VERAGAddIn.sln +++ b/VERAGAddIn.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30406.217 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32825.248 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAGAddIn", "VERAGAddIn\VERAGAddIn.vbproj", "{D579F7A6-7D29-4295-B382-DA5F7EFB4528}" EndProject @@ -11,13 +11,21 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Gemeinsames", "..\AVISO\Avi EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Aviso", "..\AVISO\Aviso\Aviso\Aviso.vbproj", "{7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}" EndProject +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}") = "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}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|Mixed Platforms = Release|Mixed Platforms + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution @@ -25,42 +33,106 @@ Global {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|Any CPU.Build.0 = Debug|Any CPU {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|x64.ActiveCfg = Debug|Any CPU + {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|x64.Build.0 = Debug|Any CPU {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Debug|x86.ActiveCfg = Debug|Any CPU {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|Any CPU.ActiveCfg = Release|Any CPU {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|Any CPU.Build.0 = Release|Any CPU {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|x64.ActiveCfg = Release|Any CPU + {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|x64.Build.0 = Release|Any CPU {D579F7A6-7D29-4295-B382-DA5F7EFB4528}.Release|x86.ActiveCfg = Release|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64 + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64 {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.ActiveCfg = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.Build.0 = Release|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|x64 + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.Build.0 = Release|x64 {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x86.ActiveCfg = Release|Any CPU {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.ActiveCfg = Debug|x64 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.Build.0 = Debug|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.ActiveCfg = Debug|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.Build.0 = Debug|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Any CPU.ActiveCfg = Release|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.ActiveCfg = Release|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|Mixed Platforms.Build.0 = Release|x86 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x64.ActiveCfg = Release|x64 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x64.Build.0 = Release|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.ActiveCfg = Release|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.Build.0 = Release|x86 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|x86 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x64.ActiveCfg = Debug|x64 + {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x64.Build.0 = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x86.ActiveCfg = Debug|x86 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x86.Build.0 = Debug|x86 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|Any CPU.ActiveCfg = Release|x86 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|Mixed Platforms.ActiveCfg = Release|x86 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|Mixed Platforms.Build.0 = Release|x86 + {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x64.ActiveCfg = Release|x64 + {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x64.Build.0 = Release|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.ActiveCfg = Release|x86 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Release|x86.Build.0 = Release|x86 + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x64.ActiveCfg = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x64.Build.0 = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.ActiveCfg = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x86.Build.0 = Debug|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Any CPU.Build.0 = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|x64.ActiveCfg = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|x64.Build.0 = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.ActiveCfg = Release|Any CPU + {5B947A66-009A-4BB6-B925-F84A01045095}.Release|x86.Build.0 = Release|Any CPU + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Any CPU.ActiveCfg = Debug|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Any CPU.Build.0 = Debug|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x64.ActiveCfg = Debug|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x64.Build.0 = Debug|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x86.ActiveCfg = Debug|x86 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Debug|x86.Build.0 = Debug|x86 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|Any CPU.ActiveCfg = Release|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|Any CPU.Build.0 = Release|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|Mixed Platforms.Build.0 = Release|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|x64.ActiveCfg = Release|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|x64.Build.0 = Release|x64 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|x86.ActiveCfg = Release|x86 + {E4190547-B222-4AE3-A0BE-A44EAEE70335}.Release|x86.Build.0 = Release|x86 + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|Any CPU.Build.0 = Debug|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|x64.ActiveCfg = Debug|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|x64.Build.0 = Debug|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|x86.ActiveCfg = Debug|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Debug|x86.Build.0 = Debug|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|Any CPU.ActiveCfg = Release|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|Any CPU.Build.0 = Release|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x64.ActiveCfg = Release|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x64.Build.0 = Release|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x86.ActiveCfg = Release|Any CPU + {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj index 4777910..892be78 100644 --- a/VERAGAddIn/VERAGAddIn.vbproj +++ b/VERAGAddIn/VERAGAddIn.vbproj @@ -161,6 +161,10 @@ ..\..\..\Aviso\AVISO\Aviso\bin\Debug\AVISO.exe + + False + ..\..\..\ADMIN\ADMIN\DAKOSY_Worker\bin\Debug\DAKOSY_Worker.dll + ..\..\..\Aviso\AVISO\Gemeinsames\bin\x64\Debug\Gemeinsames.dll @@ -341,6 +345,10 @@ + + {289bcd77-bc00-4ba1-95ed-a79176d99525} + SDL + {a3b497bd-842c-4a2b-b398-ed1976849df1} VERAG_PROG_ALLGEMEIN diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb index 211c0cb..85d0969 100644 --- a/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb +++ b/VERAGAddIn/frmAvisoFormularAnfügen.Designer.vb @@ -28,20 +28,24 @@ Partial Class frmAvisoFormularAnfuegen Me.btnOK = New System.Windows.Forms.Button() Me.KdSearchBox = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.btnCancel = New System.Windows.Forms.Button() - Me.dgvKundenvollmachten = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.btnSaveMail = New System.Windows.Forms.Button() - Me.btnSaveAttachments = New System.Windows.Forms.Button() Me.cbVMTypen = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtBezeichnung = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label2 = New System.Windows.Forms.Label() - CType(Me.dgvKundenvollmachten, System.ComponentModel.ISupportInitialize).BeginInit() + 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.MyPanel1.SuspendLayout() + CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.pbAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() + Me.MyPanel2.SuspendLayout() 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(5, 33) + Me.lblKunden.Location = New System.Drawing.Point(3, 9) Me.lblKunden.Name = "lblKunden" Me.lblKunden.Size = New System.Drawing.Size(44, 13) Me.lblKunden.TabIndex = 2 @@ -51,8 +55,7 @@ Partial Class frmAvisoFormularAnfuegen ' 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.Enabled = False - Me.btnOK.Location = New System.Drawing.Point(317, 387) + Me.btnOK.Location = New System.Drawing.Point(402, 65) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(105, 40) Me.btnOK.TabIndex = 3 @@ -79,11 +82,11 @@ Partial Class frmAvisoFormularAnfuegen Me.KdSearchBox.KdNr = "-1" Me.KdSearchBox.kdNrField = Nothing Me.KdSearchBox.KdNrNullInt = Nothing - Me.KdSearchBox.Location = New System.Drawing.Point(8, 64) + Me.KdSearchBox.Location = New System.Drawing.Point(6, 31) Me.KdSearchBox.Name = "KdSearchBox" Me.KdSearchBox.nurAktive = True Me.KdSearchBox.searchActive = True - Me.KdSearchBox.Size = New System.Drawing.Size(412, 20) + Me.KdSearchBox.Size = New System.Drawing.Size(501, 20) Me.KdSearchBox.TabIndex = 4 Me.KdSearchBox.TIMER_SEARCH = True Me.KdSearchBox.usrcntl = Nothing @@ -92,62 +95,13 @@ 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(8, 387) + Me.btnCancel.Location = New System.Drawing.Point(3, 67) 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 ' - 'dgvKundenvollmachten - ' - Me.dgvKundenvollmachten.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvKundenvollmachten.AllowUserToAddRows = False - Me.dgvKundenvollmachten.AllowUserToDeleteRows = False - Me.dgvKundenvollmachten.AllowUserToResizeColumns = False - Me.dgvKundenvollmachten.AllowUserToResizeRows = False - Me.dgvKundenvollmachten.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.dgvKundenvollmachten.BackgroundColor = System.Drawing.Color.White - Me.dgvKundenvollmachten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvKundenvollmachten.Location = New System.Drawing.Point(12, 116) - Me.dgvKundenvollmachten.MultiSelect = False - Me.dgvKundenvollmachten.Name = "dgvKundenvollmachten" - Me.dgvKundenvollmachten.ReadOnly = True - Me.dgvKundenvollmachten.RowHeadersVisible = False - Me.dgvKundenvollmachten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvKundenvollmachten.Size = New System.Drawing.Size(410, 116) - Me.dgvKundenvollmachten.TabIndex = 32 - ' - 'btnSaveMail - ' - Me.btnSaveMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btnSaveMail.Enabled = False - Me.btnSaveMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSaveMail.Image = Global.VERAGAddIn.My.Resources.Resources.email_big1 - Me.btnSaveMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSaveMail.Location = New System.Drawing.Point(228, 313) - Me.btnSaveMail.Name = "btnSaveMail" - Me.btnSaveMail.Size = New System.Drawing.Size(197, 53) - Me.btnSaveMail.TabIndex = 34 - Me.btnSaveMail.Text = "E-Mail speichern" & Global.Microsoft.VisualBasic.ChrW(13) - Me.btnSaveMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnSaveMail.UseVisualStyleBackColor = True - ' - 'btnSaveAttachments - ' - Me.btnSaveAttachments.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btnSaveAttachments.Enabled = False - Me.btnSaveAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSaveAttachments.Image = Global.VERAGAddIn.My.Resources.Resources.pdf - Me.btnSaveAttachments.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSaveAttachments.Location = New System.Drawing.Point(10, 308) - Me.btnSaveAttachments.Name = "btnSaveAttachments" - Me.btnSaveAttachments.Size = New System.Drawing.Size(197, 58) - Me.btnSaveAttachments.TabIndex = 33 - Me.btnSaveAttachments.Text = "Nur Anhänge speichern" - Me.btnSaveAttachments.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnSaveAttachments.UseVisualStyleBackColor = True - ' 'cbVMTypen ' Me.cbVMTypen._allowedValuesFreiText = Nothing @@ -155,79 +109,104 @@ Partial Class frmAvisoFormularAnfuegen Me.cbVMTypen._value = "" Me.cbVMTypen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.cbVMTypen.FormattingEnabled = True - Me.cbVMTypen.Location = New System.Drawing.Point(8, 89) + Me.cbVMTypen.Location = New System.Drawing.Point(3, 80) Me.cbVMTypen.Name = "cbVMTypen" - Me.cbVMTypen.Size = New System.Drawing.Size(406, 21) + Me.cbVMTypen.Size = New System.Drawing.Size(501, 21) Me.cbVMTypen.TabIndex = 35 ' - 'txtBezeichnung + 'MyPanel1 ' - Me.txtBezeichnung._DateTimeOnly = False - Me.txtBezeichnung._numbersOnly = False - Me.txtBezeichnung._numbersOnlyKommastellen = "" - Me.txtBezeichnung._numbersOnlyTrennzeichen = True - Me.txtBezeichnung._Prozent = False - Me.txtBezeichnung._ShortDateNew = False - Me.txtBezeichnung._ShortDateOnly = False - Me.txtBezeichnung._TimeOnly = False - Me.txtBezeichnung._TimeOnly_Seconds = False - Me.txtBezeichnung._value = "" - Me.txtBezeichnung._Waehrung = False - Me.txtBezeichnung._WaehrungZeichen = True - Me.txtBezeichnung.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.txtBezeichnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtBezeichnung.ForeColor = System.Drawing.Color.Black - Me.txtBezeichnung.Location = New System.Drawing.Point(128, 279) - Me.txtBezeichnung.MaxLineLength = -1 - Me.txtBezeichnung.MaxLines_Warning = "" - Me.txtBezeichnung.MaxLines_Warning_Label = Nothing - Me.txtBezeichnung.Name = "txtBezeichnung" - Me.txtBezeichnung.Size = New System.Drawing.Size(297, 23) - Me.txtBezeichnung.TabIndex = 37 + Me.MyPanel1.Controls.Add(Me.pbMail) + 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, 513) + Me.MyPanel1.Name = "MyPanel1" + Me.MyPanel1.Size = New System.Drawing.Size(514, 108) + Me.MyPanel1.TabIndex = 36 ' - 'Label2 + 'pbMail ' - Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(7, 284) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(112, 13) - Me.Label2.TabIndex = 36 - Me.Label2.Text = "Anhang-Bezeichnung:" + Me.pbMail.Enabled = False + Me.pbMail.Image = Global.VERAGAddIn.My.Resources.Resources.email_big1 + Me.pbMail.Location = New System.Drawing.Point(98, 12) + 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(12, 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 + ' + 'MyPanel2 + ' + 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(514, 114) + Me.MyPanel2.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.Location = New System.Drawing.Point(3, 63) + Me.lblVMId.Name = "lblVMId" + Me.lblVMId.Size = New System.Drawing.Size(69, 13) + Me.lblVMId.TabIndex = 36 + Me.lblVMId.Text = "Vollmacht-Art" + ' + 'UsrCntlKundenZollVollmachten1 + ' + Me.UsrCntlKundenZollVollmachten1.Location = New System.Drawing.Point(0, 120) + Me.UsrCntlKundenZollVollmachten1.Name = "UsrCntlKundenZollVollmachten1" + Me.UsrCntlKundenZollVollmachten1.Size = New System.Drawing.Size(514, 387) + Me.UsrCntlKundenZollVollmachten1.TabIndex = 38 ' '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(465, 444) - Me.Controls.Add(Me.cbVMTypen) - Me.Controls.Add(Me.txtBezeichnung) - Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.btnSaveMail) - Me.Controls.Add(Me.btnSaveAttachments) - Me.Controls.Add(Me.dgvKundenvollmachten) - Me.Controls.Add(Me.btnCancel) - Me.Controls.Add(Me.KdSearchBox) - Me.Controls.Add(Me.btnOK) - Me.Controls.Add(Me.lblKunden) + Me.ClientSize = New System.Drawing.Size(514, 621) + Me.Controls.Add(Me.UsrCntlKundenZollVollmachten1) + Me.Controls.Add(Me.MyPanel2) + Me.Controls.Add(Me.MyPanel1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmAvisoFormularAnfuegen" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Formular anfügen" - CType(Me.dgvKundenvollmachten, System.ComponentModel.ISupportInitialize).EndInit() + 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() 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 dgvKundenvollmachten As VERAG_PROG_ALLGEMEIN.MyDatagridview - Friend WithEvents btnSaveMail As Windows.Forms.Button - Friend WithEvents btnSaveAttachments As Windows.Forms.Button Friend WithEvents cbVMTypen As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents txtBezeichnung As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label2 As Windows.Forms.Label + 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 + Friend WithEvents UsrCntlKundenZollVollmachten1 As SDL.usrCntlKundenZollVollmachten End Class diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.vb b/VERAGAddIn/frmAvisoFormularAnfügen.vb index 576946f..9164618 100644 --- a/VERAGAddIn/frmAvisoFormularAnfügen.vb +++ b/VERAGAddIn/frmAvisoFormularAnfügen.vb @@ -11,13 +11,20 @@ Public Class frmAvisoFormularAnfuegen Public KdNr As Integer = -1 Dim vollmachtartId As Integer = -1 Dim vollmachtId As Integer = -1 - Dim SQL As New SQL + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim KUNDE As VERAG_PROG_ALLGEMEIN.cKunde = Nothing Public SendungsId = -1 Public Bezeichnung = "" - Public PDF_MAIL = "" + Public PDF_MAIL As Boolean = False + Public ATT As List(Of String) + Sub New() + + InitializeComponent() + + End Sub + Sub New(Bezeichnung) InitializeComponent() @@ -30,6 +37,14 @@ Public Class frmAvisoFormularAnfuegen KdSearchBox.initKdBox(Me) + If PDF_MAIL Then + pbAnhaenge.Visible = True + Else + pbAnhaenge.Visible = False + End If + + + End Sub @@ -44,98 +59,21 @@ Public Class frmAvisoFormularAnfuegen End Sub - - Private Sub btnSaveAttachments_Click(sender As Object, e As EventArgs) Handles btnSaveAttachments.Click - MsgBox("Save Attachement " & KdNr) - - - If dgvKundenvollmachten.SelectedRows.Count <> 1 Then Exit Sub - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & vollmachtartId, "", "", Bezeichnung, KdNr) - - 'Dim path = DS.uploadDataToDATENSERVERFileDialog() 'Überarbeitung, damit das ausgewählte EMail angefügt wird. - 'Dim path = DS.uploadDataToDATENSERVER("") - If txtBezeichnung.Text.Trim = "" Then - Me.DialogResult = Windows.Forms.DialogResult.None : Exit Sub - End If - - If sender Is btnSaveAttachments Then PDF_MAIL = "PDF" - If sender Is btnSaveMail Then PDF_MAIL = "PDFMAIL" - Bezeichnung = txtBezeichnung.Text - Me.DialogResult = Windows.Forms.DialogResult.OK - - End Sub - - Private Sub btnSaveMail_Click(sender As Object, e As EventArgs) Handles btnSaveMail.Click - MsgBox("Save EMail " & KdNr) - End Sub - Sub init() If KdNr > 0 Then - initVollmachtarten(KdNr) - End If End Sub Sub initVollmachtarten(kdNr As Integer) - - cbVMTypen.fillWithSQL("SELECT DISTINCT(art.kdvma_Id), art.kdvma_Bezeichnung FROM [tblKundenVollmachtenArt] as art LEFT JOIN (select * from [tblKundenVollmachten] where [kdvm_KundenNr]='" & kdNr & "' ) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId] WHERE art.kdvma_visible=1 AND abf.kdvm_erhalten = 1 AND ISNULL(abf.[kdvm_geloescht],0) != 1 AND art.kdvma_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "FMZOLL", False) - + cbVMTypen.fillWithSQL("SELECT DISTINCT(art.kdvma_Id), art.kdvma_Bezeichnung FROM [tblKundenVollmachtenArt] as art LEFT JOIN (select * from [tblKundenVollmachten] where [kdvm_KundenNr]='" & kdNr & "' ) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId] WHERE art.kdvma_visible=1 AND art.kdvma_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "FMZOLL", False) End Sub - Sub initDGVKundenvollmachten(vollmachtartId) + Sub initUsrCntrlKundenvollmachten(vollmachtartId) + UsrCntlKundenZollVollmachten1.init(KdNr, vollmachtartId) - With dgvKundenvollmachten - .Columns.Clear() - Dim where = " And art.kdvma_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' " - - If VERAG_PROG_ALLGEMEIN.cAllgemein.isCLUSTER Then - where = " AND art.kdvma_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr) & "' " - End If - - .DataSource = SQL.loadDgvBySql("SELECT abf.kdvm_Id,art.kdvma_Id, art.kdvma_Bezeichnung, abf.[kdvm_KundenNr], abf.[kdvm_erhalten],abf.[kdvm_erhalten_Datum], abf.kdvm_datenarchivId,abf.kdvm_Info, abf.[kdvm_archiviert], abf.[kdvm_gueltig_bis], abf.[kdvm_vermerk], abf.[kdvm_geloescht]" & - " FROM [tblKundenVollmachtenArt] as art " & - " INNER JOIN (select * from [tblKundenVollmachten]) as abf on art.[kdvma_Id]=abf.[kdvm_kdvmaId]" & - " WHERE art.kdvma_visible=1 AND abf.kdvm_erhalten = 1 AND ISNULL(abf.[kdvm_geloescht],0) != 1 AND [kdvm_KundenNr]='" & KdNr & "' AND [kdvm_kdvmaId]='" & vollmachtartId & "'" & where & - " ORDER BY kdvm_archiviert asc, abf.kdvm_gueltig_bis asc, abf.kdvm_erhalten_Datum desc ", "FMZOLL") - - - ' .RowTemplate.Height = 30 - .Columns("kdvm_Id").Visible = False - .Columns("kdvma_Id").Visible = False - .Columns("kdvm_KundenNr").Visible = False - .Columns("kdvm_datenarchivId").Visible = False - .Columns("kdvma_Bezeichnung").Visible = False - .Columns("kdvma_Bezeichnung").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns("kdvma_Bezeichnung").HeaderText = "Bezeichnung" - .Columns("kdvm_erhalten").Width = 50 - .Columns("kdvm_erhalten").HeaderText = "Erhalten" - .Columns("kdvm_erhalten").Visible = False - .Columns("kdvm_erhalten").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - .Columns("kdvm_erhalten_Datum").Width = 100 - .Columns("kdvm_erhalten_Datum").HeaderText = "Gültig von" - .Columns("kdvm_erhalten_Datum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - .Columns("kdvm_Info").Width = 200 - .Columns("kdvm_Info").HeaderText = "Info" - .Columns("kdvm_Info").Visible = False - .Columns("kdvm_gueltig_bis").Visible = True - .Columns("kdvm_gueltig_bis").Width = 100 - .Columns("kdvm_gueltig_bis").HeaderText = "Gültig bis" - .Columns("kdvm_gueltig_bis").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - .Columns("kdvm_archiviert").Visible = True - .Columns("kdvm_archiviert").Width = 60 - .Columns("kdvm_archiviert").HeaderText = "Archiviert" - .Columns("kdvm_archiviert").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter - .Columns("kdvm_vermerk").MinimumWidth = 100 - .Columns("kdvm_vermerk").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns("kdvm_vermerk").HeaderText = "Vermerk" - .Columns("kdvm_vermerk").Visible = True - .Columns("kdvm_geloescht").Visible = False - - - End With End Sub @@ -152,24 +90,27 @@ Public Class frmAvisoFormularAnfuegen Private Sub cbVMTypen_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbVMTypen.SelectedIndexChanged vollmachtartId = cbVMTypen._value - - initDGVKundenvollmachten(vollmachtartId) + initUsrCntrlKundenvollmachten(vollmachtartId) End Sub - Private Sub dgvKundenvollmachten_RowValidated(sender As Object, e As DataGridViewCellEventArgs) Handles dgvKundenvollmachten.RowValidated - End Sub + Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click - Private Sub dgvKundenvollmachten_SelectionChanged(sender As Object, e As EventArgs) Handles dgvKundenvollmachten.SelectionChanged - If KdNr > 0 And vollmachtartId > 0 AndAlso dgvKundenvollmachten.SelectedRows.Count > 0 Then - btnSaveAttachments.Enabled = True - btnSaveMail.Enabled = True - btnOK.Enabled = True + If Not PDF_MAIL Then + 'Sicherheitsabfrage: Mail besitzt keinen Anhang, soll VM gespeichert werden? End If + + + UsrCntlKundenZollVollmachten1.btnNeu_Click(sender, e) + + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & UsrCntlKundenZollVollmachten1.vollmachtartId, "", "", Bezeichnung, KdNr) + Dim path = DS.uploadDataToDATENSERVER("") + + Close() End Sub - Private Sub dgvKundenvollmachten_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvKundenvollmachten.CellContentClick - dgvKundenvollmachten_SelectionChanged(sender, e) + Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click + Close() End Sub End Class \ No newline at end of file diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index 41b43f9..efd5cba 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -76,7 +76,7 @@ Public Class VERAGRibbon End Sub Private Sub btnVM_Click(sender As Object, e As RibbonControlEventArgs) Handles btnVM.Click - ' ToDo -> Logif für das Einfügen eines PDFs aus einer Mail in eine Vollmacht im Aviso. + ' ToDo -> Logik für das Einfügen eines PDFs aus einer Mail in eine Vollmacht im Aviso. If LOGIN_OK Then AVISO_Mail_Functions.addMailToAviso_Vollmachten() @@ -586,8 +586,10 @@ Public Class AVISO_Mail_Functions SendungsId = frmAvisoFormularAnfuegen.SendungsId Bezeichnung = frmAvisoFormularAnfuegen.Bezeichnung pdf_mail = frmAvisoFormularAnfuegen.PDF_MAIL + Att = frmAvisoFormularAnfuegen.ATT Return 1 + Exit Function End If End If