From 566caf5554dc502b5fa696a15abacc610eb77bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konrad=20Pierzy=C5=84ski?=
 <s442333@instalka-Standard-PC-i440FX-PIIX-1996>
Date: Wed, 16 Jan 2019 19:29:42 +0100
Subject: [PATCH 1/3] SYSMAG: 40,45,50,54

---
 Magazyn_Client/Magazyn/MainWindow.xaml           | 15 +++++++--------
 Magazyn_Client/Magazyn/MainWindow.xaml.cs        |  3 +--
 Magazyn_Client/Magazyn/Windows/AmountWindow.xaml | 16 ++++++++++------
 .../Magazyn/Windows/AmountWindow.xaml.cs         | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml b/Magazyn_Client/Magazyn/MainWindow.xaml
index 54960ed..43bc5c0 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="Magazyn.MainWindow"
+<Window x:Class="Magazyn.MainWindow"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
          TextElement.Foreground="{DynamicResource MaterialDesignBody}"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -8,14 +8,13 @@
         xmlns:local="clr-namespace:Magazyn"
         mc:Ignorable="d"
         Title="Fruit Warehouse" Height="400" Width="520">
-    <Grid>
-        <ListBox x:Name="fruitList" Margin="10,35,10,0" Height="239" VerticalAlignment="Top"/>
+	<Grid>
+		<ListBox x:Name="fruitList" Margin="10,35,10,0" Height="239" VerticalAlignment="Top"/>
 
-        <Button Name="sum" Content="Sum" Margin="0,288,24,0" Height="35" Background="Teal" Click="Button_Click_1" HorizontalAlignment="Right" Width="74" VerticalAlignment="Top"/>
-        <TextBlock Name="payment" Margin="0,328,24,0" TextWrapping="Wrap" HorizontalAlignment="Right" Width="74" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
-        <ProgressBar Name="loadingContent"  HorizontalAlignment="Left" Height="10" Margin="304,294,0,0" VerticalAlignment="Top" Width="100"/>
-        <Label Content="Fruit list:" FontWeight="Bold" HorizontalAlignment="Left" Margin="10,4,0,0" VerticalAlignment="Top" Width="100"/>
+		<Button Name="sum" Content="Wartość Magazynu" Margin="0,324,10,10" Height="Auto" Background="Teal" Click="Button_Click_1" HorizontalAlignment="Right" Width="164"/>
+		<ProgressBar Name="loadingContent"  HorizontalAlignment="Left" Height="10" Margin="402,279,0,0" VerticalAlignment="Top" Width="100"/>
+		<Label Content="Fruit list:" FontWeight="Bold" HorizontalAlignment="Left" Margin="10,4,0,0" VerticalAlignment="Top" Width="100"/>
 
 
-    </Grid>
+	</Grid>
 </Window>
diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml.cs b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
index a275d9e..fe2bb65 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
@@ -89,8 +89,7 @@ namespace Magazyn
 
 		private void Button_Click_1(object sender, RoutedEventArgs e)
 		{
-            payment.Text = GetWarehousePrice().Price.ToString();
-			//MessageBox.Show("Value of warehouse: " + GetWarehousePrice().Price.ToString() );
+			MessageBox.Show("Wartość magazynu to: " + GetWarehousePrice().Price.ToString() + "zł", "Wartość magazynu" );
 		}
 
 
diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
index 4170037..dcaf9a6 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
@@ -5,11 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Magazyn.Windows"
         mc:Ignorable="d"
-        Title="Change Quantity" Height="100" Width="280">
-    <Grid>
-        <TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="10,36,0,0" TextWrapping="Wrap" Text="fruitName" VerticalAlignment="Top" Width="64"/>
-        <TextBox x:Name="amountToChange" HorizontalAlignment="Left" Margin="74,0,0,10" TextWrapping="Wrap" Text="0" Width="64" Height="32" VerticalAlignment="Bottom" RenderTransformOrigin="1.456,0.316"/>
-        <Button x:Name="saveButton" Content="Save" Margin="175,0,10,10" VerticalAlignment="Bottom" Click="saveButton_Click" />
+        Title="Change Quantity" Height="205" Width="220"
+		ResizeMode="NoResize">
+	<Grid>
+		<TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="10,82,0,0" TextWrapping="Wrap" Text="fruitName" Width="64" Height="16" VerticalAlignment="Top"/>
+		<TextBlock x:Name="messageBox" HorizontalAlignment="Left" Margin="80,10,0,0" TextWrapping="Wrap" Text="messageBox" VerticalAlignment="Top" Width="125" Height="64"/>
+		<TextBox x:Name="amountToChange" Margin="0,71,9,0" TextWrapping="Wrap" Text="0" RenderTransformOrigin="1.456,0.316" Height="32" VerticalAlignment="Top" HorizontalAlignment="Right" Width="64"/>
+		<Button x:Name="saveButton" Content="Zastosuj" Margin="105,122,0,0" VerticalAlignment="Top" Click="saveButton_Click" Width="90" HorizontalAlignment="Left"/>
+		<Button x:Name="cancelButton" Content="Anuluj" Margin="10,122,0,0" VerticalAlignment="Top" Click="cancelButton_Click" Width="90" HorizontalAlignment="Left" />
+		<Image x:Name="fruitImage" HorizontalAlignment="Left" Height="64" Margin="10,10,0,0" VerticalAlignment="Top" Width="64"/>
 
-    </Grid>
+	</Grid>
 </Window>
diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
index b0e68e1..e53c03f 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
@@ -33,6 +33,17 @@ namespace Magazyn.Windows
 			this.type = type;
 
 			fruitName.Text = fruit.Name;
+
+			messageBox.Text = String.Format("Jaką ilość produktu chcesz {0} do magazynu?", (type > 0) ? "dodać":"odjąć");
+
+			try
+			{
+				fruitImage.Source = new BitmapImage(new Uri(fruit.ImageLink));
+			}
+			catch (Exception ex)
+			{
+
+			}
 		}
 
 		private void saveButton_Click(object sender, RoutedEventArgs e)
@@ -49,5 +60,10 @@ namespace Magazyn.Windows
 			SaveChangingAmountOfFruits.Invoke((type>0)?amount:-amount);
 			this.Close();
 		}
+
+		private void cancelButton_Click(object sender, RoutedEventArgs e)
+		{
+			this.Close();
+		}
 	}
 }

From c205c3d6ed1893c93443355c2b517dd9cf099221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konrad=20Pierzy=C5=84ski?=
 <s442333@instalka-Standard-PC-i440FX-PIIX-1996>
Date: Wed, 16 Jan 2019 23:24:11 +0100
Subject: [PATCH 2/3] Task: 51

---
 Magazyn_Client/Magazyn/Views/FruitView.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
index 6edc8fa..51ee28c 100644
--- a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
+++ b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
@@ -54,14 +54,14 @@ namespace Magazyn.Views
 		{
 			AmountWindow window = new AmountWindow(fruit, -1);
 			window.SaveChangingAmountOfFruits += WindowSaveChangingAmountOfFruits;
-			window.Show();
+			window.ShowDialog();
 		}
 
 		private void addButton_Click(object sender, RoutedEventArgs e)
 		{
 			AmountWindow window = new AmountWindow(fruit, 1);
 			window.SaveChangingAmountOfFruits += WindowSaveChangingAmountOfFruits;
-			window.Show();
+			window.ShowDialog();
 		}
 
 		private void WindowSaveChangingAmountOfFruits(int amountChanged)

From 95c46a534e91200d9dc08e488cf553662e0f6c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konrad=20Pierzy=C5=84ski?=
 <s442333@instalka-Standard-PC-i440FX-PIIX-1996>
Date: Wed, 16 Jan 2019 23:56:24 +0100
Subject: [PATCH 3/3] Fixed button 'Wartosc magazynu'

---
 Magazyn_Client/Magazyn/MainWindow.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml b/Magazyn_Client/Magazyn/MainWindow.xaml
index 43bc5c0..f112e31 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml
@@ -9,10 +9,10 @@
         mc:Ignorable="d"
         Title="Fruit Warehouse" Height="400" Width="520">
 	<Grid>
-		<ListBox x:Name="fruitList" Margin="10,35,10,0" Height="239" VerticalAlignment="Top"/>
+		<ListBox x:Name="fruitList" Margin="10,35,10,95"/>
 
-		<Button Name="sum" Content="Wartość Magazynu" Margin="0,324,10,10" Height="Auto" Background="Teal" Click="Button_Click_1" HorizontalAlignment="Right" Width="164"/>
-		<ProgressBar Name="loadingContent"  HorizontalAlignment="Left" Height="10" Margin="402,279,0,0" VerticalAlignment="Top" Width="100"/>
+		<Button Name="sum" Content="Wartość Magazynu" Margin="0,0,10,10" Height="35" Background="Teal" Click="Button_Click_1" HorizontalAlignment="Right" Width="164" VerticalAlignment="Bottom"/>
+		<ProgressBar Name="loadingContent"  HorizontalAlignment="Right" Height="10" Margin="0,0,10,80" Width="100" VerticalAlignment="Bottom"/>
 		<Label Content="Fruit list:" FontWeight="Bold" HorizontalAlignment="Left" Margin="10,4,0,0" VerticalAlignment="Top" Width="100"/>