diff options
20 files changed, 233 insertions, 490 deletions
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 @@ </Compile> <Compile Include="Common\RelayCommand.cs" /> <Compile Include="Controls\NavMenuListView.cs" /> - <Compile Include="Handler\BoardApartmentsHandler.cs" /> + <Compile Include="Handler\BoardMemberHandler.cs" /> <Compile Include="Handler\BoardResidentsHandler.cs" /> <Compile Include="Handler\LoginHandler.cs" /> <Compile Include="Handler\ApartmentHandler.cs" /> <Compile Include="Model\Apartment.cs" /> <Compile Include="Persistency\ImgurPhotoUploader.cs" /> - <Compile Include="Singletons\ApartmentsCatalogSingleton.cs" /> + <Compile Include="Singletons\BoardMemberCatalogSingleton.cs" /> <Compile Include="Model\Defect.cs" /> <Compile Include="Model\NavMenuItem.cs" /> <Compile Include="Singletons\CatalogSingleton.cs" /> @@ -117,7 +117,7 @@ <Compile Include="Persistency\PersistenceFacade.cs" /> <Compile Include="Properties\Annotations.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="ViewModel\ApartmentsViewModel.cs" /> + <Compile Include="ViewModel\BoardMemberViewModel.cs" /> <Compile Include="ViewModel\ApartmenViewModel.cs" /> <Compile Include="ViewModel\LoginViewModel.cs" /> <Compile Include="View\ApartmentDefectPage.xaml.cs"> @@ -135,11 +135,11 @@ <Compile Include="View\BoardMembersDefectsPage.xaml.cs"> <DependentUpon>BoardMembersDefectsPage.xaml</DependentUpon> </Compile> - <Compile Include="View\BoardMembersPage.xaml.cs"> - <DependentUpon>BoardMembersPage.xaml</DependentUpon> + <Compile Include="View\BoardMembersMainPage.xaml.cs"> + <DependentUpon>BoardMembersMainPage.xaml</DependentUpon> </Compile> - <Compile Include="View\CreateApartmentPage.xaml.cs"> - <DependentUpon>CreateApartmentPage.xaml</DependentUpon> + <Compile Include="View\BoardMemberCreateApartmentPage.xaml.cs"> + <DependentUpon>BoardMemberCreateApartmentPage.xaml</DependentUpon> </Compile> <Compile Include="View\DefectsPicturesBoard.xaml.cs"> <DependentUpon>DefectsPicturesBoard.xaml</DependentUpon> @@ -209,11 +209,11 @@ <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> - <Page Include="View\BoardMembersPage.xaml"> + <Page Include="View\BoardMembersMainPage.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> - <Page Include="View\CreateApartmentPage.xaml"> + <Page Include="View\BoardMemberCreateApartmentPage.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> 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<Apartment> apartmentslist = JsonConvert.DeserializeObject<IEnumerable<Apartment>>(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<Apartment> apartmentlist = JsonConvert.DeserializeObject<IEnumerable<Apartment>>(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<Apartment> apartmentslist = JsonConvert.DeserializeObject<IEnumerable<Apartment>>(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<Apartment> apartmentlist = JsonConvert.DeserializeObject<IEnumerable<Apartment>>(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<Apartment> apartmentslist = JsonConvert.DeserializeObject<IEnumerable<Apartment>>(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<Apartment> apartmentslist = JsonConvert.DeserializeObject<IEnumerable<Apartment>>(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<Resident> residentlist = JsonConvert.DeserializeObject<IEnumerable<Resident>>(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<Resident> residentlist = JsonConvert.DeserializeObject<IEnumerable<Resident>>(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<Resident> residentlist = JsonConvert.DeserializeObject<IEnumerable<Resident>>(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<Resident> residentlist = JsonConvert.DeserializeObject<IEnumerable<Resident>>(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/BoardMemberCatalogSingleton.cs index 8afbeb3..1a563ef 100644 --- a/ApartmentManager/ApartmentManager/Singletons/ApartmentsCatalogSingleton.cs +++ b/ApartmentManager/ApartmentManager/Singletons/BoardMemberCatalogSingleton.cs @@ -10,22 +10,23 @@ using Windows.UI.Xaml.Media.Imaging; namespace ApartmentManager.Model { - public class ApartmentsCatalogSingleton + public class BoardMemberCatalogSingleton { - private static ApartmentsCatalogSingleton instance = new ApartmentsCatalogSingleton(); + private static BoardMemberCatalogSingleton instance = new BoardMemberCatalogSingleton(); - public static ApartmentsCatalogSingleton Instance => instance; + public static BoardMemberCatalogSingleton Instance => instance; public ObservableCollection<Apartment> Apartment { get; set; } public ObservableCollection<User> User { get; set; } public ObservableCollection<Resident> Residents { get; set; } public ObservableCollection<Defect> Defects { get; set; } - private ApartmentsCatalogSingleton() + private BoardMemberCatalogSingleton() { - User = new ObservableCollection<User>(); - User.Add(new User("Bibis", "Kiausiai", "3214568", new DateTime(2017, 1, 5, 2, 27, 0), "Bibis@mail.com", 1)); - Apartment = new ObservableCollection<Apartment>(); + + User = new ObservableCollection<User>(); + //User.Add(new User("Bibis", "Kiausiai", "3214568", new DateTime(2017, 1, 5, 2, 27, 0), "Bibis@mail.com", 1)); + //Apartment = new ObservableCollection<Apartment>(); //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")); @@ -37,9 +38,9 @@ namespace ApartmentManager.Model //Residents.Add(new Resident("Bibis", "Kiausiai", 3214568, new DateTime(2017, 1, 5, 0, 0, 0), "Bibis@mail.com", 1)); Defects = new ObservableCollection<Defect>(); - 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")); + //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/CreateApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml index 2496cb6..d243381 100644 --- a/ApartmentManager/ApartmentManager/View/CreateApartmentPage.xaml +++ b/ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml @@ -5,12 +5,12 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ViewModel="using:ApartmentManager.ViewModel" - x:Class="ApartmentManager.View.CreateApartmentPage" + x:Class="ApartmentManager.View.BoardMemberCreateApartmentPage" mc:Ignorable="d"> <Page.DataContext> - <ViewModel:ApartmentsViewModel/> + <ViewModel:BoardMemberViewModel/> </Page.DataContext> diff --git a/ApartmentManager/ApartmentManager/View/CreateApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml.cs index cc469d5..8098474 100644 --- a/ApartmentManager/ApartmentManager/View/CreateApartmentPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/BoardMemberCreateApartmentPage.xaml.cs @@ -20,9 +20,9 @@ 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 CreateApartmentPage : Page + public sealed partial class BoardMemberCreateApartmentPage : Page { - public CreateApartmentPage() + 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 @@ <Page.DataContext> - <ViewModel:ApartmentsViewModel/> + <ViewModel:BoardMemberViewModel/> </Page.DataContext> - - <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <StackPanel Margin="0 0" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="top" Width="1100" > <StackPanel Orientation="Vertical"> <!--<Image Source="ms-appx:///Assets/plan.jpg" HorizontalAlignment="Left" Margin="0 0" Width="600"></Image>--> <Frame Background="Bisque"> - <ListView HorizontalAlignment="Left" VerticalAlignment="Top" Width="1100" ItemsSource="{Binding ApartmentsCatalogSingleton.Apartment}" SelectedItem="{Binding NewApartment, Mode=TwoWay}" Height="567"/> + <ListView HorizontalAlignment="Left" VerticalAlignment="Top" Width="1100" ItemsSource="{Binding BoardMemberCatalogSingleton.Apartment}" SelectedItem="{Binding NewApartment, Mode=TwoWay}" Height="567"/> </Frame> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0"> <Button Width="150" Margin="50 0" Content="View residents" Click="ButtonBase_OnClick"></Button> <Button Width="150" Content="Add apartment" Click="CreateApartment" VerticalAlignment="Bottom" HorizontalAlignment="Center"></Button> - <Button Width="150" Margin="50 0" Content="Delete apartment" VerticalAlignment="Bottom" HorizontalAlignment="Center"></Button> + <Button Width="150" Margin="50 0" Content="Delete apartment" Command="{Binding DeleteApartmentCommand}" VerticalAlignment="Bottom" HorizontalAlignment="Center"></Button> <Button Width="150" Content="Update apartment" VerticalAlignment="Bottom" HorizontalAlignment="Center"></Button> </StackPanel> </StackPanel> 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"> <Page.DataContext> - <ViewModel:ApartmentsViewModel/> + <ViewModel:BoardMemberViewModel/> </Page.DataContext> <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <StackPanel> - <ListView Margin="100" ItemsSource="{Binding ApartmentsCatalogSingleton.Defects}" SelectedItem="{Binding NewDefect, Mode=TwoWay}"/> + <ListView Margin="100" ItemsSource="{Binding BoardMemberCatalogSingleton.Defects}" SelectedItem="{Binding NewDefect, Mode=TwoWay}"/> <StackPanel Margin="100 0" > - <TextBlock Text="{Binding ApartmentsCatalogSingleton.Defects[0].ApartmentNumber}" FontSize="20"/> - <TextBlock Text="{Binding ApartmentsCatalogSingleton.Defects[0].Name}"></TextBlock> - <TextBlock Text="{Binding ApartmentsCatalogSingleton.Defects[0].DateUploaded}"></TextBlock> - <TextBlock Text="{Binding ApartmentsCatalogSingleton.Defects[0].Comment}"></TextBlock> - <TextBlock Text="{Binding ApartmentsCatalogSingleton.Defects[0].DefectNumber}"></TextBlock> - <TextBlock Text="{Binding ApartmentsCatalogSingleton.Defects[0].Description}"></TextBlock> - <TextBlock Text="{Binding ApartmentsCatalogSingleton.Defects[0].Status}"></TextBlock> + <TextBlock Text="{Binding BoardMemberCatalogSingleton.Defects[0].ApartmentNumber}" FontSize="20"/> + <TextBlock Text="{Binding BoardMemberCatalogSingleton.Defects[0].Name}"></TextBlock> + <TextBlock Text="{Binding BoardMemberCatalogSingleton.Defects[0].DateUploaded}"></TextBlock> + <TextBlock Text="{Binding BoardMemberCatalogSingleton.Defects[0].Comment}"></TextBlock> + <TextBlock Text="{Binding BoardMemberCatalogSingleton.Defects[0].DefectNumber}"></TextBlock> + <TextBlock Text="{Binding BoardMemberCatalogSingleton.Defects[0].Description}"></TextBlock> + <TextBlock Text="{Binding BoardMemberCatalogSingleton.Defects[0].Status}"></TextBlock> </StackPanel> <Button Content="View pictures" Margin="100 40" Click="PicturesDefects"></Button> </StackPanel> |