diff --git a/Magazyn_Client/.gitattributes b/Magazyn_Client/.gitattributes
new file mode 100644
index 0000000..1ff0c42
--- /dev/null
+++ b/Magazyn_Client/.gitattributes
@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln merge=binary
+#*.csproj merge=binary
+#*.vbproj merge=binary
+#*.vcxproj merge=binary
+#*.vcproj merge=binary
+#*.dbproj merge=binary
+#*.fsproj merge=binary
+#*.lsproj merge=binary
+#*.wixproj merge=binary
+#*.modelproj merge=binary
+#*.sqlproj merge=binary
+#*.wwaproj merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg binary
+#*.png binary
+#*.gif binary
+
+###############################################################################
+# diff behavior for common document formats
+#
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the
+# entries below.
+###############################################################################
+#*.doc diff=astextplain
+#*.DOC diff=astextplain
+#*.docx diff=astextplain
+#*.DOCX diff=astextplain
+#*.dot diff=astextplain
+#*.DOT diff=astextplain
+#*.pdf diff=astextplain
+#*.PDF diff=astextplain
+#*.rtf diff=astextplain
+#*.RTF diff=astextplain
diff --git a/Magazyn_Client/Magazyn/App.xaml b/Magazyn_Client/Magazyn/App.xaml
index 7e77365..309f94e 100644
--- a/Magazyn_Client/Magazyn/App.xaml
+++ b/Magazyn_Client/Magazyn/App.xaml
@@ -6,11 +6,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/Magazyn_Client/Magazyn/Magazyn.csproj b/Magazyn_Client/Magazyn/Magazyn.csproj
index f088802..5c4a801 100644
--- a/Magazyn_Client/Magazyn/Magazyn.csproj
+++ b/Magazyn_Client/Magazyn/Magazyn.csproj
@@ -73,6 +73,12 @@
AmountWindow.xaml
+
+ ErrorWindow.xaml
+
+
+ ValueWindow.xaml
+
MSBuild:Compile
Designer
@@ -93,6 +99,14 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml b/Magazyn_Client/Magazyn/MainWindow.xaml
index 83c4f01..03b31a6 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml
@@ -1,71 +1,43 @@
-
-
+ WindowStartupLocation="CenterScreen"
+ Title="Magazyn Owoców" Height="550" MaxWidth="590" MinWidth="590" Width="590" SizeChanged="Window_SizeChanged">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
\ No newline at end of file
+
+
diff --git a/Magazyn_Client/Magazyn/MainWindow.xaml.cs b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
index acf8705..342760b 100644
--- a/Magazyn_Client/Magazyn/MainWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/MainWindow.xaml.cs
@@ -16,25 +16,32 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+using System.Net;
+using Magazyn.Windows;
namespace Magazyn
{
-
public partial class MainWindow : Window
{
+ public int size = 4;
+ public int page = 0;
+
+ bool firstPage;
+ bool lastPage;
HttpClient client;
public MainWindow()
{
InitializeComponent();
- loadingContent.IsIndeterminate = true;
-
- client = new HttpClient();
- RefreshListOfFruits();
- }
+ this.Initialized += MainWindow_Initialized; ;
+
+ client = new HttpClient();
+ }
- private void Button_Click(object sender, RoutedEventArgs e)
+ private void MainWindow_Initialized(object sender, EventArgs e)
{
RefreshListOfFruits();
}
@@ -44,42 +51,72 @@ namespace Magazyn
string json = "{\"id\": " + fruit.Id.ToString() + ", \"change\": " + amountChanged.ToString() + " }";
Task response = client.PostAsync("https://sysmag.herokuapp.com/api/product/change-quantity", new StringContent(json, Encoding.UTF8, "application/json"));
- while (response.IsCompleted != true)
- {
- RefreshListOfFruits();
- }
+ while (response.IsCompleted != true) ;
+ if (response.Result.StatusCode == HttpStatusCode.BadRequest)
+ {
+ JObject data = JObject.Parse(response.Result.Content.ReadAsStringAsync().Result.ToString());
+
+ ErrorWindow window;
+
+ if (data["message"].ToString().Contains("Too low"))
+ {
+ window = new ErrorWindow("Wystąpił błąd niedomiaru. Próbujesz usunąć więcej owoców niż masz w magazynie.");
+ }
+ else if (data["message"].ToString().Contains("Over max"))
+ {
+ window = new ErrorWindow("Wystąpił błąd nadmiaru. Próbujesz dodać więcej owoców niż pomieści magazyn.");
+ }
+ else
+ {
+ window = new ErrorWindow("Nieznany błąd.");
+ }
+ window.Owner = this;
+ window.ShowDialog();
+ }
+
+ RefreshListOfFruits();
}
private void RefreshListOfFruits()
{
- loadingContent.Visibility = Visibility.Visible;
- loadingContent.IsIndeterminate = true;
- Task response = client.GetAsync("https://sysmag.herokuapp.com/api/get-all");
- while (response.IsCompleted != true)
- {
- loadingContent.IsIndeterminate = false;
- loadingContent.Visibility = Visibility.Hidden;
- }
- Fruit[] fruits = JsonConvert.DeserializeObject(response.Result.Content.ReadAsStringAsync().Result.ToString());
+ Task response = client.GetAsync("https://sysmag.herokuapp.com/api/get-all?page=" + page.ToString() + "&size=" + size.ToString());
+ while (response.IsCompleted != true) ;
+
+ if (response.Result.StatusCode != HttpStatusCode.OK)
+ {
+ ErrorWindow window = new ErrorWindow("Nastąpił błąd połączenia z serwerem.");
+ window.Owner = this;
+ window.ShowDialog();
+ return;
+ }
+
+ string responseString = response.Result.Content.ReadAsStringAsync().Result;
+
+ JObject replay = JObject.Parse(responseString);
+
+ firstPage = bool.Parse(replay["first"].ToString());
+ lastPage = bool.Parse(replay["last"].ToString());
+
+ Fruit[] fruits = JsonConvert.DeserializeObject(replay["content"].ToString());
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) ;
@@ -89,13 +126,31 @@ namespace Magazyn
return price;
}
- private void Button_Click_1(object sender, RoutedEventArgs e)
+ private void Value_Click(object sender, RoutedEventArgs e)
{
+ ValueWindow window = new ValueWindow(GetWarehousePrice().Price);
+ window.Owner = this;
+ window.ShowDialog();
+ }
-
+ private void prevButton_Click(object sender, RoutedEventArgs e)
+ {
+ if (firstPage != true) page--;
+ RefreshListOfFruits();
+ }
- MessageBox.Show("Wartość magazynu to: " + GetWarehousePrice().Price.ToString() + "zł", "Wartość magazynu" );
+ private void nextButton_Click(object sender, RoutedEventArgs e)
+ {
+ if (lastPage != true) page++;
+ RefreshListOfFruits();
+ }
+ private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+ {
+ Size size = e.NewSize;
+ double height = size.Height - 124;
+ this.size = (int)(height / 90);
+ RefreshListOfFruits();
}
diff --git a/Magazyn_Client/Magazyn/Views/FruitView.xaml b/Magazyn_Client/Magazyn/Views/FruitView.xaml
index ea82040..681178d 100644
--- a/Magazyn_Client/Magazyn/Views/FruitView.xaml
+++ b/Magazyn_Client/Magazyn/Views/FruitView.xaml
@@ -6,21 +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="782.692">
+
+ mc:Ignorable="d" Height="64" Width="575.45">
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
diff --git a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
index 32c6260..653e228 100644
--- a/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
+++ b/Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
@@ -46,23 +46,16 @@ namespace Magazyn.Views
}
catch (Exception ex)
{
+ MessageBox.Show(ex.Message);
}
}
- private void subButton_Click(object sender, RoutedEventArgs e)
+ private void subaddButton_Click(object sender, RoutedEventArgs e)
{
- AmountWindow window = new AmountWindow(fruit, -1, fruit.Quantity);
+ AmountWindow window = new AmountWindow(fruit, ((sender as Image).Name == "minusImage")?-1:1, fruit.Quantity);
window.SaveChangingAmountOfFruits += WindowSaveChangingAmountOfFruits;
- window.ShowDialog();
- }
-
- private void addButton_Click(object sender, RoutedEventArgs e)
- {
-
- AmountWindow window = new AmountWindow(fruit, 1, fruit.Quantity);
- window.SaveChangingAmountOfFruits += WindowSaveChangingAmountOfFruits;
-
+ window.Owner = Application.Current.MainWindow;
window.ShowDialog();
}
diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
index daa40b3..5d4b456 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
@@ -1,30 +1,21 @@
-
-
+ Title="Magazyn" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
index a2428d7..9c58f14 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
@@ -18,13 +18,13 @@ namespace Magazyn.Windows
///
/// Interaction logic for AmountWindow.xaml
///
- ///
-
+ ///
+
public partial class AmountWindow : Window
{
Fruit fruit;
int type;
- int quantity;
+ int quantity;
public delegate void ChangingAmountOfFruits(int amountChanged);
public event ChangingAmountOfFruits SaveChangingAmountOfFruits;
@@ -35,16 +35,16 @@ namespace Magazyn.Windows
this.fruit = fruit;
this.type = type;
- this.quantity = quantity;
- if (type == -1)
- this.Title = "Zmniejsz ilość " + fruit.Name;
- else
- this.Title = "Zwiększ ilość " + fruit.Name;
- fruitName.Text = fruit.Name;
+ this.quantity = quantity;
+
+ if (type == -1)
+ this.Title = "Zmniejsz ilość: " + fruit.Name;
+ else
+ this.Title = "Zwiększ ilość: " + fruit.Name;
fruitName.Text = fruit.Name;
- messageBox.Text = String.Format("Jaką ilość produktu chcesz {0} do magazynu?", (type > 0) ? "dodać":"odjąć");
+ messageBox.Text = String.Format("Jaką ilość produktu chcesz {0} do magazynu?", (type > 0) ? "dodać" : "odjąć");
try
{
@@ -52,51 +52,48 @@ namespace Magazyn.Windows
}
catch (Exception ex)
{
-
+ MessageBox.Show(ex.Message);
}
}
- private void saveButton_Click(object sender, RoutedEventArgs e)
+ private void SendNewQuantity()
{
- int amount = 0;
- int maxAmount = 2500;
+ int amount = int.Parse(amountToChange.Text);
try
{
- amount = int.Parse(amountToChange.Text);
- if (amount < 0)
- {
- MessageBox.Show("Podana wartość jest nieprawidłowa, proszę podać wartość dodatnią", "Nieprawidłowa wartość", MessageBoxButton.OK, MessageBoxImage.Error);
- amountToChange.Text = "0";
- return;
- }
-
- } catch (Exception ex) {
+ if (amount < 0)
+ {
+ ErrorWindow window = new ErrorWindow("Podana wartość jest nieprawidłowa, proszę podać wartość dodatnią.");
+ window.Owner = Application.Current.MainWindow;
+ window.ShowDialog();
+ amountToChange.Text = "0";
+ return;
+ }
+
+ }
+ catch (Exception ex)
+ {
throw new NotImplementedException(ex.Message);
}
- if ((quantity + amount > maxAmount) && amount >= 0 && type == 1)
- {
- MessageBox.Show("Przepełnienie magazynu", "Przepełnienie, maksymalnie 2500 sztuk", MessageBoxButton.OK, MessageBoxImage.Error);
- amountToChange.Text = "0";
- return;
-
- } else if ((quantity - amount < 0) && amount >= 0 && type == -1)
- {
- MessageBox.Show("Niedobór magazynu", "Ilość przedmiotów nie możę być mniejsza niz 0", MessageBoxButton.OK, MessageBoxImage.Error);
- amountToChange.Text = "0";
- return;
- } else
- {
- SaveChangingAmountOfFruits.Invoke((type > 0) ? amount : -amount);
- this.Close();
- }
+ SaveChangingAmountOfFruits.Invoke((type > 0) ? amount : -amount);
+ this.Close();
+ }
+ private void saveButton_Click(object sender, RoutedEventArgs e)
+ {
+ SendNewQuantity();
}
private void cancelButton_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
+
+ private void Window_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.Key == Key.Return) SendNewQuantity();
+ }
}
}
diff --git a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
new file mode 100644
index 0000000..1929361
--- /dev/null
+++ b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
diff --git a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs
new file mode 100644
index 0000000..699c897
--- /dev/null
+++ b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Magazyn.Windows
+{
+ ///
+ /// Interaction logic for ErrorWindow.xaml
+ ///
+ public partial class ErrorWindow : Window
+ {
+ public ErrorWindow(string text)
+ {
+ InitializeComponent();
+ messageBlock.Text = text;
+ }
+
+ private void okButton_Click(object sender, RoutedEventArgs e)
+ {
+ this.Close();
+ }
+ }
+}
diff --git a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
new file mode 100644
index 0000000..47ce2ae
--- /dev/null
+++ b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
diff --git a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs
new file mode 100644
index 0000000..11b771e
--- /dev/null
+++ b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Magazyn.Windows
+{
+ ///
+ /// Interaction logic for ValueWindow.xaml
+ ///
+ public partial class ValueWindow : Window
+ {
+ public ValueWindow(float value)
+ {
+ InitializeComponent();
+ valueBlock.Text = value.ToString() + " zł";
+ }
+
+ private void okButton_Click(object sender, RoutedEventArgs e)
+ {
+ this.Close();
+ }
+ }
+}