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

Bugfix_Essensbestellungen

Browse Source
This commit is contained in:
d.breimaier
2023-03-31 11:01:55 +02:00
parent 449f86a73a
commit ee1274fafe
3 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aviso/Aviso.vbproj
View File

@@ -108,7 +108,7 @@
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Aviso_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>LME.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility" />

21
Aviso/frmEssensbestellungenAdministration.Designer.vb generated
View File

@@ -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!)

36
Aviso/frmEssensbestellungenAdministration.vb
View File

@@ -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()