From 6fc97718a2475936f4e7ff7deada83ab997319d4 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 13 Mar 2024 15:58:50 +0100 Subject: [PATCH] Fiskaliebersicht, Filter bei USTV-Kunden --- SDL/USTV/usrCntlUSTV.Designer.vb | 34 +++++++++++++-------------- SDL/kunden/usrcntlFiskaluebersicht.vb | 6 ++++- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index 65f5fa02..df4d4501 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlUSTV Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlFilter = New System.Windows.Forms.Panel() Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label1 = New System.Windows.Forms.Label() @@ -38,11 +38,11 @@ Partial Class usrCntlUSTV Me.FlatButton2 = New System.Windows.Forms.Button() Me.Panel2 = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() + Me.btnMail = New System.Windows.Forms.Button() Me.btnPLOSEAlle = New System.Windows.Forms.Button() Me.Button5 = New System.Windows.Forms.Button() Me.Button8 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.btnMail = New System.Windows.Forms.Button() CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -64,8 +64,8 @@ Partial Class usrCntlUSTV Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvUSTV.AllowUserToAddRows = False Me.dgvUSTV.AllowUserToDeleteRows = False - 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 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvUSTV.Location = New System.Drawing.Point(0, 84) @@ -140,7 +140,7 @@ Partial Class usrCntlUSTV Me.KdSearchBox1._display_Name1 = False Me.KdSearchBox1._displayAVISO_Email = False Me.KdSearchBox1._displayFullName = False - Me.KdSearchBox1._displayWoelflKd = False + Me.KdSearchBox1._displayWoelflKd = True Me.KdSearchBox1._hideIfListEmpty = True Me.KdSearchBox1._loadKdData = False Me.KdSearchBox1._searchName1 = True @@ -243,6 +243,18 @@ Partial Class usrCntlUSTV Me.Panel3.Size = New System.Drawing.Size(1072, 66) Me.Panel3.TabIndex = 0 ' + 'btnMail + ' + Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMail.ForeColor = System.Drawing.Color.Black + Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnMail.Location = New System.Drawing.Point(545, 10) + Me.btnMail.Name = "btnMail" + Me.btnMail.Size = New System.Drawing.Size(75, 39) + Me.btnMail.TabIndex = 25 + Me.btnMail.Text = "Anträge" + Me.btnMail.UseVisualStyleBackColor = True + ' 'btnPLOSEAlle ' Me.btnPLOSEAlle.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -291,18 +303,6 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip1.Name = "ContextMenuStrip1" Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) ' - 'btnMail - ' - Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnMail.ForeColor = System.Drawing.Color.Black - Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnMail.Location = New System.Drawing.Point(545, 10) - Me.btnMail.Name = "btnMail" - Me.btnMail.Size = New System.Drawing.Size(75, 39) - Me.btnMail.TabIndex = 25 - Me.btnMail.Text = "Anträge" - Me.btnMail.UseVisualStyleBackColor = True - ' 'usrCntlUSTV ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index aae48465..9babe308 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -142,7 +142,7 @@ Public Class usrcntlFiskaluebersicht Sub initDGVUnterlagen() With dgvUnterlagen - .DataSource = SQL.loadDgvBySql("SELECT [fka_id],[fka_KdNr],[fka_Name],[fka_Datum] , [fka_Art], [fka_docId] FROM [tblFiskalkundenAnhaenge] " & + .DataSource = SQL.loadDgvBySql("SELECT [fka_id],[fka_KdNr],[fka_Name],[fka_Datum] , CASE WHEN [fka_Art] like '%SONSTIGES%' THEN 'SONSTIGES' end as [fka_Art], [fka_docId] FROM [tblFiskalkundenAnhaenge] " & " WHERE [fka_KdNr]='" & fk.FK_Kdnr & "' AND fka_fkId='" & fk.FK_Id & "' ORDER BY fka_Datum desc ", "AVISO") .Columns("fka_id").Visible = False .Columns("fka_KdNr").Visible = False @@ -1007,6 +1007,10 @@ Public Class usrcntlFiskaluebersicht If cbxAttachmentArt._value = "" Then Exit Sub Dim ArtId As String = cbxAttachmentArt._value + If ArtId = "SONSTIGES" Then + ArtId &= "_" & Now.ToString("ddMMyyHmm") + End If + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "FISKALKUNDENANHAENGE", fk.FK_Datum, "", "", ArtId, kdNr) If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then