From 5e8acea6b54b7aa50bdc3511f8a39c9ca4e29c7c Mon Sep 17 00:00:00 2001 From: Syndamia Date: Fri, 12 Mar 2021 16:03:08 +0200 Subject: Even further simplified logic of catalog vb.net project --- VB.Net Projects/catalog/catalog/Form1.vb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'VB.Net Projects/catalog') diff --git a/VB.Net Projects/catalog/catalog/Form1.vb b/VB.Net Projects/catalog/catalog/Form1.vb index a7329ae..d829a91 100644 --- a/VB.Net Projects/catalog/catalog/Form1.vb +++ b/VB.Net Projects/catalog/catalog/Form1.vb @@ -15,24 +15,24 @@ Public Class Form1 } ReadOnly ChosenProducts As BindingList(Of Product) = New BindingList(Of Product) - Private Sub Form_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Private Sub InitDataSources() Handles MyBase.Load cbProducts.DataSource = Products lbChosenProducts.DataSource = ChosenProducts End Sub - Private Sub UpdateChosenProducts(sender As Object, e As EventArgs) Handles btnAddProduct.Click, btnRemoveProduct.Click - If DirectCast(sender, Control).Name = btnAddProduct.Name Then - ChosenProducts.Add(Products(cbProducts.SelectedIndex)) - Else - ChosenProducts.Remove(cbProducts.SelectedItem) - End If + Private Sub AddChosenProduct() Handles btnAddProduct.Click + ChosenProducts.Add(cbProducts.SelectedItem) End Sub - Private Sub UpdateSumLabel(sender As Object, e As EventArgs) Handles btnAddProduct.Click, btnRemoveProduct.Click, MyBase.Load - lblSum.Text = FormatCurrency(ChosenProducts.Sum(Function(p) p.Price), 2) + Private Sub RemoveChosenProduct() Handles btnRemoveProduct.Click + ChosenProducts.Remove(cbProducts.SelectedItem) + End Sub + + Private Sub UpdateProductPriceLabel() Handles cbProducts.SelectedIndexChanged, MyBase.Load + lblProductPrice.Text = FormatCurrency(cbProducts.SelectedItem.Price, 2) End Sub - Private Sub cbProducts_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbProducts.SelectedIndexChanged, MyBase.Load - lblProductPrice.Text = FormatCurrency(Products(cbProducts.SelectedIndex).Price, 2) + Private Sub UpdateSumLabel() Handles btnAddProduct.Click, btnRemoveProduct.Click, MyBase.Load + lblSum.Text = FormatCurrency(ChosenProducts.Sum(Function(p) p.Price), 2) End Sub -End Class \ No newline at end of file +End Class -- cgit v1.2.3