From fc618f11e05169b3ec85d27d801c513c0a2896e5 Mon Sep 17 00:00:00 2001 From: Donatas Adamonis Date: Wed, 17 May 2017 19:12:38 +0200 Subject: defectviewPage --- .../ApartmentManager/ApartmentManager.csproj | 7 ++++ .../ApartmentManager/View/ApartmentDefectPage.xaml | 2 +- .../View/ApartmentDefectPage.xaml.cs | 5 +++ .../View/ApartmentDefectViewPagexaml.xaml | 37 ++++++++++++++++++++++ .../View/ApartmentDefectViewPagexaml.xaml.cs | 30 ++++++++++++++++++ .../ApartmentManager/View/ApartmentNewDefect.xaml | 15 ++------- 6 files changed, 83 insertions(+), 13 deletions(-) create mode 100644 ApartmentManager/ApartmentManager/View/ApartmentDefectViewPagexaml.xaml create mode 100644 ApartmentManager/ApartmentManager/View/ApartmentDefectViewPagexaml.xaml.cs 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 @@ ApartmentDefectPage.xaml + + ApartmentDefectViewPagexaml.xaml + ApartmentNewDefect.xaml @@ -193,6 +196,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile 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 @@ - + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 +{ + /// + /// An empty page that can be used on its own or navigated to within a Frame. + /// + 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 @@ -