d.agliullov/ISEbd-21_Agliullov.D.A._Confectionery
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Agliullov D. A. Lab Work 2 Hard #5

Closed
d.agliullov wants to merge 26 commits from Lab2_Hard into Lab1_Hard
pull from: Lab2_Hard
merge into: d.agliullov:Lab1_Hard
Conversation 0 Commits 26 Files Changed 30 +8 -11
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 77889d887e - Show all commits

8
ConfectionaryFileImplement/OrderStorage.cs
View File

@ -63,14 +63,14 @@ namespace ConfectioneryFileImplement
public OrderViewModel? Update(OrderBindingModel model)
{
var pastry = _source.Orders.FirstOrDefault(x => x.Id == model.Id);
if (pastry == null)
var order = _source.Orders.FirstOrDefault(x => x.Id == model.Id);
if (order == null)
{
return null;
}
pastry.Update(model);
order.Update(model);
_source.SaveOrders();
return pastry.GetViewModel;
return order.GetViewModel;
}
}
}

1
ConfectionaryFileImplement/Pastry.cs
View File

@ -1,7 +1,6 @@
using ConfectioneryContracts.BindingModels;
using ConfectioneryContracts.ViewModels;
using ConfectioneryDataModels.Models;
using ConfectioneryDataModels.Models;
using System.Xml.Linq;
namespace ConfectioneryFileImplement.Models

2
Confectionery/FormCreateOrder.Designer.cs generated
View File

@ -103,7 +103,7 @@
this.textBoxCount.Name = "textBoxCount";
this.textBoxCount.Size = new System.Drawing.Size(214, 23);
this.textBoxCount.TabIndex = 6;
this.textBoxCount.Click += new System.EventHandler(this.TextBoxCount_TextChanged);
this.textBoxCount.ValueChanged += new System.EventHandler(this.TextBoxCount_TextChanged);
//
// textBoxSum
//

8
Confectionery/FormCreateOrder.cs
View File

@ -39,8 +39,7 @@ namespace ConfectioneryView
}
private void CalcSum()
{
if (comboBoxPastry.SelectedValue != null &&
!string.IsNullOrEmpty(textBoxCount.Text))
if (comboBoxPastry.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text))
{
try
{
@ -49,9 +48,8 @@ namespace ConfectioneryView
{
Id = id
});
int count = Convert.ToInt32(textBoxCount.Text);
textBoxSum.Text = Math.Round(count * (pastry?.Price ?? 0),
2).ToString();
int count = Convert.ToInt32(textBoxCount.Value);
textBoxSum.Text = Math.Round(count * (pastry?.Price ?? 0), 2).ToString();
_logger.LogInformation("Расчет суммы заказа");
}
catch (Exception ex)