From 2f67f8c6afb97c7abe432cf0a051b7505a7d5273 Mon Sep 17 00:00:00 2001 From: Donatas Adamonis Date: Fri, 28 Apr 2017 17:41:49 +0200 Subject: bbd --- ApartmentAdmin | 1 + .../ApartmentManager/ApartmentManager.csproj | 7 ++--- .../View/ApartmentPlanPage.xaml.cs | 30 --------------------- .../View/PersonalInfoPagexaml.xaml | 15 ++++++----- HousingDatabase.ldf | Bin 8388608 -> 8388608 bytes HousingDatabase.mdf | Bin 8388608 -> 8388608 bytes 6 files changed, 13 insertions(+), 40 deletions(-) create mode 160000 ApartmentAdmin delete mode 100644 ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs diff --git a/ApartmentAdmin b/ApartmentAdmin new file mode 160000 index 0000000..f4d7fc3 --- /dev/null +++ b/ApartmentAdmin @@ -0,0 +1 @@ +Subproject commit f4d7fc3fa885184fb073fbae2aea28a476a85b80 diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index 3768365..d053bdb 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -107,9 +107,6 @@ ApartmentPage.xaml - - ApartmentPlanPage.xaml - LoginPage.xaml @@ -138,6 +135,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs deleted file mode 100644 index 45feb63..0000000 --- a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs +++ /dev/null @@ -1,30 +0,0 @@ -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 ApartmentPlanPage : Page - { - public ApartmentPlanPage() - { - this.InitializeComponent(); - } - } -} diff --git a/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml b/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml index de41310..ca652b3 100644 --- a/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml +++ b/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml @@ -10,17 +10,18 @@ - + - + - + + + + + + - - - - diff --git a/HousingDatabase.ldf b/HousingDatabase.ldf index f653838..573b50d 100644 Binary files a/HousingDatabase.ldf and b/HousingDatabase.ldf differ diff --git a/HousingDatabase.mdf b/HousingDatabase.mdf index 14ef64e..f56a5ec 100644 Binary files a/HousingDatabase.mdf and b/HousingDatabase.mdf differ -- cgit v1.2.3 From 27898323659892ab34e12830def3aae9c3f83fb2 Mon Sep 17 00:00:00 2001 From: Donatas Adamonis Date: Fri, 28 Apr 2017 17:46:38 +0200 Subject: personal info page --- .../ApartmentManager/ApartmentManager.csproj | 6 ++--- .../ApartmentManager/View/ApartmentPage.xaml | 2 +- .../ApartmentManager/View/ApartmentPage.xaml.cs | 7 ++++- .../ApartmentManager/View/PersonalInfoPage.xaml | 27 +++++++++++++++++++ .../ApartmentManager/View/PersonalInfoPage.xaml.cs | 30 ++++++++++++++++++++++ .../View/PersonalInfoPagexaml.xaml | 27 ------------------- .../View/PersonalInfoPagexaml.xaml.cs | 30 ---------------------- 7 files changed, 67 insertions(+), 62 deletions(-) create mode 100644 ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml create mode 100644 ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml.cs delete mode 100644 ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml delete mode 100644 ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml.cs diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index d053bdb..240b879 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -110,8 +110,8 @@ LoginPage.xaml - - PersonalInfoPagexaml.xaml + + PersonalInfoPage.xaml @@ -143,7 +143,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml index da8d7dd..c2a3594 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml +++ b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml @@ -19,7 +19,7 @@ + diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs index 32f0079..f977517 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs @@ -29,7 +29,12 @@ namespace ApartmentManager.View private void click(object sender, RoutedEventArgs e) { - Frame.Navigate(typeof(ApartmentPlanPage)); + + } + + private void GotoPernalInfoPage(object sender, RoutedEventArgs e) + { + Frame.Navigate(typeof(PersonalInfoPage)); } } } diff --git a/ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml b/ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml new file mode 100644 index 0000000..5e84fcf --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml.cs b/ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml.cs new file mode 100644 index 0000000..984e8af --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/PersonalInfoPage.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 PersonalInfoPage : Page + { + public PersonalInfoPage() + { + this.InitializeComponent(); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml b/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml deleted file mode 100644 index ca652b3..0000000 --- a/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml.cs b/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml.cs deleted file mode 100644 index 692570e..0000000 --- a/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml.cs +++ /dev/null @@ -1,30 +0,0 @@ -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 PersonalInfoPagexaml : Page - { - public PersonalInfoPagexaml() - { - this.InitializeComponent(); - } - } -} -- cgit v1.2.3 From 9039ee0999a8a54843cd37373dfc07d751860103 Mon Sep 17 00:00:00 2001 From: Donatas Adamonis Date: Fri, 28 Apr 2017 17:55:36 +0200 Subject: User Model --- .../ApartmentManager/ApartmentManager.csproj | 2 +- ApartmentManager/ApartmentManager/Model/Class1.cs | 12 ------- ApartmentManager/ApartmentManager/Model/User.cs | 37 +++++++++++++++++++++ HousingDatabase.ldf | Bin 8388608 -> 8388608 bytes HousingDatabase.mdf | Bin 8388608 -> 8388608 bytes 5 files changed, 38 insertions(+), 13 deletions(-) delete mode 100644 ApartmentManager/ApartmentManager/Model/Class1.cs create mode 100644 ApartmentManager/ApartmentManager/Model/User.cs diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index 240b879..23935b1 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -100,8 +100,8 @@ - + diff --git a/ApartmentManager/ApartmentManager/Model/Class1.cs b/ApartmentManager/ApartmentManager/Model/Class1.cs deleted file mode 100644 index 08e3d73..0000000 --- a/ApartmentManager/ApartmentManager/Model/Class1.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ApartmentManager.Model -{ - class Class1 - { - } -} diff --git a/ApartmentManager/ApartmentManager/Model/User.cs b/ApartmentManager/ApartmentManager/Model/User.cs new file mode 100644 index 0000000..280d959 --- /dev/null +++ b/ApartmentManager/ApartmentManager/Model/User.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ApartmentManager.Model +{ + public class User + { + public string Name { get; set; } + public string LastName { get; set; } + public int Phone { get; set; } + public DateTime BirthDate { get; set; } + public string Email { get; set; } + public int ApartmentNr { get; set; } + + public User() { } + + public User(string Name, string LastName, int Phone, DateTime BirthDate, string Email, int ApartmentNr) + { + this.Name = Name; + this.LastName = LastName; + this.Phone = Phone; + this.BirthDate = BirthDate; + this.Email = Email; + this.ApartmentNr = ApartmentNr; + + } + + //public override string ToString() + //{ + // return string.Format("Hotelno {0} Name {1} Address {2}", Hotel_No, Name, Address); + //} + + } +} diff --git a/HousingDatabase.ldf b/HousingDatabase.ldf index 573b50d..12dcf09 100644 Binary files a/HousingDatabase.ldf and b/HousingDatabase.ldf differ diff --git a/HousingDatabase.mdf b/HousingDatabase.mdf index f56a5ec..25f4551 100644 Binary files a/HousingDatabase.mdf and b/HousingDatabase.mdf differ -- cgit v1.2.3