From 3be7ccc7e639a5e4dd0ecf8b96c4f3ceb4895538 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 31 Mar 2023 10:09:53 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=C3=84nderung=20der=20Markierungsfarbe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmSendungsdetailsNEU.vb | 2 +- Aviso/usrcntlAktDetails.vb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index fc0af83..53ddd28 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index d7362c2..4b66dac 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -3205,7 +3205,7 @@ Public Class frmSendungsdetailsNEU For Each row As DataGridViewRow In dgvAnhang.Rows If Not IsDBNull(row.Cells("anh_markiert").Value) Then - If row.Cells("anh_markiert").Value Then row.DefaultCellStyle.BackColor = Color.LightYellow + If row.Cells("anh_markiert").Value Then row.DefaultCellStyle.BackColor = Color.Yellow End If Next diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index aff4a42..c32b160 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -812,7 +812,7 @@ Public Class usrcntlAktDetails For Each row As DataGridViewRow In gridVermerke.Rows If Not IsDBNull(row.Cells("anh_markiert").Value) Then - If row.Cells("anh_markiert").Value Then row.DefaultCellStyle.BackColor = Color.LightYellow + If row.Cells("anh_markiert").Value Then row.DefaultCellStyle.BackColor = Color.Yellow End If Next From ee1274fafe3a7384ee8eff8265232b206e070b00 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 31 Mar 2023 11:01:55 +0200 Subject: [PATCH 2/2] Bugfix_Essensbestellungen --- Aviso/Aviso.vbproj | 2 +- ...sensbestellungenAdministration.Designer.vb | 21 +++++------ Aviso/frmEssensbestellungenAdministration.vb | 36 ++++++++++++------- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 69cecb4..20da119 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -108,7 +108,7 @@ x64 - Aviso_TemporaryKey.pfx + LME.pfx diff --git a/Aviso/frmEssensbestellungenAdministration.Designer.vb b/Aviso/frmEssensbestellungenAdministration.Designer.vb index c2bad80..44e53d2 100644 --- a/Aviso/frmEssensbestellungenAdministration.Designer.vb +++ b/Aviso/frmEssensbestellungenAdministration.Designer.vb @@ -28,6 +28,7 @@ Partial Class frmEssensbestellungenAdministration Me.Label4 = New System.Windows.Forms.Label() Me.Label22 = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblBestellungBis = New System.Windows.Forms.Label() Me.btnBestelllimit = New System.Windows.Forms.Button() Me.lblDaysToOrder = New System.Windows.Forms.Label() Me.txtBestelllimit = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -78,7 +79,6 @@ Partial Class frmEssensbestellungenAdministration Me.lblWarning = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() Me.Label9 = New System.Windows.Forms.Label() - Me.lblBestellungBis = New System.Windows.Forms.Label() Me.pnlTop.SuspendLayout() Me.Panel1.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() @@ -157,8 +157,18 @@ Partial Class frmEssensbestellungenAdministration Me.Panel1.Size = New System.Drawing.Size(1242, 106) Me.Panel1.TabIndex = 2 ' + 'lblBestellungBis + ' + Me.lblBestellungBis.AutoSize = True + Me.lblBestellungBis.Location = New System.Drawing.Point(429, 60) + Me.lblBestellungBis.Name = "lblBestellungBis" + Me.lblBestellungBis.Size = New System.Drawing.Size(114, 13) + Me.lblBestellungBis.TabIndex = 71 + Me.lblBestellungBis.Text = "Bestellung möglich bis:" + ' 'btnBestelllimit ' + Me.btnBestelllimit.Enabled = False Me.btnBestelllimit.Location = New System.Drawing.Point(313, 79) Me.btnBestelllimit.Name = "btnBestelllimit" Me.btnBestelllimit.Size = New System.Drawing.Size(97, 27) @@ -786,15 +796,6 @@ Partial Class frmEssensbestellungenAdministration Me.Label9.Text = "Gesamtbetrag" Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'lblBestellungBis - ' - Me.lblBestellungBis.AutoSize = True - Me.lblBestellungBis.Location = New System.Drawing.Point(429, 60) - Me.lblBestellungBis.Name = "lblBestellungBis" - Me.lblBestellungBis.Size = New System.Drawing.Size(114, 13) - Me.lblBestellungBis.TabIndex = 71 - Me.lblBestellungBis.Text = "Bestellung möglich bis:" - ' 'frmEssensbestellungenAdministration ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/Aviso/frmEssensbestellungenAdministration.vb b/Aviso/frmEssensbestellungenAdministration.vb index 265b8b4..f8e4e76 100644 --- a/Aviso/frmEssensbestellungenAdministration.vb +++ b/Aviso/frmEssensbestellungenAdministration.vb @@ -348,7 +348,7 @@ Public Class frmEssensbestellungenAdministration For Each row As DataGridViewRow In dgvBestellungen.SelectedRows - Dim bestellung As New cEssensbestellung(dgvBestellungen.CurrentRow.Cells("eb_kw").Value, dgvBestellungen.CurrentRow.Cells("eb_mitid").Value) + Dim bestellung As New cEssensbestellung(row.Cells("eb_kw").Value, row.Cells("eb_mitid").Value) bestellung.eb_storniert = True If stornieren Then @@ -357,15 +357,14 @@ Public Class frmEssensbestellungenAdministration bestellung.eb_storniert_am = DBNull.Value End If - - dgvBestellungen.GetOrder() bestellung.SAVE() - dgvBestellungen.LOAD() - dgvBestellungen.SetOrder() Next + dgvBestellungen.GetOrder() + dgvBestellungen.LOAD() + dgvBestellungen.SetOrder() End Sub @@ -374,7 +373,7 @@ Public Class frmEssensbestellungenAdministration For Each row As DataGridViewRow In dgvBestellungen.SelectedRows - Dim bestellung As New cEssensbestellung(dgvBestellungen.CurrentRow.Cells("eb_kw").Value, dgvBestellungen.CurrentRow.Cells("eb_mitid").Value) + Dim bestellung As New cEssensbestellung(row.Cells("eb_kw").Value, row.Cells("eb_mitid").Value) bestellung.eb_abgerechnet = abrechnen If abrechnen Then @@ -384,13 +383,16 @@ Public Class frmEssensbestellungenAdministration End If - dgvBestellungen.GetOrder() + bestellung.SAVE() - dgvBestellungen.LOAD() - dgvBestellungen.SetOrder() + Next + dgvBestellungen.GetOrder() + dgvBestellungen.LOAD() + dgvBestellungen.SetOrder() + End Sub Private Sub bestellungenSenden(senden As Boolean) @@ -398,7 +400,7 @@ Public Class frmEssensbestellungenAdministration For Each row As DataGridViewRow In dgvBestellungen.SelectedRows - Dim bestellung As New cEssensbestellung(dgvBestellungen.CurrentRow.Cells("eb_kw").Value, dgvBestellungen.CurrentRow.Cells("eb_mitid").Value) + Dim bestellung As New cEssensbestellung(row.Cells("eb_kw").Value, row.Cells("eb_mitid").Value) bestellung.eb_gesendet = senden If senden Then @@ -408,12 +410,13 @@ Public Class frmEssensbestellungenAdministration End If - dgvBestellungen.GetOrder() bestellung.SAVE() - dgvBestellungen.LOAD() - dgvBestellungen.SetOrder() + Next + dgvBestellungen.GetOrder() + dgvBestellungen.LOAD() + dgvBestellungen.SetOrder() End Sub @@ -532,8 +535,10 @@ Public Class frmEssensbestellungenAdministration If cbKW._value Is Nothing Or cbKW._value = "" Then txtBestelllimit.Text = "" + Exit Sub End If + btnBestelllimit.Enabled = True If dt IsNot Nothing Then dt.Clear() @@ -764,6 +769,11 @@ Public Class frmEssensbestellungenAdministration Exit Sub End If + If txtBestelllimit.Text = "" Then + btnBestelllimit.Enabled = False + Exit Sub + End If + If dt.Rows.Count > 0 AndAlso IsNumeric(txtBestelllimit.Text) Then calcBestellLimit()