edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

div. Änderungen/optische Anpassungen, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-08-11 16:24:47 +02:00
parent ac6e4b5717
commit b3bfac9c55
4 changed files with 71 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.5.7.0")>
<Assembly: AssemblyFileVersion("1.5.7.0")>
<Assembly: AssemblyVersion("1.5.7.1")>
<Assembly: AssemblyFileVersion("1.5.7.1")>

45
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -2368,32 +2368,38 @@ Public Class frmMDM_USTVAntrag
Private Sub btnMail_Click(sender As Object, e As EventArgs) Handles btnMail.Click
If Not cns_neAntraege.Items.ContainsKey("excel") Then
Dim excel = New ToolStripMenuItem() With {.Text = "Excelauswertung starten", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim excel = New ToolStripMenuItem() With {.Text = "Auswertung", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.Excel_logo}
cns_neAntraege.Items.Add(excel)
AddHandler excel.Click, AddressOf mnuItem_Clicked
End If
If Not cns_neAntraege.Items.ContainsKey("mail") Then
Dim mail = New ToolStripMenuItem() With {.Text = "Email (POS-Liste) generieren", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim mail = New ToolStripMenuItem() With {.Text = "Email (POS-Liste)", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.email_big1}
AddHandler mail.Click, AddressOf mnuItem_Clicked
cns_neAntraege.Items.Add(mail)
End If
If Not cns_neAntraege.Items.ContainsKey("mailPDF") Then
Dim mailPDF = New ToolStripMenuItem() With {.Text = "Email (PDF-RE) generieren", .Name = "mailPDF", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim mailPDF = New ToolStripMenuItem() With {.Text = "Email (PDF-RE)", .Name = "mailPDF", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.email_big1}
AddHandler mailPDF.Click, AddressOf mnuItem_Clicked
cns_neAntraege.Items.Add(mailPDF)
End If
If Not cns_neAntraege.Items.ContainsKey("mailPDFnotmerged") Then
Dim mailPDFnotmerged = New ToolStripMenuItem() With {.Text = "Email (PDF-RE) einzeln", .Name = "mailPDFnotmerged", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.email_big1}
AddHandler mailPDFnotmerged.Click, AddressOf mnuItem_Clicked
cns_neAntraege.Items.Add(mailPDFnotmerged)
End If
If Not cns_neAntraege.Items.ContainsKey("offeneAntraege") Then
Dim oa = New ToolStripMenuItem() With {.Text = "nicht eingearbeitet USTV-Anträge", .Name = "offeneAntraege", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim oa = New ToolStripMenuItem() With {.Text = "nicht eingearbeitet USTV-Anträge", .Name = "offeneAntraege", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.statistik_small}
AddHandler oa.Click, AddressOf mnuItem_Clicked
cns_neAntraege.Items.Add(oa)
End If
If Not cns_neAntraege.Items.ContainsKey("zuwenig") Then
Dim oa = New ToolStripMenuItem() With {.Text = "zu wenig Email", .Name = "zuwenig", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim oa = New ToolStripMenuItem() With {.Text = "zu wenig", .Name = "zuwenig", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.email_big1}
AddHandler oa.Click, AddressOf mnuItem_Clicked
cns_neAntraege.Items.Add(oa)
End If
@@ -2417,6 +2423,9 @@ Public Class frmMDM_USTVAntrag
ElseIf item.Name = "mailPDF" Then
mailmitExcelauswertung(True)
ElseIf item.Name = "mailPDFnotmerged" Then
mailmitExcelauswertung(True, False)
ElseIf item.Name = "zuwenig" Then
zuwenigMail()
@@ -2566,7 +2575,7 @@ Public Class frmMDM_USTVAntrag
End Function
Private Sub mailmitExcelauswertung(Optional withPDF As Boolean = False)
Private Sub mailmitExcelauswertung(Optional withPDF As Boolean = False, Optional mergePDFs As Boolean = True)
Try
Dim outl As New Outlook.Application
@@ -2575,15 +2584,29 @@ Public Class frmMDM_USTVAntrag
Dim filepath = ""
If excelAuswertung(filepath, False, False) Then
Mail.Attachments.Add(filepath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
End If
If withPDF Then Mail.Attachments.Add(PDFInvoicesPath(""), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
If withPDF Then
Dim list As New List(Of String)
If mergePDFs Then
Mail.Attachments.Add(PDFInvoicesPath("", List), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
Else
PDFInvoicesPath("", list)
Dim subject As String = ""
For Each l In list
Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
Next
End If
End If
Dim subject As String = ""
subject &= IIf(USTV_ANTRAG.UStVAn_Name <> "", USTV_ANTRAG.UStVAn_Name & "_", "")
subject &= IIf(Antrag_LandKz <> "", Antrag_LandKz & "_", "")
subject &= IIf(USTV_ANTRAG.UStVAn_ReDatVon IsNot Nothing AndAlso USTV_ANTRAG.UStVAn_ReDatBis IsNot Nothing, CDate(USTV_ANTRAG.UStVAn_ReDatVon).ToShortDateString & "-" & CDate(USTV_ANTRAG.UStVAn_ReDatBis).ToShortDateString, "")
@@ -4051,7 +4074,8 @@ Public Class frmMDM_USTVAntrag
Case "RO" : Attachmens_Bez = "Factura-furnizorului" : Attachmens_Bez_POS = "Lista-articolelor"
End Select
Dim path As String = PDFInvoicesPath(posID)
Dim list As New List(Of String)
Dim path As String = PDFInvoicesPath(posID, list)
Dim fileInfo As New FileInfo(path)
If path <> "" Then
Mail.Attachments.Add(path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, Attachmens_Bez & fileInfo.Extension)
@@ -5267,10 +5291,9 @@ Public Class frmMDM_USTVAntrag
End Function
Private Function PDFInvoicesPath(ByRef posId As String) As String
Private Function PDFInvoicesPath(ByRef posId As String, list As List(Of String)) As String
Dim list As New List(Of String)
If dgvUSTVPositionen.SelectedRows.Count > 0 Then
Dim nummerierung As Boolean = False

20
SDL/USTV/usrCntlUSTV.Designer.vb generated
View File

@@ -23,7 +23,7 @@ Partial Class usrCntlUSTV
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlUSTV))
Me.pnlFilter = New System.Windows.Forms.Panel()
Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -115,8 +115,8 @@ Partial Class usrCntlUSTV
Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvUSTV.AllowUserToAddRows = False
Me.dgvUSTV.AllowUserToDeleteRows = False
DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvUSTV.Location = New System.Drawing.Point(0, 108)
@@ -853,7 +853,7 @@ Partial Class usrCntlUSTV
Me.btn3470.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btn3470.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn3470.ForeColor = System.Drawing.Color.Black
Me.btn3470.Location = New System.Drawing.Point(972, 5)
Me.btn3470.Location = New System.Drawing.Point(1278, 5)
Me.btn3470.Name = "btn3470"
Me.btn3470.Size = New System.Drawing.Size(114, 39)
Me.btn3470.TabIndex = 30
@@ -865,12 +865,14 @@ Partial Class usrCntlUSTV
Me.btnVZ.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnVZ.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnVZ.ForeColor = System.Drawing.Color.Black
Me.btnVZ.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnVZ.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnVZ.Location = New System.Drawing.Point(1092, 5)
Me.btnVZ.Location = New System.Drawing.Point(947, 7)
Me.btnVZ.Name = "btnVZ"
Me.btnVZ.Size = New System.Drawing.Size(104, 39)
Me.btnVZ.Size = New System.Drawing.Size(126, 39)
Me.btnVZ.TabIndex = 28
Me.btnVZ.Text = "Vorauszahlungen"
Me.btnVZ.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnVZ.UseVisualStyleBackColor = True
'
'btnFAPruefung
@@ -879,7 +881,7 @@ Partial Class usrCntlUSTV
Me.btnFAPruefung.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnFAPruefung.ForeColor = System.Drawing.Color.Black
Me.btnFAPruefung.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnFAPruefung.Location = New System.Drawing.Point(1202, 6)
Me.btnFAPruefung.Location = New System.Drawing.Point(1177, 6)
Me.btnFAPruefung.Name = "btnFAPruefung"
Me.btnFAPruefung.Size = New System.Drawing.Size(92, 39)
Me.btnFAPruefung.TabIndex = 27
@@ -891,12 +893,14 @@ Partial Class usrCntlUSTV
Me.btnVorschau.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnVorschau.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnVorschau.ForeColor = System.Drawing.Color.Black
Me.btnVorschau.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.btnVorschau.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnVorschau.Location = New System.Drawing.Point(1300, 6)
Me.btnVorschau.Location = New System.Drawing.Point(1079, 6)
Me.btnVorschau.Name = "btnVorschau"
Me.btnVorschau.Size = New System.Drawing.Size(92, 39)
Me.btnVorschau.TabIndex = 26
Me.btnVorschau.Text = "Vorschau"
Me.btnVorschau.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnVorschau.UseVisualStyleBackColor = True
'
'btnMail

35
SDL/USTV/usrCntlUSTV.vb
View File

@@ -587,20 +587,20 @@ Public Class usrCntlUSTV
If Not ContextMenuStrip3.Items.ContainsKey("dgv") Then
Dim dgv = New ToolStripMenuItem() With {.Text = "Übersicht anzeigen", .Name = "dgv", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim dgv = New ToolStripMenuItem() With {.Text = "Übersicht", .Name = "dgv", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.statistik_small}
AddHandler dgv.Click, AddressOf mnuFAPruefungenClicked
ContextMenuStrip3.Items.Add(dgv)
End If
If Not ContextMenuStrip3.Items.ContainsKey("excel") Then
Dim excel = New ToolStripMenuItem() With {.Text = "Excelauswertung starten", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim excel = New ToolStripMenuItem() With {.Text = "Auswertung", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.Excel_logo}
ContextMenuStrip3.Items.Add(excel)
AddHandler excel.Click, AddressOf mnuFAPruefungenClicked
End If
If Not ContextMenuStrip3.Items.ContainsKey("mail") Then
Dim mail = New ToolStripMenuItem() With {.Text = "Email generieren", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim mail = New ToolStripMenuItem() With {.Text = "Email", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.email_big1}
AddHandler mail.Click, AddressOf mnuFAPruefungenClicked
ContextMenuStrip3.Items.Add(mail)
End If
@@ -616,7 +616,7 @@ Public Class usrCntlUSTV
If Not ContextMenuStrip4.Items.ContainsKey("excel") Then
Dim excel = New ToolStripMenuItem() With {.Text = "Excelauswertung starten", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim excel = New ToolStripMenuItem() With {.Text = "Auswertung", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.Excel_logo}
ContextMenuStrip4.Items.Add(excel)
AddHandler excel.Click, AddressOf mnu3470_Clicked
End If
@@ -624,13 +624,13 @@ Public Class usrCntlUSTV
If Not ContextMenuStrip4.Items.ContainsKey("pdf") Then
Dim pdf = New ToolStripMenuItem() With {.Text = "PDF", .Name = "pdf", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim pdf = New ToolStripMenuItem() With {.Text = "PDF", .Name = "pdf", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.pdf_s}
ContextMenuStrip4.Items.Add(pdf)
AddHandler pdf.Click, AddressOf mnu3470_Clicked
End If
If Not ContextMenuStrip4.Items.ContainsKey("mail") Then
Dim mail = New ToolStripMenuItem() With {.Text = "Email generieren", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim mail = New ToolStripMenuItem() With {.Text = "Email", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.email_big1}
AddHandler mail.Click, AddressOf mnu3470_Clicked
ContextMenuStrip4.Items.Add(mail)
End If
@@ -646,32 +646,32 @@ Public Class usrCntlUSTV
Private Sub btnMail_Click(sender As Object, e As EventArgs) Handles btnMail.Click
If Not ContextMenuStrip1.Items.ContainsKey("excel") Then
Dim excel = New ToolStripMenuItem() With {.Text = "Excelauswertung starten", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim excel = New ToolStripMenuItem() With {.Text = "Auswertung", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.Excel_logo}
ContextMenuStrip1.Items.Add(excel)
AddHandler excel.Click, AddressOf mnuItem_Clicked
End If
If Not ContextMenuStrip1.Items.ContainsKey("mail") Then
Dim mail = New ToolStripMenuItem() With {.Text = "Email generieren", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim mail = New ToolStripMenuItem() With {.Text = "Email", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.email_big1}
AddHandler mail.Click, AddressOf mnuItem_Clicked
ContextMenuStrip1.Items.Add(mail)
End If
If Not ContextMenuStrip1.Items.ContainsKey("offeneAntraege") Then
Dim oa = New ToolStripMenuItem() With {.Text = "nicht eingearbeitet USTV-Anträge", .Name = "offeneAntraege", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim oa = New ToolStripMenuItem() With {.Text = "nicht eingearbeitet USTV-Anträge", .Name = "offeneAntraege", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.statistik_small}
AddHandler oa.Click, AddressOf mnuItem_Clicked
ContextMenuStrip1.Items.Add(oa)
End If
If Not ContextMenuStrip1.Items.ContainsKey("checkPDF") Then
Dim pdf = New ToolStripMenuItem() With {.Text = "PDF-Verknüpfungen prüfen", .Name = "checkPDF", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim pdf = New ToolStripMenuItem() With {.Text = "PDF-Verknüpfungen prüfen", .Name = "checkPDF", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.ok}
AddHandler pdf.Click, AddressOf mnuItem_Clicked
ContextMenuStrip1.Items.Add(pdf)
End If
If Not ContextMenuStrip1.Items.ContainsKey("checkAntragspositionen") Then
Dim pos = New ToolStripMenuItem() With {.Text = "Antragspositionen prüfen", .Name = "checkAntragspositionen", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
Dim pos = New ToolStripMenuItem() With {.Text = "Antragspositionen prüfen", .Name = "checkAntragspositionen", .Font = New Font(Me.Font.FontFamily, Me.Font.Size), .Image = My.Resources.ok}
AddHandler pos.Click, AddressOf mnuItem_Clicked
ContextMenuStrip1.Items.Add(pos)
End If
@@ -1211,11 +1211,22 @@ Public Class usrCntlUSTV
Private Sub setInfo(kdnr As Integer)
lblVZhint.ForeColor = Color.Red
lblFRhint.ForeColor = Color.Red
lblVZKunde.ForeColor = Color.Red
lblFR.ForeColor = Color.Red
If kdnr > 0 Then
Panel1.BackColor = Color.FromArgb(240, 245, 255)
Dim KUNDE As New cKunde(kdnr)
Dim KUNDE_ERW As New cKundenErweitert(kdnr)
If KUNDE.Abfertigungsverbot Then Panel1.BackColor = Color.IndianRed
If KUNDE.Abfertigungsverbot Then
Panel1.BackColor = Color.IndianRed
lblVZhint.ForeColor = Color.Yellow
lblVZKunde.ForeColor = Color.Yellow
lblFRhint.ForeColor = Color.Yellow
lblFR.ForeColor = Color.Yellow
End If
If KUNDE_ERW.kde_AnmerkungVZ IsNot Nothing Then
lblVZhint.Text = KUNDE_ERW.kde_AnmerkungVZ
lblFRhint.Text = KUNDE_ERW.kde_AnmerkungFR