diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml b/Magazyn_Client/Magazyn/MainWindow.xaml
index f112e31..fd9be81 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml
@@ -1,4 +1,5 @@
-
-
+ ResizeMode="NoResize"
+ WindowStartupLocation="CenterScreen"
+ Title="Fruit Warehouse" Height="469.85" Width="837.599">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+
diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml.cs b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
index fe2bb65..b4658c6 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
@@ -29,6 +29,7 @@ namespace Magazyn
{
InitializeComponent();
loadingContent.IsIndeterminate = true;
+
client = new HttpClient();
RefreshListOfFruits();
}
@@ -65,19 +66,19 @@ namespace Magazyn
UpdateListOfFruits(fruits);
}
- private void UpdateListOfFruits(Fruit[] list)
- {
- fruitList.Items.Clear();
+ private void UpdateListOfFruits(Fruit[] list)
+ {
+ fruitList.Items.Clear();
- foreach (Fruit item in list)
- {
- FruitView fruitView = new FruitView(item);
- fruitView.SaveChangingAmountOfFruits += FruitViewSaveChangingAmountOfFruits;
- fruitList.Items.Add(fruitView);
- }
- }
+ foreach (Fruit item in list)
+ {
+ FruitView fruitView = new FruitView(item);
+ fruitView.SaveChangingAmountOfFruits += FruitViewSaveChangingAmountOfFruits;
+ fruitList.Items.Add(fruitView);
+ }
+ }
- private WarehousePrice GetWarehousePrice()
+ private WarehousePrice GetWarehousePrice()
{
Task response = client.GetAsync("https://sysmag.herokuapp.com/api/get-price-of-all");
while (response.IsCompleted != true) ;
diff --git a/Magazyn_Client/Magazyn/Views/FruitView.xaml b/Magazyn_Client/Magazyn/Views/FruitView.xaml
index 13e29f4..ea82040 100644
--- a/Magazyn_Client/Magazyn/Views/FruitView.xaml
+++ b/Magazyn_Client/Magazyn/Views/FruitView.xaml
@@ -6,34 +6,21 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Magazyn.Views"
- mc:Ignorable="d" Height="64" Width="520">
+ mc:Ignorable="d" Height="64" Width="782.692">
-
+
-
+
-
-
+
+
-
+
-
diff --git a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
index 51ee28c..590667a 100644
--- a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
+++ b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
@@ -37,8 +37,8 @@ namespace Magazyn.Views
fruitName.Text = fruit.Name;
fruitAmount.Text = fruit.Quantity.ToString();
- fruitPrice.Text = fruit.Price.ToString();
- allPrice.Text = (fruit.Quantity * fruit.Price).ToString();
+ fruitPrice.Text = fruit.Price.ToString() + "zł";
+ allPrice.Text = (fruit.Quantity * fruit.Price).ToString() + "zł";
try
{
@@ -60,7 +60,7 @@ namespace Magazyn.Views
private void addButton_Click(object sender, RoutedEventArgs e)
{
AmountWindow window = new AmountWindow(fruit, 1);
- window.SaveChangingAmountOfFruits += WindowSaveChangingAmountOfFruits;
+ window.SaveChangingAmountOfFruits += WindowSaveChangingAmountOfFruits;
window.ShowDialog();
}
diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
index dcaf9a6..f7b093b 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:Magazyn.Windows"
mc:Ignorable="d"
Title="Change Quantity" Height="205" Width="220"
+ WindowStartupLocation="CenterScreen"
ResizeMode="NoResize">
@@ -13,7 +14,6 @@
-
-
-
+
+