s434786/DINO_SCRUM
1
0
Fork 6
Code Issues Pull Requests 2 Releases Wiki Activity

tasks 39, 42, 52, 53 #20

Closed
s434742 wants to merge 5 commits from (deleted):master into master
pull from: (deleted):master
merge into: s434786:master
Conversation 1 Commits 5 Files Changed 9 +235 -182
9 changed files with 235 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Magazyn_Client/.gitattributes vendored Normal file
View File

@ -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

74
Magazyn_Client/Magazyn/MainWindow.xaml
View File

@ -1,31 +1,43 @@
<Window x:Class="Magazyn.MainWindow" <Window x:Class="Magazyn.MainWindow"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
TextElement.Foreground="{DynamicResource MaterialDesignBody}" TextElement.Foreground="{DynamicResource MaterialDesignBody}"
TextElement.FontWeight="Regular" TextElement.FontWeight="Regular"
TextElement.FontSize="13" TextElement.FontSize="13"
TextOptions.TextFormattingMode="Ideal" TextOptions.TextFormattingMode="Ideal"
TextOptions.TextRenderingMode="Auto" TextOptions.TextRenderingMode="Auto"
Background="{DynamicResource MaterialDesignPaper}" Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{DynamicResource MaterialDesignFont}" FontFamily="{DynamicResource MaterialDesignFont}"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Magazyn" xmlns:local="clr-namespace:Magazyn"
mc:Ignorable="d" mc:Ignorable="d"
Title="Magazyn Owoców" Height="500" MaxWidth="590" MinWidth="590" Width="590" SizeChanged="Window_SizeChanged"> WindowStartupLocation="CenterScreen"
<Grid> Title="Magazyn Owoców" Height="550" MaxWidth="590" MinWidth="590" Width="590" SizeChanged="Window_SizeChanged">
<ListBox x:Name="fruitList" Margin="10,35,10,89"/> <Grid>
<ListBox x:Name="fruitList" Margin="10,74,10.333,88.667"/>
<Button Name="sum" Content="Wartość magazynu" Margin="0,0,10,10" VerticalAlignment="Bottom" Height="35" Click="Value_Click" HorizontalAlignment="Right" Width="163"/> <Grid Margin="0,21,-0.667,451.667" HorizontalAlignment="Right" Width="584" >
<Label Content="Lista owoców:" FontWeight="Bold" HorizontalAlignment="Left" Margin="10,4,0,0" VerticalAlignment="Top" Width="100"/> <Grid.ColumnDefinitions>
<Button x:Name="prevButton" Content="Poprzednia" HorizontalAlignment="Left" Margin="10,0,0,52" VerticalAlignment="Bottom" Width="105" Click="prevButton_Click"/> <ColumnDefinition Width="92*"/>
<Button x:Name="nextButton" Content="Następna" HorizontalAlignment="Right" Margin="0,0,10,52" VerticalAlignment="Bottom" Width="105" Click="nextButton_Click"/> <ColumnDefinition Width="135*"/>
<ComboBox SelectionChanged="themeCombo_SelectionChanged" x:Name="themeCombo" HorizontalAlignment="Left" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="162"/> <ColumnDefinition Width="166*"/>
<ColumnDefinition Width="96*"/>
<ColumnDefinition Width="95*"/>
</Grid> </Grid.ColumnDefinitions>
</Window> <TextBlock Grid.Column="0" FontSize="10" FontWeight="Bold" FontFamily="Segoe UI Black" TextAlignment="Center" Margin="0,14,7,14" />
<TextBlock Grid.Column="1" Text="NAZWA" FontSize="10" FontWeight="Bold" FontFamily="Segoe UI Black" TextAlignment="Center" Margin="8,14,7.667,14" />
<TextBlock Grid.Column="2" Text="LICZBA" FontSize="10" FontWeight="Bold" FontFamily="Segoe UI Black" TextAlignment="Center" Margin="1.333,14,3.667,14" />
<TextBlock Grid.Column="3" Text="1 SZT." FontSize="10" FontWeight="Bold" FontFamily="Segoe UI Black" TextAlignment="Center" Margin="4.333,14,10.667,14" />
<TextBlock Grid.Column="3" Text="ŁĄCZNIE" FontSize="10" FontWeight="Bold" FontFamily="Segoe UI Black" TextAlignment="Center" Margin="68.333,14,0,14" Grid.ColumnSpan="2" />
</Grid>
<Button Name="sum" Content="Wartość magazynu" Margin="0,0,10,10" VerticalAlignment="Bottom" Height="35" Click="Value_Click" HorizontalAlignment="Right" Width="163"/>
<Label Content="Lista owoców:" FontWeight="Bold" HorizontalAlignment="Left" Margin="10,4,0,0" VerticalAlignment="Top" Width="100"/>
<Button x:Name="prevButton" Content="Poprzednia" HorizontalAlignment="Left" Margin="10,0,0,52" VerticalAlignment="Bottom" Width="105" Click="prevButton_Click"/>
<Button x:Name="nextButton" Content="Następna" HorizontalAlignment="Right" Margin="0,0,10,52" VerticalAlignment="Bottom" Width="105" Click="nextButton_Click"/>
</Grid>
</Window>

17
Magazyn_Client/Magazyn/MainWindow.xaml.cs
View File

@ -25,7 +25,6 @@ namespace Magazyn
{ {
public partial class MainWindow : Window public partial class MainWindow : Window
{ {
public int size = 4; public int size = 4;
public int page = 0; public int page = 0;
@ -37,12 +36,8 @@ namespace Magazyn
public MainWindow() public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
this.Initialized += MainWindow_Initialized; this.Initialized += MainWindow_Initialized; ;
themeCombo.Items.Add("Jasno/Niebieski");
themeCombo.Items.Add("Jasno/Zielony");
themeCombo.Items.Add("Ciemno/Pomarańczowy");
themeCombo.SelectedIndex = 0;
client = new HttpClient(); client = new HttpClient();
} }
@ -158,11 +153,7 @@ namespace Magazyn
RefreshListOfFruits(); RefreshListOfFruits();
} }
private void themeCombo_SelectionChanged(object sender, SelectionChangedEventArgs e)
{ }
var app = App.Current as App;
app.ChangeTheme(themeCombo.SelectedIndex);
}
}
} }

31
Magazyn_Client/Magazyn/Views/FruitView.xaml
View File

@ -6,34 +6,21 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Magazyn.Views" xmlns:local="clr-namespace:Magazyn.Views"
mc:Ignorable="d" Height="64" Width="520">
mc:Ignorable="d" Height="64" Width="575.45">
<materialDesign:Card Background="{DynamicResource SecondaryAccentBrush}"> <materialDesign:Card Background="{DynamicResource SecondaryAccentBrush}">
<Grid> <Grid>
<Image x:Name="fruitImage" HorizontalAlignment="Left" Margin="10,10,0,7" Width="50"/> <Image x:Name="fruitImage" HorizontalAlignment="Left" Margin="10,10,0,7" Width="50"/>
<TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="80,26,0,0" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Top" Width="116"/> <TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="80,26,0,0" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Top" Width="113" TextAlignment="Center"/>
<Image x:Name="minusImage" HorizontalAlignment="Left" Height="24" Margin="240,25,0,0" VerticalAlignment="Top" Width="24" Source="/Images/minus.png" MouseDown="subaddButton_Click" /> <Image x:Name="minusImage" HorizontalAlignment="Left" Height="24" Margin="240,25,0,0" VerticalAlignment="Top" Width="24" Source="/Images/minus.png" MouseDown="subaddButton_Click" />
<Image x:Name="plusImage" HorizontalAlignment="Left" Height="24" Margin="304,25,0,0" VerticalAlignment="Top" Width="24" Source="/Magazyn;component/Images/plus.png" RenderTransformOrigin="0.208,0.521" MouseDown="subaddButton_Click"/> <Image x:Name="plusImage" HorizontalAlignment="Left" Height="24" Margin="304,25,0,0" VerticalAlignment="Top" Width="24" Source="/Magazyn;component/Images/plus.png" RenderTransformOrigin="0.208,0.521" MouseDown="subaddButton_Click"/>
<TextBlock x:Name="fruitAmount" HorizontalAlignment="Left" Margin="267,29,0,19" Width="34" TextAlignment="Center" RenderTransformOrigin="0.489,-0.623"/> <TextBlock x:Name="fruitAmount" HorizontalAlignment="Left" Margin="267,29,0,19" Width="34" TextAlignment="Center" RenderTransformOrigin="0.489,-0.623"/>
<TextBlock x:Name="fruitPrice" Margin="362,26,106,0" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Top" IsEnabled="False"/> <TextBlock x:Name="fruitPrice" Margin="355,29,112.333,0" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Top" IsEnabled="False" TextAlignment="Center"/>
<TextBlock x:Name="allPrice" Margin="425,26,43,0" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Top"/> <TextBlock x:Name="allPrice" Margin="444,29,21.333,0" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Top" TextAlignment="Center"/>
</Grid> </Grid>
</materialDesign:Card> </materialDesign:Card>
<!--<Grid>
<TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="69,0,0,48" TextWrapping="Wrap" Text="fruitName" Width="72"/>
<Button x:Name="subButton" BorderThickness="0" Padding="0" HorizontalAlignment="Left" Margin="138,21,0,27" Width="16" Click="subButton_Click" Background="{x:Null}">
<Image Source="..\Images\sub.png" Stretch="Fill"/>
</Button>
<Button x:Name="addButton" BorderThickness="0" Padding="0" HorizontalAlignment="Left" Margin="180,21,0,27" Width="16" Click="addButton_Click" Background="{x:Null}">
<Image Source="..\Images\add.png"/>
</Button>
<TextBlock x:Name="fruitAmount" HorizontalAlignment="Left" Margin="159,21,0,27" TextWrapping="Wrap" Text="-1" TextAlignment="Center" Width="16"/>
<TextBlock x:Name="fruitPrice" HorizontalAlignment="Left" Margin="69,21,0,27" TextWrapping="Wrap" Text="fruitPrice" Width="64"/>
<Image x:Name="imges" HorizontalAlignment="Left" Height="64" VerticalAlignment="Top" Width="64"/>
<TextBlock x:Name="allPrice" HorizontalAlignment="Left" Margin="206,48,0,0" TextWrapping="Wrap" Text="allPrice" TextAlignment="Center" VerticalAlignment="Top" Width="48"/>
</Grid>-->
</UserControl> </UserControl>

4
Magazyn_Client/Magazyn/Views/FruitView.xaml.cs
View File

@ -37,8 +37,8 @@ namespace Magazyn.Views
fruitName.Text = fruit.Name; fruitName.Text = fruit.Name;
fruitAmount.Text = fruit.Quantity.ToString(); fruitAmount.Text = fruit.Quantity.ToString();
fruitPrice.Text = fruit.Price.ToString(); fruitPrice.Text = fruit.Price.ToString() + "zł";
allPrice.Text = (fruit.Quantity * fruit.Price).ToString(); allPrice.Text = (fruit.Quantity * fruit.Price).ToString() + "zł";
try try
{ {

46
Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
View File

@ -1,23 +1,23 @@
<Window x:Class="Magazyn.Windows.ErrorWindow" <Window x:Class="Magazyn.Windows.ErrorWindow"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
TextElement.Foreground="{DynamicResource MaterialDesignBody}" TextElement.Foreground="{DynamicResource MaterialDesignBody}"
TextElement.FontWeight="Regular" TextElement.FontWeight="Regular"
TextElement.FontSize="13" TextElement.FontSize="13"
TextOptions.TextFormattingMode="Ideal" TextOptions.TextFormattingMode="Ideal"
TextOptions.TextRenderingMode="Auto" TextOptions.TextRenderingMode="Auto"
Background="{DynamicResource MaterialDesignPaper}" Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{DynamicResource MaterialDesignFont}" FontFamily="{DynamicResource MaterialDesignFont}"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Magazyn.Windows" xmlns:local="clr-namespace:Magazyn.Windows"
mc:Ignorable="d" mc:Ignorable="d"
Title="Błąd" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize"> Title="Błąd" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize">
<Grid> <Grid>
<Button x:Name="okButton" Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="okButton_Click"/> <Button x:Name="okButton" Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="okButton_Click"/>
<TextBlock x:Name="messageBlock" FontSize="16" Margin="10,10,10,0" TextWrapping="Wrap" Text="messageBlock" VerticalAlignment="Top"/> <TextBlock x:Name="messageBlock" FontSize="16" Margin="10,10,10,0" TextWrapping="Wrap" Text="messageBlock" VerticalAlignment="Top"/>
</Grid> </Grid>
</Window> </Window>

66
Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs
View File

@ -1,33 +1,33 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Documents; using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using System.Windows.Shapes; using System.Windows.Shapes;
namespace Magazyn.Windows namespace Magazyn.Windows
{ {
/// <summary> /// <summary>
/// Interaction logic for ErrorWindow.xaml /// Interaction logic for ErrorWindow.xaml
/// </summary> /// </summary>
public partial class ErrorWindow : Window public partial class ErrorWindow : Window
{ {
public ErrorWindow(string text) public ErrorWindow(string text)
{ {
InitializeComponent(); InitializeComponent();
messageBlock.Text = text; messageBlock.Text = text;
} }
private void okButton_Click(object sender, RoutedEventArgs e) private void okButton_Click(object sender, RoutedEventArgs e)
{ {
this.Close(); this.Close();
} }
} }
} }

50
Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
View File

@ -1,25 +1,25 @@
<Window x:Class="Magazyn.Windows.ValueWindow" <Window x:Class="Magazyn.Windows.ValueWindow"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
TextElement.Foreground="{DynamicResource MaterialDesignBody}" TextElement.Foreground="{DynamicResource MaterialDesignBody}"
TextElement.FontWeight="Regular" TextElement.FontWeight="Regular"
TextElement.FontSize="13" TextElement.FontSize="13"
TextOptions.TextFormattingMode="Ideal" TextOptions.TextFormattingMode="Ideal"
TextOptions.TextRenderingMode="Auto" TextOptions.TextRenderingMode="Auto"
Background="{DynamicResource MaterialDesignPaper}" Background="{DynamicResource MaterialDesignPaper}"
FontFamily="{DynamicResource MaterialDesignFont}" FontFamily="{DynamicResource MaterialDesignFont}"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Magazyn.Windows" xmlns:local="clr-namespace:Magazyn.Windows"
mc:Ignorable="d" mc:Ignorable="d"
Title="Wartość magazynu" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize"> Title="Wartość magazynu" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize">
<Grid> <Grid>
<Button x:Name="okButton" Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="okButton_Click"/> <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 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 x:Name="valueBlock" FontSize="16" HorizontalAlignment="Left" Margin="10,34,0,0" TextWrapping="Wrap" Text="NaN zł" VerticalAlignment="Top"/>
</Grid> </Grid>
</Window> </Window>

66
Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs
View File

@ -1,33 +1,33 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Documents; using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using System.Windows.Shapes; using System.Windows.Shapes;
namespace Magazyn.Windows namespace Magazyn.Windows
{ {
/// <summary> /// <summary>
/// Interaction logic for ValueWindow.xaml /// Interaction logic for ValueWindow.xaml
/// </summary> /// </summary>
public partial class ValueWindow : Window public partial class ValueWindow : Window
{ {
public ValueWindow(float value) public ValueWindow(float value)
{ {
InitializeComponent(); InitializeComponent();
valueBlock.Text = value.ToString() + " zł"; valueBlock.Text = value.ToString() + " zł";
} }
private void okButton_Click(object sender, RoutedEventArgs e) private void okButton_Click(object sender, RoutedEventArgs e)
{ {
this.Close(); this.Close();
} }
} }
} }