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

Essensbestellungen GUI Verbesserung, Control für Warenorte

Browse Source
This commit is contained in:
d.breimaier
2023-01-10 16:28:06 +01:00
parent 7b991737d9
commit fc89dc23ef
11 changed files with 778 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Aviso/frmEssensbestellungenAdministration.vb
View File

@@ -251,7 +251,7 @@ Public Class frmEssensbestellungenAdministration
Using UserControl1 As UsrCntlessensbestellungen = New UsrCntlessensbestellungen(bestellung)
Using tmpForm As Form = New Form()
tmpForm.Width = UserControl1.Width
tmpForm.Height = UserControl1.Height
tmpForm.Height = UserControl1.Height + 40
tmpForm.Text = bestellung.eb_kw.ToString & " - " & bestellung.eb_mitname.ToString
tmpForm.StartPosition = tmpForm.StartPosition.CenterParent
tmpForm.Controls.Add(UserControl1)
@@ -269,7 +269,7 @@ Public Class frmEssensbestellungenAdministration
If dgvBestellungen.SelectedRows.Count = 0 Then Exit Sub
Select Case sender.Text
Case "abgerechnet"
Case "abgerechnen"
Select Case dgvBestellungen.SelectedRows.Count
Case 1
If vbYes = MsgBox("Möchten Sie die Essensbestellung '" & dgvBestellungen.SelectedRows(0).Cells("eb_kw").Value & " von Mitarbeiter " & dgvBestellungen.SelectedRows(0).Cells("eb_mitname").Value & " abrechnen", vbYesNoCancel) Then
@@ -616,35 +616,34 @@ Public Class frmEssensbestellungenAdministration
For Each el In uniqueMenusMontag
resultMontag &= IIf(el.Key.Montag <> "", String.Format("{0} {1}x ", el.Key.Montag, el.Count()), "")
resultMontag &= IIf(el.Key.Montag <> "", String.Format("{1}x {0}, ", el.Key.Montag, el.Count()), "")
Next
For Each el In uniqueMenusDienstag
resultDienstag &= IIf(el.Key.Dienstag <> "", String.Format("{0} {1}x ", el.Key.Dienstag, el.Count()), "")
resultDienstag &= IIf(el.Key.Dienstag <> "", String.Format("{1}x {0}, ", el.Key.Dienstag, el.Count()), "")
Next
For Each el In uniqueMenusMittwoch
resultMittwoch &= IIf(el.Key.Mittwoch <> "", String.Format("{0} {1}x ", el.Key.Mittwoch, el.Count()), "")
resultMittwoch &= IIf(el.Key.Mittwoch <> "", String.Format("{1}x {0}, ", el.Key.Mittwoch, el.Count()), "")
Next
For Each el In uniqueMenusDonnerstag
resultDonnerstag &= IIf(el.Key.Donnerstag <> "", String.Format("{0} {1}x ", el.Key.Donnerstag, el.Count()), "")
resultDonnerstag &= IIf(el.Key.Donnerstag <> "", String.Format("{1}x {0}, ", el.Key.Donnerstag, el.Count()), "")
Next
For Each el In uniqueMenusFreitag
resultFreitag &= IIf(el.Key.Freitag <> "", String.Format("{0} {1}x ", el.Key.Freitag, el.Count()), "")
resultFreitag &= IIf(el.Key.Freitag <> "", String.Format("{1}x {0}, ", el.Key.Freitag, el.Count()), "")
Next
Dim R As DataRow = dtBestellungen.NewRow
R("ID") = 0
R("ID") = "0"
R("KW") = "-"
R("Name") = "-"
R("KW") = "Summe"
R("Gebaeude") = "-"
R("Name") = "-"
R("Name") = "SUMME"
R("Gebaeude") = "-"
R("Name") = DBNull.Value
R("Abteilung") = "-"
R("Datum") = DateTime.Now()
R("Anmerkung") = DBNull.Value
R("Datum") = DBNull.Value
R("Storniert") = DBNull.Value
R("Montag") = String.Join(" ", resultMontag)
R("Dienstag") = String.Join(" ", resultDienstag)