From d145e46a4a75d853ebd2eb312bf4dfb50d55c6a3 Mon Sep 17 00:00:00 2001
From: Krystian Kabat <krykab@st.amu.edu.pl>
Date: Sun, 27 Jan 2019 13:18:38 +0100
Subject: [PATCH 1/5] =?UTF-8?q?Wy=C5=9Brodkowanie=20nazwy=20owocu=20pod=20?=
 =?UTF-8?q?obrazkiem=20w=20okienku=20dodanie/odj=C4=99cie=20od=20ilo=C5=9B?=
 =?UTF-8?q?ci.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Magazyn_Client/Magazyn/Windows/AmountWindow.xaml    | 2 +-
 Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
index 936dd51..22f57ce 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
@@ -18,7 +18,7 @@
         Title="" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
 
     <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="fruitName" HorizontalAlignment="Left" Margin="10,82,0,0" TextWrapping="Wrap" Text="fruitName" Width="64" Height="16" VerticalAlignment="Top" TextAlignment="Center"/>
         <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="" RenderTransformOrigin="1.456,0.316" Height="32" VerticalAlignment="Top" HorizontalAlignment="Right" Width="64"/>
         <Button x:Name="saveButton" Content="Zastosuj" Margin="0,0,9,10" VerticalAlignment="Bottom" Click="saveButton_Click" Width="90" HorizontalAlignment="Right"/>
diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
index c3ac79c..4b25ad1 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
@@ -46,6 +46,11 @@ namespace Magazyn.Windows
 
             fruitName.Text = fruit.Name;
 
+            if(fruit.Name.Length > 9)
+            {
+                fruitName.FontSize = 11;
+            }
+
             messageBox.Text = String.Format("Jaką ilość produktu chcesz {0} do magazynu?", (type > 0) ? "dodać" : "odjąć");
 
             try

From ae474cec63d9f7b40d3e917ddfdb09c7c494fec3 Mon Sep 17 00:00:00 2001
From: Krystian Kabat <krykab@st.amu.edu.pl>
Date: Sun, 27 Jan 2019 13:32:54 +0100
Subject: [PATCH 2/5] =?UTF-8?q?Dostosowano=20wielko=C5=9B=C4=87=20czcionki?=
 =?UTF-8?q?=20w=20okienku=20Warto=C5=9B=C4=87=20Magazynu,=20aby=20by=C5=82?=
 =?UTF-8?q?a=20tej=20samej=20wielko=C5=9B=C4=87=20co=20tekst=20w=20reszcie?=
 =?UTF-8?q?=20aplikacji?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Magazyn_Client/Magazyn/Windows/ValueWindow.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
index cd8524e..1dcc743 100644
--- a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
@@ -18,8 +18,8 @@
         Title="Wartość magazynu" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize">
 	<Grid>
 		<Button x:Name="okButton" Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="okButton_Click"/>
-		<TextBlock FontSize="16" Margin="10,10,10,0" TextWrapping="Wrap" Text="Wartość magazynu to:" VerticalAlignment="Top"/>
-		<TextBlock x:Name="valueBlock" FontSize="16"  HorizontalAlignment="Left" Margin="10,34,0,0" TextWrapping="Wrap" Text="NaN zł" VerticalAlignment="Top"/>
+		<TextBlock Margin="10,10,10,0" TextWrapping="Wrap" Text="Wartość magazynu to:" VerticalAlignment="Top"/>
+		<TextBlock x:Name="valueBlock" HorizontalAlignment="Left" Margin="10,34,0,0" TextWrapping="Wrap" Text="NaN zł" VerticalAlignment="Top"/>
 
 	</Grid>
 </Window>

From ef026afe006038c4afb87eb52c283729c77afa57 Mon Sep 17 00:00:00 2001
From: Krystian Kabat <krykab@st.amu.edu.pl>
Date: Sun, 27 Jan 2019 13:42:41 +0100
Subject: [PATCH 3/5] =?UTF-8?q?Wy=C5=9Brodkowanie=20tekstu=20w=20okienku?=
 =?UTF-8?q?=20Warto=C5=9B=C4=87=20Magazynu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Magazyn_Client/Magazyn/Windows/ValueWindow.xaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
index 1dcc743..cb0402a 100644
--- a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
@@ -16,10 +16,10 @@
         xmlns:local="clr-namespace:Magazyn.Windows"
         mc:Ignorable="d"
         Title="Wartość magazynu" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize">
-	<Grid>
-		<Button x:Name="okButton" Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="okButton_Click"/>
-		<TextBlock Margin="10,10,10,0" TextWrapping="Wrap" Text="Wartość magazynu to:" VerticalAlignment="Top"/>
-		<TextBlock x:Name="valueBlock" HorizontalAlignment="Left" Margin="10,34,0,0" TextWrapping="Wrap" Text="NaN zł" VerticalAlignment="Top"/>
+    <Grid>
+        <Button x:Name="okButton" Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="okButton_Click"/>
+        <TextBlock Margin="10,28,10,0" TextWrapping="Wrap" Text="Wartość magazynu to:" VerticalAlignment="Top" TextAlignment="Center" RenderTransformOrigin="0.495,1.734" />
+        <TextBlock x:Name="valueBlock" Margin="67,49,69,0" TextWrapping="Wrap" Text="NaN zł" VerticalAlignment="Top" TextAlignment="Center" RenderTransformOrigin="2.405,0.629"/>
 
-	</Grid>
+    </Grid>
 </Window>

From 40be2adfd71d49f9d9e3654278b20a4648a0c70d Mon Sep 17 00:00:00 2001
From: Krystian Kabat <krykab@st.amu.edu.pl>
Date: Sun, 27 Jan 2019 13:59:15 +0100
Subject: [PATCH 4/5] =?UTF-8?q?Dodano=20obs=C5=82ug=C4=99=20wyj=C4=85tku,?=
 =?UTF-8?q?=20kt=C3=B3ry=20wy=C5=9Bwietla=20b=C5=82=C4=85d,=20gdy=20w=20po?=
 =?UTF-8?q?lu=20dodania/odj=C4=99cia=20ilo=C5=9Bci=20owoc=C3=B3w=20wpiszem?=
 =?UTF-8?q?y=20tekst=20zamiast=20liczby=20dodatniej.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Magazyn/Windows/AmountWindow.xaml.cs          | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
index 4b25ad1..83b4687 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
@@ -73,7 +73,20 @@ namespace Magazyn.Windows
 
         private void SendNewQuantity()
         {
-            int amount = int.Parse(amountToChange.Text);
+            int amount;
+            try
+            {
+                amount = int.Parse(amountToChange.Text);
+            }
+            catch
+            {
+                ErrorWindow window = new ErrorWindow("Podana wartość jest nieprawidłowa, proszę podać liczbę dodatnią.");
+                window.Owner = Application.Current.MainWindow;
+                window.ShowDialog();
+                amountToChange.Text = "0";
+                return;
+            }
+
             try
             {
                 if (amount < 0)

From 63d9a5f3ca749f4b9b2204b288d11e84886e7f45 Mon Sep 17 00:00:00 2001
From: Krystian Kabat <krykab@st.amu.edu.pl>
Date: Sun, 27 Jan 2019 14:32:39 +0100
Subject: [PATCH 5/5] =?UTF-8?q?Zmieniono=20spos=C3=B3b=20numeracji=20stron?=
 =?UTF-8?q?,=20od=20teraz=20strona=20pierwsza=20to=201,=20druga=20to=202?=
 =?UTF-8?q?=20itp.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Magazyn_Client/Magazyn/MainWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml.cs b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
index 7d09588..80c31bf 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
@@ -85,7 +85,7 @@ namespace Magazyn
 
         private void RefreshListOfFruits()
         {
-            pageBlock.Text = page.ToString();
+            pageBlock.Text = (page+1).ToString();
 
             Task<HttpResponseMessage> response = client.GetAsync("https://sysmag.herokuapp.com/api/get-all?page=" + page.ToString() + "&size=" + size.ToString());
             while (response.IsCompleted != true) ;