diff options
6 files changed, 83 insertions, 13 deletions
diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index b2ed700..373b8f7 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -123,6 +123,9 @@ <Compile Include="View\ApartmentDefectPage.xaml.cs"> <DependentUpon>ApartmentDefectPage.xaml</DependentUpon> </Compile> + <Compile Include="View\ApartmentDefectViewPagexaml.xaml.cs"> + <DependentUpon>ApartmentDefectViewPagexaml.xaml</DependentUpon> + </Compile> <Compile Include="View\ApartmentNewDefect.xaml.cs"> <DependentUpon>ApartmentNewDefect.xaml</DependentUpon> </Compile> @@ -193,6 +196,10 @@ <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> + <Page Include="View\ApartmentDefectViewPagexaml.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> <Page Include="View\ApartmentNewDefect.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml index a69fe96..c73065f 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml +++ b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml @@ -65,7 +65,7 @@ </ListView.ItemTemplate> </ListView> <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,15,0,0"> - <Button Content="New Defect" Width="200" Margin="0,0,100,0" ></Button> + <Button Content="New Defect" Width="200" Margin="0,0,100,0" Click="NavigateNewDefect" ></Button> <Button Content="View Defect" Width="200" Margin="0,0,100,0" ></Button> </StackPanel> diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs index 7a157ab..eef6323 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml.cs @@ -26,5 +26,10 @@ namespace ApartmentManager.View { this.InitializeComponent(); } + + private void NavigateNewDefect(object sender, RoutedEventArgs e) + { + Frame.Navigate(typeof(ApartmentNewDefect)); + } } } diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPagexaml.xaml b/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPagexaml.xaml new file mode 100644 index 0000000..42c48a2 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPagexaml.xaml @@ -0,0 +1,37 @@ +<Page + x:Class="ApartmentManager.View.ApartmentDefectViewPagexaml" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:ApartmentManager.View" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d"> + + <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> + <StackPanel> + <StackPanel Orientation="Horizontal" Margin="10,10,10,0"> + <TextBlock Text="Name:" FontSize="30" FontWeight="Bold" Margin="100,0,0,0"></TextBlock> + <TextBlock Text="Defect Name" FontSize="30" FontWeight="Bold" Margin="10,0,0,0"></TextBlock> + <TextBlock Text="Status:" FontSize="30" FontWeight="Bold" Margin="400,0,0,0"></TextBlock> + <TextBlock Text="Defect Status" FontSize="30" FontWeight="Bold" Margin="10,0,0,0"></TextBlock> + </StackPanel> + <StackPanel Orientation="Horizontal" Margin="20"> + <StackPanel Width="620"> + <TextBlock Text="Defect Pictures" FontSize="30" FontWeight="Bold" Margin="10,0,0,0"></TextBlock> + <ListView ></ListView> + </StackPanel> + <StackPanel Width="620"> + <TextBlock Text="Description" FontSize="30" FontWeight="Bold" Margin="10,0,0,0"></TextBlock> + <TextBox Height="400" Margin="0,10,0,0"></TextBox> + + </StackPanel> + + + </StackPanel> + <ListView Width="600" Height="200"></ListView> + + + + </StackPanel> + </Grid> +</Page> diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPagexaml.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPagexaml.xaml.cs new file mode 100644 index 0000000..beffd9c --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/ApartmentDefectViewPagexaml.xaml.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 + +namespace ApartmentManager.View +{ + /// <summary> + /// An empty page that can be used on its own or navigated to within a Frame. + /// </summary> + public sealed partial class ApartmentDefectViewPagexaml : Page + { + public ApartmentDefectViewPagexaml() + { + this.InitializeComponent(); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml b/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml index c6332e1..770a132 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml +++ b/ApartmentManager/ApartmentManager/View/ApartmentNewDefect.xaml @@ -21,19 +21,12 @@ <StackPanel Margin="0,5,30,0"> <StackPanel Orientation="Horizontal" > - <Image Height="200" Width="355" Source="{Binding NewDefect.Picture}" /> <Button Content="Upload Picture" Margin="30,0,0,0"/> </StackPanel> - <StackPanel Orientation="Horizontal" Margin="0,30,0,0"> - <Image Height="200" Width="355" Source="{Binding NewDefect.Picture2}" /> - <Button Content="Upload Picture" Margin="30,0,0,0"/> - </StackPanel> + <StackPanel Orientation="Horizontal" Margin="0,30,0,0"/> - <StackPanel Orientation="Horizontal" Margin="0,30,0,0"> - <Image Height="200" Width="355" Source="{Binding NewDefect.Picture3}" /> - <Button Content="Upload Picture" Margin="30,0,0,0"/> - </StackPanel> + <StackPanel Orientation="Horizontal" Margin="0,30,0,0"/> </StackPanel> @@ -41,9 +34,7 @@ <TextBlock Margin="0,10,0,10" Text="Name"/> <TextBox Text="{Binding NewDefect.Name, Mode=TwoWay}" /> <TextBlock Margin="0,10,0,10" Text="Description"/> - <TextBox Text="{Binding NewDefect.Description, Mode=TwoWay}" Height="140" /> - <TextBlock Margin="0,10,0,10" Text="Comment"/> - <TextBox Text="{Binding NewDefect.Comment, Mode=TwoWay}" Height="300" /> + <TextBox Text="{Binding NewDefect.Description, Mode=TwoWay}" Height="417" /> <Button Margin="0,20,0,0" Content="Create" HorizontalAlignment="Stretch"/> </StackPanel> |