From cec5a430e936133bc44fa7c571ccf8077a0babd4 Mon Sep 17 00:00:00 2001 From: Paulius Klezys Date: Mon, 15 May 2017 11:41:36 +0200 Subject: =?UTF-8?q?Naems=20=C4=8Danged.=20Nating=20els?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApartmentManager/ApartmentManager.csproj | 18 +- ApartmentManager/ApartmentManager/AppShell.xaml.cs | 4 +- .../Handler/BoardApartmentsHandler.cs | 71 ----- .../ApartmentManager/Handler/BoardMemberHandler.cs | 128 +++++++++ .../Handler/BoardResidentsHandler.cs | 78 ++--- .../Singletons/ApartmentsCatalogSingleton.cs | 45 --- .../Singletons/BoardMemberCatalogSingleton.cs | 46 +++ .../View/BoardMemberCreateApartmentPage.xaml | 35 +++ .../View/BoardMemberCreateApartmentPage.xaml.cs | 30 ++ .../View/BoardMemberManageApartment.xaml | 8 +- .../View/BoardMemberManageApartment.xaml.cs | 2 +- .../View/BoardMembersDefectsPage.xaml | 18 +- .../View/BoardMembersMainPage.xaml | 29 ++ .../View/BoardMembersMainPage.xaml.cs | 45 +++ .../ApartmentManager/View/BoardMembersPage.xaml | 29 -- .../ApartmentManager/View/BoardMembersPage.xaml.cs | 45 --- .../ApartmentManager/View/CreateApartmentPage.xaml | 35 --- .../View/CreateApartmentPage.xaml.cs | 30 -- .../View/DefectsPicturesBoard.xaml | 6 +- .../ApartmentManager/View/InfoForBoardMembers.xaml | 4 +- .../ViewModel/ApartmenViewModel.cs | 2 +- .../ViewModel/ApartmentsViewModel.cs | 96 ------- .../ViewModel/BoardMemberViewModel.cs | 103 +++++++ .../ApartmentManager/ViewModel/LoginViewModel.cs | 2 +- .../HousingWebApi/HousingWebApi.csproj | 320 --------------------- 25 files changed, 486 insertions(+), 743 deletions(-) delete mode 100644 ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs create mode 100644 ApartmentManager/ApartmentManager/Handler/BoardMemberHandler.cs delete mode 100644 ApartmentManager/ApartmentManager/Singletons/ApartmentsCatalogSingleton.cs create mode 100644 ApartmentManager/ApartmentManager/Singletons/BoardMemberCatalogSingleton.cs create mode 100644 ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml create mode 100644 ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml.cs create mode 100644 ApartmentManager/ApartmentManager/View/BoardMembersMainPage.xaml create mode 100644 ApartmentManager/ApartmentManager/View/BoardMembersMainPage.xaml.cs delete mode 100644 ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml delete mode 100644 ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs delete mode 100644 ApartmentManager/ApartmentManager/View/CreateApartmentPage.xaml delete mode 100644 ApartmentManager/ApartmentManager/View/CreateApartmentPage.xaml.cs delete mode 100644 ApartmentManager/ApartmentManager/ViewModel/ApartmentsViewModel.cs create mode 100644 ApartmentManager/ApartmentManager/ViewModel/BoardMemberViewModel.cs delete mode 100644 ApartmentManager/HousingWebApi/HousingWebApi.csproj diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index 54a0248..b2ed700 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -100,13 +100,13 @@ - + - + @@ -117,7 +117,7 @@ - + @@ -135,11 +135,11 @@ BoardMembersDefectsPage.xaml - - BoardMembersPage.xaml + + BoardMembersMainPage.xaml - - CreateApartmentPage.xaml + + BoardMemberCreateApartmentPage.xaml DefectsPicturesBoard.xaml @@ -209,11 +209,11 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/ApartmentManager/ApartmentManager/AppShell.xaml.cs b/ApartmentManager/ApartmentManager/AppShell.xaml.cs index 121989c..746f61e 100644 --- a/ApartmentManager/ApartmentManager/AppShell.xaml.cs +++ b/ApartmentManager/ApartmentManager/AppShell.xaml.cs @@ -62,7 +62,7 @@ namespace ApartmentManager { Symbol = Symbol.Home, Label = "Home", - DestPage = typeof(BoardMembersPage), + DestPage = typeof(BoardMembersMainPage), IsSelected = true }, @@ -86,7 +86,7 @@ namespace ApartmentManager { Symbol = Symbol.Bookmarks, Label = "Apartments", - DestPage = typeof(BoardMembersPage), + DestPage = typeof(BoardMembersMainPage), IsSelected = false } }); diff --git a/ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs b/ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs deleted file mode 100644 index 266ba5a..0000000 --- a/ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; -using Windows.UI.Popups; -using ApartmentManager.Model; -using ApartmentManager.Persistency; -using ApartmentManager.ViewModel; -using Newtonsoft.Json; - -namespace ApartmentManager.Handler -{ - public class BoardApartmentsHandler - { - public ApartmentsViewModel ApartmentsViewModel { get; set; } - - public BoardApartmentsHandler(ApartmentsViewModel apartmentsViewModel) - { - ApartmentsViewModel = apartmentsViewModel; - } - - public void GetApartments() - { - Apartment apartment = new Apartment(); - apartment.ApartmentNumber = ApartmentsViewModel.ApartmentsNumber; - - var apartmentsFromDatabase = ApiClient.GetData("api/apartmentsList/" + apartment.ApartmentNumber); - IEnumerable apartmentslist = JsonConvert.DeserializeObject>(apartmentsFromDatabase); - - ApartmentsViewModel.ApartmentsCatalogSingleton.Apartment.Clear(); - ApartmentsViewModel.NewApartment = new Apartment(); - foreach (var apartment2 in apartmentslist) - { - ApartmentsViewModel.ApartmentsCatalogSingleton.Apartment.Add(apartment2); - } - } - - public void CreateApartment() - { - try - { - Apartment apartment = new Apartment(); - apartment.ApartmentNumber = ApartmentsViewModel.ApartmentsNumber; - apartment.Address = ApartmentsViewModel.NewApartment.Address; - apartment.Floor = ApartmentsViewModel.NewApartment.Floor; - apartment.MonthlyCharge = ApartmentsViewModel.NewApartment.MonthlyCharge; - apartment.NumberOfRooms = ApartmentsViewModel.NewApartment.NumberOfRooms; - apartment.Size = ApartmentsViewModel.NewApartment.Size; - - ApiClient.PostData("api/apartments/", apartment); - - var apartmentsFromDatabase = ApiClient.GetData("api/apartmentsList/" + apartment.ApartmentNumber); - IEnumerable apartmentlist = JsonConvert.DeserializeObject>(apartmentsFromDatabase); - - ApartmentsViewModel.ApartmentsCatalogSingleton.Apartment.Clear(); - ApartmentsViewModel.NewApartment = new Apartment(); - foreach (var apartment2 in apartmentlist) - { - ApartmentsViewModel.ApartmentsCatalogSingleton.Apartment.Add(apartment2); - } - - } - catch (Exception e) - { - new MessageDialog(e.Message).ShowAsync(); - } - } - } -} diff --git a/ApartmentManager/ApartmentManager/Handler/BoardMemberHandler.cs b/ApartmentManager/ApartmentManager/Handler/BoardMemberHandler.cs new file mode 100644 index 0000000..db6223d --- /dev/null +++ b/ApartmentManager/ApartmentManager/Handler/BoardMemberHandler.cs @@ -0,0 +1,128 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; +using Windows.UI.Popups; +using ApartmentManager.Model; +using ApartmentManager.Persistency; +using ApartmentManager.ViewModel; +using Newtonsoft.Json; + +namespace ApartmentManager.Handler +{ + public class BoardMemberHandler + { + public BoardMemberViewModel BoardMemberViewModel { get; set; } + + public BoardMemberHandler(BoardMemberViewModel boardMemberViewModel) + { + BoardMemberViewModel = boardMemberViewModel; + } + + public void GetApartments() + { + Apartment apartment= new Apartment(); + apartment.ApartmentNumber = BoardMemberViewModel.ApartmentsNumber; + + var apartmentsFromDatabase = ApiClient.GetData("api/Apartments/"); + IEnumerable apartmentslist = JsonConvert.DeserializeObject>(apartmentsFromDatabase); + + BoardMemberViewModel.BoardMemberCatalogSingleton.Apartment.Clear(); + BoardMemberViewModel.NewApartment = new Apartment(); + foreach (var apartment2 in apartmentslist) + { + BoardMemberViewModel.BoardMemberCatalogSingleton.Apartment.Add(apartment2); + } + } + + public void CreateApartment() + { + try + { + Apartment apartment = new Apartment(); + apartment.ApartmentNumber = BoardMemberViewModel.ApartmentsNumber; + apartment.Address = BoardMemberViewModel.NewApartment.Address; + apartment.Floor = BoardMemberViewModel.NewApartment.Floor; + apartment.MonthlyCharge = BoardMemberViewModel.NewApartment.MonthlyCharge; + apartment.NumberOfRooms = BoardMemberViewModel.NewApartment.NumberOfRooms; + apartment.Size = BoardMemberViewModel.NewApartment.Size; + + ApiClient.PostData("api/Apartments/", apartment); + + var apartmentsFromDatabase = ApiClient.GetData("api/Apartments/" + apartment.ApartmentNumber); + IEnumerable apartmentlist = JsonConvert.DeserializeObject>(apartmentsFromDatabase); + + BoardMemberViewModel.BoardMemberCatalogSingleton.Apartment.Clear(); + BoardMemberViewModel.NewApartment = new Apartment(); + foreach (var apartment2 in apartmentlist) + { + BoardMemberViewModel.BoardMemberCatalogSingleton.Apartment.Add(apartment2); + } + } + catch (Exception e) + { + new MessageDialog(e.Message).ShowAsync(); + } + } + public void UpdateApartment() + { + try + { + Apartment apartment = new Apartment(); + apartment.ApartmentNumber = BoardMemberViewModel.ApartmentsNumber; + apartment.Address = BoardMemberViewModel.NewApartment.Address; + apartment.Floor = BoardMemberViewModel.NewApartment.Floor; + apartment.MonthlyCharge = BoardMemberViewModel.NewApartment.MonthlyCharge; + apartment.NumberOfRooms = BoardMemberViewModel.NewApartment.NumberOfRooms; + apartment.Size = BoardMemberViewModel.NewApartment.Size; + + ApiClient.PutData("api/Apartments/" + apartment.ApartmentNumber, apartment); + var apartmentsFromDatabase = ApiClient.GetData("api/Apartments/" + apartment.ApartmentNumber); + IEnumerable apartmentslist = JsonConvert.DeserializeObject>(apartmentsFromDatabase); + + BoardMemberViewModel.BoardMemberCatalogSingleton.Apartment.Clear(); + BoardMemberViewModel.NewApartment = new Apartment(); + foreach (var apartment2 in apartmentslist) + { + BoardMemberViewModel.BoardMemberCatalogSingleton.Apartment.Add(apartment2); + } + } + catch (Exception e) + { + new MessageDialog(e.Message).ShowAsync(); + } + } + public void DeleteApartment() + { + try + { + Apartment apartment = new Apartment(); + apartment.ApartmentNumber = BoardMemberViewModel.ApartmentsNumber; + apartment.Address = BoardMemberViewModel.NewApartment.Address; + apartment.Floor = BoardMemberViewModel.NewApartment.Floor; + apartment.MonthlyCharge = BoardMemberViewModel.NewApartment.MonthlyCharge; + apartment.NumberOfRooms = BoardMemberViewModel.NewApartment.NumberOfRooms; + apartment.Size = BoardMemberViewModel.NewApartment.Size; + + ApiClient.DeleteData("api/Apartments/" + apartment.ApartmentNumber); + + var apartmentsFromDatabase = ApiClient.GetData("api/Apartments/" + apartment.ApartmentNumber); + IEnumerable apartmentslist = JsonConvert.DeserializeObject>(apartmentsFromDatabase); + + BoardMemberViewModel.BoardMemberCatalogSingleton.Apartment.Clear(); + BoardMemberViewModel.NewApartment = new Apartment(); + foreach (var apartment2 in apartmentslist) + { + BoardMemberViewModel.BoardMemberCatalogSingleton.Apartment.Add(apartment2); + } + } + catch (Exception e) + { + new MessageDialog(e.Message).ShowAsync(); + } + } + } +} diff --git a/ApartmentManager/ApartmentManager/Handler/BoardResidentsHandler.cs b/ApartmentManager/ApartmentManager/Handler/BoardResidentsHandler.cs index cf7deaf..b012ce1 100644 --- a/ApartmentManager/ApartmentManager/Handler/BoardResidentsHandler.cs +++ b/ApartmentManager/ApartmentManager/Handler/BoardResidentsHandler.cs @@ -13,25 +13,25 @@ namespace ApartmentManager.Handler { public class BoardResidentsHandler { - public ApartmentsViewModel ApartmentsViewModel { get; set; } + public BoardMemberViewModel BoardMemberViewModel { get; set; } - public BoardResidentsHandler(ApartmentsViewModel apartmentsViewModel) + public BoardResidentsHandler(BoardMemberViewModel boardMemberViewModel) { - ApartmentsViewModel = apartmentsViewModel; + BoardMemberViewModel = boardMemberViewModel; } public void GetApartmentsResidents() { Resident resident = new Resident(); - resident.ApartmentNr = ApartmentsViewModel.ApartmentsNumber; + resident.ApartmentNr = BoardMemberViewModel.ApartmentsNumber; var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); IEnumerable residentlist = JsonConvert.DeserializeObject>(residentsFromDatabase); - ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Clear(); - ApartmentsViewModel.NewResident = new Resident(); + BoardMemberViewModel.BoardMemberCatalogSingleton.Residents.Clear(); + BoardMemberViewModel.NewResident = new Resident(); foreach (var resident2 in residentlist) { - ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Add(resident2); + BoardMemberViewModel.BoardMemberCatalogSingleton.Residents.Add(resident2); } } @@ -41,24 +41,24 @@ namespace ApartmentManager.Handler { Resident resident = new Resident(); - resident.ApartmentNr = ApartmentsViewModel.ApartmentsNumber; - resident.FirstName = ApartmentsViewModel.NewResident.FirstName; - resident.LastName = ApartmentsViewModel.NewResident.LastName; - resident.BirthDate = ApartmentsViewModel.NewResident.BirthDate; - resident.Email = ApartmentsViewModel.NewResident.Email; - resident.Picture = ApartmentsViewModel.NewResident.Picture; - resident.Phone = ApartmentsViewModel.NewResident.Phone; + resident.ApartmentNr = BoardMemberViewModel.ApartmentsNumber; + resident.FirstName = BoardMemberViewModel.NewResident.FirstName; + resident.LastName = BoardMemberViewModel.NewResident.LastName; + resident.BirthDate = BoardMemberViewModel.NewResident.BirthDate; + resident.Email = BoardMemberViewModel.NewResident.Email; + resident.Picture = BoardMemberViewModel.NewResident.Picture; + resident.Phone = BoardMemberViewModel.NewResident.Phone; ApiClient.PostData("api/residents/", resident); var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); IEnumerable residentlist = JsonConvert.DeserializeObject>(residentsFromDatabase); - ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Clear(); - ApartmentsViewModel.NewResident = new Resident(); + BoardMemberViewModel.BoardMemberCatalogSingleton.Residents.Clear(); + BoardMemberViewModel.NewResident = new Resident(); foreach (var resident2 in residentlist) { - ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Add(resident2); + BoardMemberViewModel.BoardMemberCatalogSingleton.Residents.Add(resident2); } } catch (Exception e) @@ -72,25 +72,25 @@ namespace ApartmentManager.Handler try { Resident resident = new Resident(); - resident.ResidentNr = ApartmentsViewModel.NewResident.ResidentNr; - resident.ApartmentNr = ApartmentsViewModel.ApartmentsNumber; - resident.FirstName = ApartmentsViewModel.NewResident.FirstName; - resident.LastName = ApartmentsViewModel.NewResident.LastName; - resident.BirthDate = ApartmentsViewModel.NewResident.BirthDate; - resident.Email = ApartmentsViewModel.NewResident.Email; - resident.Picture = ApartmentsViewModel.NewResident.Picture; - resident.Phone = ApartmentsViewModel.NewResident.Phone; + resident.ResidentNr = BoardMemberViewModel.NewResident.ResidentNr; + resident.ApartmentNr = BoardMemberViewModel.ApartmentsNumber; + resident.FirstName = BoardMemberViewModel.NewResident.FirstName; + resident.LastName = BoardMemberViewModel.NewResident.LastName; + resident.BirthDate = BoardMemberViewModel.NewResident.BirthDate; + resident.Email = BoardMemberViewModel.NewResident.Email; + resident.Picture = BoardMemberViewModel.NewResident.Picture; + resident.Phone = BoardMemberViewModel.NewResident.Phone; ApiClient.DeleteData("api/residents/" + resident.ResidentNr); var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); IEnumerable residentlist = JsonConvert.DeserializeObject>(residentsFromDatabase); - ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Clear(); - ApartmentsViewModel.NewResident = new Resident(); + BoardMemberViewModel.BoardMemberCatalogSingleton.Residents.Clear(); + BoardMemberViewModel.NewResident = new Resident(); foreach (var resident2 in residentlist) { - ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Add(resident2); + BoardMemberViewModel.BoardMemberCatalogSingleton.Residents.Add(resident2); } } catch (Exception e) @@ -103,24 +103,24 @@ namespace ApartmentManager.Handler try { Resident resident = new Resident(); - resident.ResidentNr = ApartmentsViewModel.NewResident.ResidentNr; - resident.ApartmentNr = ApartmentsViewModel.ApartmentsNumber; - resident.FirstName = ApartmentsViewModel.NewResident.FirstName; - resident.LastName = ApartmentsViewModel.NewResident.LastName; - resident.BirthDate = ApartmentsViewModel.NewResident.BirthDate; - resident.Email = ApartmentsViewModel.NewResident.Email; - resident.Picture = ApartmentsViewModel.NewResident.Picture; - resident.Phone = ApartmentsViewModel.NewResident.Phone; + resident.ResidentNr = BoardMemberViewModel.NewResident.ResidentNr; + resident.ApartmentNr = BoardMemberViewModel.ApartmentsNumber; + resident.FirstName = BoardMemberViewModel.NewResident.FirstName; + resident.LastName = BoardMemberViewModel.NewResident.LastName; + resident.BirthDate = BoardMemberViewModel.NewResident.BirthDate; + resident.Email = BoardMemberViewModel.NewResident.Email; + resident.Picture = BoardMemberViewModel.NewResident.Picture; + resident.Phone = BoardMemberViewModel.NewResident.Phone; ApiClient.PutData("api/residents/" + resident.ResidentNr, resident); var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); IEnumerable residentlist = JsonConvert.DeserializeObject>(residentsFromDatabase); - ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Clear(); - ApartmentsViewModel.NewResident = new Resident(); + BoardMemberViewModel.BoardMemberCatalogSingleton.Residents.Clear(); + BoardMemberViewModel.NewResident = new Resident(); foreach (var resident2 in residentlist) { - ApartmentsViewModel.ApartmentsCatalogSingleton.Residents.Add(resident2); + BoardMemberViewModel.BoardMemberCatalogSingleton.Residents.Add(resident2); } } catch (Exception e) diff --git a/ApartmentManager/ApartmentManager/Singletons/ApartmentsCatalogSingleton.cs b/ApartmentManager/ApartmentManager/Singletons/ApartmentsCatalogSingleton.cs deleted file mode 100644 index 8afbeb3..0000000 --- a/ApartmentManager/ApartmentManager/Singletons/ApartmentsCatalogSingleton.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Media.Imaging; - -namespace ApartmentManager.Model -{ - public class ApartmentsCatalogSingleton - { - private static ApartmentsCatalogSingleton instance = new ApartmentsCatalogSingleton(); - - public static ApartmentsCatalogSingleton Instance => instance; - - public ObservableCollection Apartment { get; set; } - public ObservableCollection User { get; set; } - public ObservableCollection Residents { get; set; } - public ObservableCollection Defects { get; set; } - private ApartmentsCatalogSingleton() - { - User = new ObservableCollection(); - User.Add(new User("Bibis", "Kiausiai", "3214568", new DateTime(2017, 1, 5, 2, 27, 0), "Bibis@mail.com", 1)); - - Apartment = new ObservableCollection(); - //Apartment.Add(new Apartment(1, "30 Square meters", 2, "200", 0, "adresas")); - //Apartment.Add(new Apartment(2, "40 Square meters", 4, "300", 1, "kvaerkebyvej")); - //Apartment.Add(new Apartment(3, "28 Square meters", 1, "125", 0, "ugandavej")); - - Residents = new ObservableCollection(); - //Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); - //Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); - //Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); - //Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); - - Defects = new ObservableCollection(); - Defects.Add(new Defect(1, 2, "Leaking downpipe", DateTime.Now, new Image(), new Image(), new Image(), "downpipe will explode, do something!", "hello", "Not fixed")); - Defects.Add(new Defect(1, 2, "Leaking downpipe", DateTime.Now, new Image(), new Image(), new Image(), "downpipe will explode, do something!", "hello", "Not fixed")); - Defects.Add(new Defect(1, 2, "Leaking downpipe", DateTime.Now, new Image(), new Image(), new Image(), "downpipe will explode, do something!", "hello", "Fixed")); - } - } -} diff --git a/ApartmentManager/ApartmentManager/Singletons/BoardMemberCatalogSingleton.cs b/ApartmentManager/ApartmentManager/Singletons/BoardMemberCatalogSingleton.cs new file mode 100644 index 0000000..1a563ef --- /dev/null +++ b/ApartmentManager/ApartmentManager/Singletons/BoardMemberCatalogSingleton.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Media.Imaging; + +namespace ApartmentManager.Model +{ + public class BoardMemberCatalogSingleton + { + private static BoardMemberCatalogSingleton instance = new BoardMemberCatalogSingleton(); + + public static BoardMemberCatalogSingleton Instance => instance; + + public ObservableCollection Apartment { get; set; } + public ObservableCollection User { get; set; } + public ObservableCollection Residents { get; set; } + public ObservableCollection Defects { get; set; } + private BoardMemberCatalogSingleton() + { + Apartment = new ObservableCollection(); + + User = new ObservableCollection(); + //User.Add(new User("Bibis", "Kiausiai", "3214568", new DateTime(2017, 1, 5, 2, 27, 0), "Bibis@mail.com", 1)); + //Apartment = new ObservableCollection(); + //Apartment.Add(new Apartment(1, "30 Square meters", 2, "200", 0, "adresas")); + //Apartment.Add(new Apartment(2, "40 Square meters", 4, "300", 1, "kvaerkebyvej")); + //Apartment.Add(new Apartment(3, "28 Square meters", 1, "125", 0, "ugandavej")); + + Residents = new ObservableCollection(); + //Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); + //Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); + //Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); + //Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); + + Defects = new ObservableCollection(); + //Defects.Add(new Defect(1, 2, "Leaking downpipe", DateTime.Now, new Image(), new Image(), new Image(), "downpipe will explode, do something!", "hello", "Not fixed")); + //Defects.Add(new Defect(1, 2, "Leaking downpipe", DateTime.Now, new Image(), new Image(), new Image(), "downpipe will explode, do something!", "hello", "Not fixed")); + //Defects.Add(new Defect(1, 2, "Leaking downpipe", DateTime.Now, new Image(), new Image(), new Image(), "downpipe will explode, do something!", "hello", "Fixed")); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml new file mode 100644 index 0000000..d243381 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml.cs new file mode 100644 index 0000000..8098474 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.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 BoardMemberCreateApartmentPage : Page + { + public BoardMemberCreateApartmentPage() + { + this.InitializeComponent(); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml index 6dc4d48..49923cf 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml +++ b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml @@ -10,22 +10,20 @@ - + - - - + - + diff --git a/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml.cs b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml.cs index b76d732..e275537 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml.cs @@ -34,7 +34,7 @@ namespace ApartmentManager.View private void CreateApartment(object sender, RoutedEventArgs e) { - this.Frame.Navigate(typeof(CreateApartmentPage)); + this.Frame.Navigate(typeof(BoardMemberCreateApartmentPage)); } } } diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml b/ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml index 58b0f3d..28766d5 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml +++ b/ApartmentManager/ApartmentManager/View/BoardMembersDefectsPage.xaml @@ -9,20 +9,20 @@ mc:Ignorable="d"> - + - + - - - - - - - + + + + + + + diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersMainPage.xaml b/ApartmentManager/ApartmentManager/View/BoardMembersMainPage.xaml new file mode 100644 index 0000000..0cc58ab --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/BoardMembersMainPage.xaml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + - - - diff --git a/ApartmentManager/ApartmentManager/View/CreateApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/CreateApartmentPage.xaml.cs deleted file mode 100644 index cc469d5..0000000 --- a/ApartmentManager/ApartmentManager/View/CreateApartmentPage.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 CreateApartmentPage : Page - { - public CreateApartmentPage() - { - this.InitializeComponent(); - } - } -} diff --git a/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml b/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml index e77d634..aea4544 100644 --- a/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml +++ b/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml @@ -9,7 +9,7 @@ mc:Ignorable="d"> - + @@ -21,9 +21,9 @@ - + - + diff --git a/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml b/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml index f7ae5f5..e5400a1 100644 --- a/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml +++ b/ApartmentManager/ApartmentManager/View/InfoForBoardMembers.xaml @@ -9,14 +9,14 @@ mc:Ignorable="d"> - + - + diff --git a/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs b/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs index 8083eaa..eceed48 100644 --- a/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs +++ b/ApartmentManager/ApartmentManager/ViewModel/ApartmenViewModel.cs @@ -41,7 +41,7 @@ namespace ApartmentManager.ViewModel ApartmentHandler = new ApartmentHandler(this); CatalogSingleton = CatalogSingleton.Instance; UserSingleton = UserSingleton.Instance; - ApartmentNumber = UserSingleton.CurrentUser.ApartmentNr; + //ApartmentNumber = UserSingleton.CurrentUser.ApartmentNr; UploadResidentPhoto = new RelayCommand(ApartmentHandler.UploadResidentPhoto); CreateResidentCommand = new RelayCommand(ApartmentHandler.CreateResident); diff --git a/ApartmentManager/ApartmentManager/ViewModel/ApartmentsViewModel.cs b/ApartmentManager/ApartmentManager/ViewModel/ApartmentsViewModel.cs deleted file mode 100644 index 2ee6c20..0000000 --- a/ApartmentManager/ApartmentManager/ViewModel/ApartmentsViewModel.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Runtime.CompilerServices; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Input; -using ApartmentManager.Annotations; -using ApartmentManager.Common; -using ApartmentManager.Model; - -namespace ApartmentManager.ViewModel -{ - public class ApartmentsViewModel : INotifyPropertyChanged - { - public ApartmentsCatalogSingleton ApartmentsCatalogSingleton { get; set; } - private User _newUser; - private Resident _newResident; - private Apartment _newApartment; - private Defect _newDefect; - - public static int ApartmentsNumber { get; set; } - public Handler.BoardApartmentsHandler BoardApartmentsHandler { get; set; } - - public Handler.BoardResidentsHandler BoardResidentsHandler { get; set; } - - public ICommand CreateApartmentCommand { get; set; } - public ICommand DeleteApartmentCommand { get; set; } - public ICommand UpdateApartmentCommand { get; set; } - - public ICommand DeleteDefectCommand { get; set; } - - public ApartmentsViewModel() - { - NewUser = new User(); - NewResident = new Resident(); - NewApartment = new Apartment(); - NewDefect = new Defect(); - BoardResidentsHandler = new Handler.BoardResidentsHandler(this); - BoardApartmentsHandler = new Handler.BoardApartmentsHandler(this); - ApartmentsCatalogSingleton = ApartmentsCatalogSingleton.Instance; - ApartmentsNumber = ApartmentsCatalogSingleton.User[0].ApartmentNr; - CreateApartmentCommand = new RelayCommand(BoardApartmentsHandler.CreateApartment); - BoardApartmentsHandler.GetApartments(); - BoardResidentsHandler.GetApartmentsResidents(); - } - - public User NewUser - { - get => _newUser; - set - { - _newUser = value; - OnPropertyChanged(); - } - } - public Resident NewResident - { - get => _newResident; - set - { - _newResident = value; - OnPropertyChanged(); - } - } - - public Apartment NewApartment - { - get => _newApartment; - set - { - _newApartment = value; - OnPropertyChanged(); - } - } - - public Defect NewDefect - { - get => _newDefect; - set - { - _newDefect = value; - OnPropertyChanged(); - } - } - - public event PropertyChangedEventHandler PropertyChanged; - - [NotifyPropertyChangedInvocator] - protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null) - { - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); - } - } -} diff --git a/ApartmentManager/ApartmentManager/ViewModel/BoardMemberViewModel.cs b/ApartmentManager/ApartmentManager/ViewModel/BoardMemberViewModel.cs new file mode 100644 index 0000000..293e4bf --- /dev/null +++ b/ApartmentManager/ApartmentManager/ViewModel/BoardMemberViewModel.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Input; +using ApartmentManager.Annotations; +using ApartmentManager.Common; +using ApartmentManager.Model; + +namespace ApartmentManager.ViewModel +{ + public class BoardMemberViewModel : INotifyPropertyChanged + { + public BoardMemberCatalogSingleton BoardMemberCatalogSingleton { get; set; } + + public UserSingleton UserSingleton { get; set; } + private User _newUser; + private Resident _newResident; + private Apartment _newApartment; + private Defect _newDefect; + + public static int ApartmentsNumber { get; set; } + public Handler.BoardMemberHandler BoardMemberHandler { get; set; } + + public Handler.BoardResidentsHandler BoardResidentsHandler { get; set; } + + public ICommand CreateApartmentCommand { get; set; } + public ICommand DeleteApartmentCommand { get; set; } + public ICommand UpdateApartmentCommand { get; set; } + + public ICommand DeleteDefectCommand { get; set; } + + public BoardMemberViewModel() + { + NewUser = new User(); + NewResident = new Resident(); + NewApartment = new Apartment(); + NewDefect = new Defect(); + + BoardResidentsHandler = new Handler.BoardResidentsHandler(this); + BoardMemberHandler = new Handler.BoardMemberHandler(this); + BoardMemberCatalogSingleton = BoardMemberCatalogSingleton.Instance; + UserSingleton = UserSingleton.Instance; + ApartmentsNumber = UserSingleton.CurrentUser.ApartmentNr; + + CreateApartmentCommand = new RelayCommand(BoardMemberHandler.CreateApartment); + DeleteApartmentCommand = new RelayCommand(BoardMemberHandler.DeleteApartment); + UpdateApartmentCommand = new RelayCommand(BoardMemberHandler.UpdateApartment); + BoardMemberHandler.GetApartments(); + BoardResidentsHandler.GetApartmentsResidents(); + } + + public User NewUser + { + get => _newUser; + set + { + _newUser = value; + OnPropertyChanged(); + } + } + public Resident NewResident + { + get => _newResident; + set + { + _newResident = value; + OnPropertyChanged(); + } + } + + public Apartment NewApartment + { + get => _newApartment; + set + { + _newApartment = value; + OnPropertyChanged(); + } + } + + public Defect NewDefect + { + get => _newDefect; + set + { + _newDefect = value; + OnPropertyChanged(); + } + } + + public event PropertyChangedEventHandler PropertyChanged; + + [NotifyPropertyChangedInvocator] + protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null) + { + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + } + } +} diff --git a/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs b/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs index cb8dfbb..ff50a42 100644 --- a/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs +++ b/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs @@ -69,7 +69,7 @@ namespace ApartmentManager.ViewModel { // When the navigation stack isn't restored, navigate to the first page // suppressing the initial entrance animation. - if (UserSingleton.Instance.CurrentUser.Type == "B") appShell.AppFrame.Navigate(typeof(BoardMembersPage)); + if (UserSingleton.Instance.CurrentUser.Type == "B") appShell.AppFrame.Navigate(typeof(BoardMembersMainPage)); else appShell.AppFrame.Navigate(typeof(ApartmentPage)); } diff --git a/ApartmentManager/HousingWebApi/HousingWebApi.csproj b/ApartmentManager/HousingWebApi/HousingWebApi.csproj deleted file mode 100644 index 3c002fd..0000000 --- a/ApartmentManager/HousingWebApi/HousingWebApi.csproj +++ /dev/null @@ -1,320 +0,0 @@ - - - - - - - Debug - AnyCPU - - - 2.0 - {D777744A-9676-4193-BD59-6F30C724C87A} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - HousingWebApi - HousingWebApi - v4.5.2 - false - true - - - - - - - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - - - true - pdbonly - true - bin\ - TRACE - prompt - 4 - - - - ..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll - - - ..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll - - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - - - - - - - - - - - - - - - - - - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - - - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - - - - - True - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll - - - True - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - - - ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - - - True - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - - - True - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - - - True - ..\packages\WebGrease.1.5.2\lib\WebGrease.dll - - - True - ..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll - - - - - ..\packages\Microsoft.ApplicationInsights.2.2.0\lib\net45\Microsoft.ApplicationInsights.dll - - - ..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.0.6\lib\net45\Microsoft.AI.Agent.Intercept.dll - - - ..\packages\Microsoft.ApplicationInsights.DependencyCollector.2.2.0\lib\net45\Microsoft.AI.DependencyCollector.dll - - - ..\packages\Microsoft.ApplicationInsights.PerfCounterCollector.2.2.0\lib\net45\Microsoft.AI.PerfCounterCollector.dll - - - ..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll - - - ..\packages\Microsoft.ApplicationInsights.WindowsServer.2.2.0\lib\net45\Microsoft.AI.WindowsServer.dll - - - ..\packages\Microsoft.ApplicationInsights.Web.2.2.0\lib\net45\Microsoft.AI.Web.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Global.asax - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - - - - - - Designer - - - Web.config - - - Web.config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - - - True - True - 58478 - / - http://localhost:60916/ - False - False - - - False - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - \ No newline at end of file -- cgit v1.2.3 From 40d66d9a08a58c3f684fe43e75da5f833c7bff4a Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Mon, 15 May 2017 11:58:39 +0200 Subject: Cleaned up. --- .../View/ApartmentResidentsPage.xaml.cs | 5 -- .../ApartmentManager/View/LoginPage.xaml | 2 +- .../ApartmentManager/View/LoginPage.xaml.cs | 5 -- .../ApartmentManager/ViewModel/LoginViewModel.cs | 1 - .../HousingWebAPI/Models/ApartmentResident.cs | 37 ------------- .../Models/database_firewall_rules.cs | 38 ------------- .../HousingWebApi/Model/AllResident.cs | 15 +++++ ApartmentManager/HousingWebApi/Model/Apartment.cs | 45 +++++++++++++++ .../HousingWebApi/Model/ApartmentResident.cs | 37 +++++++++++++ ApartmentManager/HousingWebApi/Model/Defect.cs | 46 ++++++++++++++++ .../HousingWebApi/Model/PastContractOwner.cs | 17 ++++++ ApartmentManager/HousingWebApi/Model/Resident.cs | 37 +++++++++++++ .../HousingWebApi/Model/ResidentList.cs | 20 +++++++ ApartmentManager/HousingWebApi/Model/User.cs | 64 ++++++++++++++++++++++ .../HousingWebApi/Model/database_firewall_rules.cs | 38 +++++++++++++ .../HousingWebApi/Models/AllResident.cs | 15 ----- ApartmentManager/HousingWebApi/Models/Apartment.cs | 45 --------------- ApartmentManager/HousingWebApi/Models/Defect.cs | 46 ---------------- .../HousingWebApi/Models/PastContractOwner.cs | 17 ------ ApartmentManager/HousingWebApi/Models/Resident.cs | 37 ------------- .../HousingWebApi/Models/ResidentList.cs | 20 ------- ApartmentManager/HousingWebApi/Models/User.cs | 64 ---------------------- 22 files changed, 320 insertions(+), 331 deletions(-) delete mode 100644 ApartmentManager/HousingWebAPI/Models/ApartmentResident.cs delete mode 100644 ApartmentManager/HousingWebAPI/Models/database_firewall_rules.cs create mode 100644 ApartmentManager/HousingWebApi/Model/AllResident.cs create mode 100644 ApartmentManager/HousingWebApi/Model/Apartment.cs create mode 100644 ApartmentManager/HousingWebApi/Model/ApartmentResident.cs create mode 100644 ApartmentManager/HousingWebApi/Model/Defect.cs create mode 100644 ApartmentManager/HousingWebApi/Model/PastContractOwner.cs create mode 100644 ApartmentManager/HousingWebApi/Model/Resident.cs create mode 100644 ApartmentManager/HousingWebApi/Model/ResidentList.cs create mode 100644 ApartmentManager/HousingWebApi/Model/User.cs create mode 100644 ApartmentManager/HousingWebApi/Model/database_firewall_rules.cs delete mode 100644 ApartmentManager/HousingWebApi/Models/AllResident.cs delete mode 100644 ApartmentManager/HousingWebApi/Models/Apartment.cs delete mode 100644 ApartmentManager/HousingWebApi/Models/Defect.cs delete mode 100644 ApartmentManager/HousingWebApi/Models/PastContractOwner.cs delete mode 100644 ApartmentManager/HousingWebApi/Models/Resident.cs delete mode 100644 ApartmentManager/HousingWebApi/Models/ResidentList.cs delete mode 100644 ApartmentManager/HousingWebApi/Models/User.cs diff --git a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs index b90815c..b1272bb 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs @@ -27,10 +27,5 @@ namespace ApartmentManager.View { this.InitializeComponent(); } - - private void OpenFilePicker(object sender, RoutedEventArgs e) - { - - } } } diff --git a/ApartmentManager/ApartmentManager/View/LoginPage.xaml b/ApartmentManager/ApartmentManager/View/LoginPage.xaml index fc9c463..c6085b9 100644 --- a/ApartmentManager/ApartmentManager/View/LoginPage.xaml +++ b/ApartmentManager/ApartmentManager/View/LoginPage.xaml @@ -18,7 +18,7 @@ -