GUI-Verbesserungen
This commit is contained in:
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("3.8.5.6")>
|
<Assembly: AssemblyVersion("3.8.5.7")>
|
||||||
<Assembly: AssemblyFileVersion("3.8.5.6")>
|
<Assembly: AssemblyFileVersion("3.8.5.7")>
|
||||||
|
|||||||
1
Aviso/UsrCntlEssensbestellungen.Designer.vb
generated
1
Aviso/UsrCntlEssensbestellungen.Designer.vb
generated
@@ -588,7 +588,6 @@ Partial Class UsrCntlessensbestellungen
|
|||||||
'
|
'
|
||||||
'btnSave
|
'btnSave
|
||||||
'
|
'
|
||||||
Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK
|
|
||||||
Me.btnSave.Location = New System.Drawing.Point(595, 349)
|
Me.btnSave.Location = New System.Drawing.Point(595, 349)
|
||||||
Me.btnSave.Name = "btnSave"
|
Me.btnSave.Name = "btnSave"
|
||||||
Me.btnSave.Size = New System.Drawing.Size(75, 23)
|
Me.btnSave.Size = New System.Drawing.Size(75, 23)
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ Public Class UsrCntlessensbestellungen
|
|||||||
Dim preisProMahlzeit As Double = 3
|
Dim preisProMahlzeit As Double = 3
|
||||||
Dim menu As String = "Menü"
|
Dim menu As String = "Menü"
|
||||||
Dim alacarte As String = "A La Carte"
|
Dim alacarte As String = "A La Carte"
|
||||||
|
Dim outdated As Boolean = True
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -208,12 +209,12 @@ Public Class UsrCntlessensbestellungen
|
|||||||
If TypeOf gb Is GroupBox Then
|
If TypeOf gb Is GroupBox Then
|
||||||
For Each c As Control In gb.Controls
|
For Each c As Control In gb.Controls
|
||||||
|
|
||||||
If c.Text.ToLower.StartsWith(menu.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
|
If c.Text.ToLower.StartsWith(menu.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso (c.Enabled = True Or outdated = True And MyPanel1.Enabled = False) Then
|
||||||
Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
|
Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
|
||||||
If rb.Checked Then countMenus = countMenus + 1
|
If rb.Checked Then countMenus = countMenus + 1
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If c.Text.ToLower.StartsWith(alacarte.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
|
If c.Text.ToLower.StartsWith(alacarte.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso (c.Enabled = True Or outdated = True And MyPanel1.Enabled = False) Then
|
||||||
Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
|
Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
|
||||||
If rb.Checked Then countlaCarte = countlaCarte + 1
|
If rb.Checked Then countlaCarte = countlaCarte + 1
|
||||||
End If
|
End If
|
||||||
@@ -374,6 +375,7 @@ Public Class UsrCntlessensbestellungen
|
|||||||
|
|
||||||
|
|
||||||
If essen.SAVE() Then
|
If essen.SAVE() Then
|
||||||
|
btnSave.DialogResult = DialogResult.OK
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@@ -437,11 +439,10 @@ Public Class UsrCntlessensbestellungen
|
|||||||
|
|
||||||
If warning Then
|
If warning Then
|
||||||
lblWarning.Text = "Bezeichnung für A la carte fehlt"
|
lblWarning.Text = "Bezeichnung für A la carte fehlt"
|
||||||
btnSave.DialogResult = Windows.Forms.DialogResult.None
|
'btnSave.DialogResult = DialogResult.None
|
||||||
Else
|
Else
|
||||||
|
|
||||||
lblWarning.Text = ""
|
lblWarning.Text = ""
|
||||||
btnSave.DialogResult = DialogResult.OK
|
|
||||||
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|||||||
@@ -248,6 +248,8 @@ Public Class frmEssensbestellungenAdministration
|
|||||||
|
|
||||||
Private Sub BearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BearbeitenToolStripMenuItem.Click
|
Private Sub BearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BearbeitenToolStripMenuItem.Click
|
||||||
|
|
||||||
|
If dgvBestellungen.SelectedRows.Count < 1 Then Exit Sub
|
||||||
|
|
||||||
Dim bestellung As New cEssensbestellung(dgvBestellungen.SelectedRows(0).Cells("eb_kw").Value, dgvBestellungen.SelectedRows(0).Cells("eb_mitid").Value)
|
Dim bestellung As New cEssensbestellung(dgvBestellungen.SelectedRows(0).Cells("eb_kw").Value, dgvBestellungen.SelectedRows(0).Cells("eb_mitid").Value)
|
||||||
|
|
||||||
Using UserControl1 As UsrCntlessensbestellungen = New UsrCntlessensbestellungen(bestellung)
|
Using UserControl1 As UsrCntlessensbestellungen = New UsrCntlessensbestellungen(bestellung)
|
||||||
|
|||||||
Reference in New Issue
Block a user