diff options
21 files changed, 613 insertions, 80 deletions
diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj index 086b0da..89dcb5e 100644 --- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj +++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj @@ -121,6 +121,9 @@ <Compile Include="View\ApartmentPage.xaml.cs"> <DependentUpon>ApartmentPage.xaml</DependentUpon> </Compile> + <Compile Include="View\BoardMemberManageApartment.xaml.cs"> + <DependentUpon>BoardMemberManageApartment.xaml</DependentUpon> + </Compile> <Compile Include="View\BoardMembersDefectsPage.xaml.cs"> <DependentUpon>BoardMembersDefectsPage.xaml</DependentUpon> </Compile> @@ -139,15 +142,16 @@ <Compile Include="View\PersonalInfoPage.xaml.cs"> <DependentUpon>PersonalInfoPage.xaml</DependentUpon> </Compile> - <Compile Include="View\PlanPage.xaml.cs"> - <DependentUpon>PlanPage.xaml</DependentUpon> + <Compile Include="View\ApartmentPlanPage.xaml.cs"> + <DependentUpon>ApartmentPlanPage.xaml</DependentUpon> </Compile> - <Compile Include="View\ResidentsPage.xaml.cs"> - <DependentUpon>ResidentsPage.xaml</DependentUpon> + <Compile Include="View\ApartmentResidentsPage.xaml.cs"> + <DependentUpon>ApartmentResidentsPage.xaml</DependentUpon> </Compile> </ItemGroup> <ItemGroup> <Content Include="Assets\BrokenDownpipe.jpg" /> + <Content Include="Assets\Ostbanehus.jpg" /> <Content Include="Assets\Person1.jpg" /> <Content Include="Assets\Person2.jpg" /> <Content Include="Assets\Person3.jpg" /> @@ -178,6 +182,10 @@ <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> + <Page Include="View\BoardMemberManageApartment.xaml"> + <SubType>Designer</SubType> + <Generator>MSBuild:Compile</Generator> + </Page> <Page Include="View\BoardMembersDefectsPage.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> @@ -202,11 +210,11 @@ <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> - <Page Include="View\PlanPage.xaml"> + <Page Include="View\ApartmentPlanPage.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> - <Page Include="View\ResidentsPage.xaml"> + <Page Include="View\ApartmentResidentsPage.xaml"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> diff --git a/ApartmentManager/ApartmentManager/AppShell.xaml.cs b/ApartmentManager/ApartmentManager/AppShell.xaml.cs index 5ccff1c..a673b1b 100644 --- a/ApartmentManager/ApartmentManager/AppShell.xaml.cs +++ b/ApartmentManager/ApartmentManager/AppShell.xaml.cs @@ -26,12 +26,29 @@ namespace ApartmentManager DestPage = typeof(ApartmentPage), IsSelected = true }, + new NavMenuItem() { - Symbol= Symbol.Accept, + Symbol = Symbol.Comment, Label = "Defects", DestPage = typeof(BoardMembersDefectsPage), IsSelected = false + }, + + new NavMenuItem() + { + Symbol = Symbol.Bookmarks, + Label = "Residents", + DestPage = typeof(InfoForBoardMembers), + IsSelected = false + }, + + new NavMenuItem() + { + Symbol = Symbol.Bookmarks, + Label = "Apartments", + DestPage = typeof(BoardMembersPage), + IsSelected = false } }); @@ -46,7 +63,7 @@ namespace ApartmentManager { InitializeComponent(); - List<NavMenuItem> topNavMenuItems = navMenuItems.GetRange(0, 2); + List<NavMenuItem> topNavMenuItems = navMenuItems.GetRange(0, 4); // List<NavMenuItem> bottomNavMenuItems = navMenuItems.GetRange(3, 2); NavMenuList.ItemsSource = topNavMenuItems; diff --git a/ApartmentManager/ApartmentManager/Assets/Ostbanehus.jpg b/ApartmentManager/ApartmentManager/Assets/Ostbanehus.jpg Binary files differnew file mode 100644 index 0000000..a0d11c6 --- /dev/null +++ b/ApartmentManager/ApartmentManager/Assets/Ostbanehus.jpg diff --git a/ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs b/ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs index f988489..46740d9 100644 --- a/ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs +++ b/ApartmentManager/ApartmentManager/Handler/BoardApartmentsHandler.cs @@ -1,8 +1,12 @@ 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; namespace ApartmentManager.Handler @@ -15,5 +19,51 @@ namespace ApartmentManager.Handler { ApartmentsViewModel = apartmentsViewModel; } + + public void GetApartments() + { + Apartment apartment = new Apartment(); + apartment.ApartmentNumber = ApartmentsViewModel.ApartmentsNumber; + + var apartmentList = new PersistenceFacade().GetApartments(apartment); + ApartmentsViewModel.ApartmentsCatalogSingleton.Apartment.Clear(); + + foreach (var apartments in apartmentList) + { + ApartmentsViewModel.ApartmentsCatalogSingleton.Apartment.Add(apartments); + } + } + + public void CreateApartment() + { + try + { + Apartment apartment = new Apartment(); + apartment.ApartmentNumber = ApartmentsViewModel.ApartmentsCatalogSingleton.Apartment.Count; + apartment.ApartmentNumber++; + 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; + + new PersistenceFacade().CreateApartment(apartment); + + var apartmentslist = new PersistenceFacade().GetApartments(apartment); + ApartmentsViewModel.ApartmentsCatalogSingleton.Apartment.Clear(); + + foreach (var apartmento in apartmentslist) + { + ApartmentsViewModel.ApartmentsCatalogSingleton.Apartment.Add(apartmento); + } + + //ApartmentsViewModel.ApartmentsCatalogSingleton.Apartment.Clear(apartment); + } + catch (Exception e) + { + new MessageDialog(e.Message).ShowAsync(); + } + } } } diff --git a/ApartmentManager/ApartmentManager/Handler/ResidentsHandler.cs b/ApartmentManager/ApartmentManager/Handler/ResidentsHandler.cs index c04007f..d406880 100644 --- a/ApartmentManager/ApartmentManager/Handler/ResidentsHandler.cs +++ b/ApartmentManager/ApartmentManager/Handler/ResidentsHandler.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Linq; using System.Text; @@ -7,6 +8,7 @@ using Windows.UI.Popups; using ApartmentManager.Model; using ApartmentManager.Persistency; using ApartmentManager.ViewModel; +using Newtonsoft.Json; namespace ApartmentManager.Handler { @@ -22,14 +24,17 @@ namespace ApartmentManager.Handler { Resident resident = new Resident(); resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; + + var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); + IEnumerable<Resident> residentlist = JsonConvert.DeserializeObject<IEnumerable<Resident>>(residentsFromDatabase); - var residentlist = new PersistenceFacade().GetApartmentResidents(resident); ApartmentViewModel.CatalogSingleton.Residents.Clear(); - + ApartmentViewModel.NewResident = new Resident(); foreach (var resident2 in residentlist) { ApartmentViewModel.CatalogSingleton.Residents.Add(resident2); } + } public void CreateResident() @@ -37,8 +42,7 @@ namespace ApartmentManager.Handler try { Resident resident = new Resident(); - resident.ResidentNr = ApartmentViewModel.CatalogSingleton.Residents.Count; - resident.ResidentNr++; + resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; resident.FirstName = ApartmentViewModel.NewResident.FirstName; resident.LastName = ApartmentViewModel.NewResident.LastName; @@ -47,13 +51,14 @@ namespace ApartmentManager.Handler resident.Picture = ApartmentViewModel.NewResident.Picture; resident.Phone = ApartmentViewModel.NewResident.Phone; - new PersistenceFacade().CreateResident(resident); + ApiClient.PostData("api/residents/", resident); - - var residentsFromDatabase = new PersistenceFacade().GetApartmentResidents(resident); - ApartmentViewModel.CatalogSingleton.Residents.Clear(); + var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); + IEnumerable<Resident> residentlist = JsonConvert.DeserializeObject<IEnumerable<Resident>>(residentsFromDatabase); - foreach (var resident2 in residentsFromDatabase) + ApartmentViewModel.CatalogSingleton.Residents.Clear(); + ApartmentViewModel.NewResident = new Resident(); + foreach (var resident2 in residentlist) { ApartmentViewModel.CatalogSingleton.Residents.Add(resident2); } @@ -69,6 +74,7 @@ namespace ApartmentManager.Handler try { Resident resident = new Resident(); + resident.ResidentNr = ApartmentViewModel.NewResident.ResidentNr; resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; resident.FirstName = ApartmentViewModel.NewResident.FirstName; resident.LastName = ApartmentViewModel.NewResident.LastName; @@ -77,17 +83,17 @@ namespace ApartmentManager.Handler resident.Picture = ApartmentViewModel.NewResident.Picture; resident.Phone = ApartmentViewModel.NewResident.Phone; - //new PersistenceFacade().CreateHotel(hotel); + ApiClient.DeleteData("api/residents/" + resident.ResidentNr); - ////HotelViewModel.Hotels.Hotels.Add(hotel); - //var hotelsFromDatabase = new PersistenceFacade().GetHotels(); + var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); + IEnumerable<Resident> residentlist = JsonConvert.DeserializeObject<IEnumerable<Resident>>(residentsFromDatabase); - //HotelViewModel.HotelCatalogSingleton.Hotels.Clear(); - //foreach (var hotel1 in hotelsFromDatabase) - //{ - // ApartmentViewModel.HotelCatalogSingleton.Hotels.Add(hotel1); - - //} + ApartmentViewModel.CatalogSingleton.Residents.Clear(); + ApartmentViewModel.NewResident = new Resident(); + foreach (var resident2 in residentlist) + { + ApartmentViewModel.CatalogSingleton.Residents.Add(resident2); + } } catch (Exception e) { @@ -99,6 +105,7 @@ namespace ApartmentManager.Handler try { Resident resident = new Resident(); + resident.ResidentNr = ApartmentViewModel.NewResident.ResidentNr; resident.ApartmentNr = ApartmentViewModel.ApartmentNumber; resident.FirstName = ApartmentViewModel.NewResident.FirstName; resident.LastName = ApartmentViewModel.NewResident.LastName; @@ -107,17 +114,16 @@ namespace ApartmentManager.Handler resident.Picture = ApartmentViewModel.NewResident.Picture; resident.Phone = ApartmentViewModel.NewResident.Phone; - //new PersistenceFacade().CreateHotel(hotel); - - ////HotelViewModel.Hotels.Hotels.Add(hotel); - //var hotelsFromDatabase = new PersistenceFacade().GetHotels(); - - //HotelViewModel.HotelCatalogSingleton.Hotels.Clear(); - //foreach (var hotel1 in hotelsFromDatabase) - //{ - // ApartmentViewModel.HotelCatalogSingleton.Hotels.Add(hotel1); + ApiClient.PutData("api/residents/" + resident.ResidentNr,resident); + var residentsFromDatabase = ApiClient.GetData("api/ApartmentResidents/" + resident.ApartmentNr); + IEnumerable<Resident> residentlist = JsonConvert.DeserializeObject<IEnumerable<Resident>>(residentsFromDatabase); - //} + ApartmentViewModel.CatalogSingleton.Residents.Clear(); + ApartmentViewModel.NewResident = new Resident(); + foreach (var resident2 in residentlist) + { + ApartmentViewModel.CatalogSingleton.Residents.Add(resident2); + } } catch (Exception e) { diff --git a/ApartmentManager/ApartmentManager/Model/Resident.cs b/ApartmentManager/ApartmentManager/Model/Resident.cs index f9cede7..e9f39cd 100644 --- a/ApartmentManager/ApartmentManager/Model/Resident.cs +++ b/ApartmentManager/ApartmentManager/Model/Resident.cs @@ -19,7 +19,7 @@ namespace ApartmentManager.Model public int ResidentNr { get; set; } public Resident() { } - public Resident(string FirstName, string LastName, int Phone, DateTime BirthDate, string Email, int ApartmentNr, int ResidentNr) + public Resident(string FirstName, string LastName, int Phone, DateTime BirthDate, string Email, int ApartmentNr ,int ResidentNr) { this.FirstName = FirstName; this.LastName = LastName; diff --git a/ApartmentManager/ApartmentManager/Persistency/ApiClient.cs b/ApartmentManager/ApartmentManager/Persistency/ApiClient.cs index e803005..2faa07a 100644 --- a/ApartmentManager/ApartmentManager/Persistency/ApiClient.cs +++ b/ApartmentManager/ApartmentManager/Persistency/ApiClient.cs @@ -24,6 +24,7 @@ namespace ApartmentManager.Persistency if (response.IsSuccessStatusCode) { return response.Content.ReadAsStringAsync().Result; + } else return null; } diff --git a/ApartmentManager/ApartmentManager/Persistency/PersistenceFacade.cs b/ApartmentManager/ApartmentManager/Persistency/PersistenceFacade.cs index 882fd3a..1665833 100644 --- a/ApartmentManager/ApartmentManager/Persistency/PersistenceFacade.cs +++ b/ApartmentManager/ApartmentManager/Persistency/PersistenceFacade.cs @@ -23,6 +23,65 @@ namespace ApartmentManager.Persistency handler.UseDefaultCredentials = true; } + // Get apartments + + public List<Apartment> GetApartments(Apartment apartment) + { + using (var client = new HttpClient(handler)) + { + client.BaseAddress = new Uri(ServerUrl); + client.DefaultRequestHeaders.Clear(); + client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + try + { + string apartments = "api/apartments/" + apartment.ApartmentNumber; + var response = client.GetAsync(apartments).Result; + + if (response.IsSuccessStatusCode) + { + var apartmentList = response.Content.ReadAsAsync<IEnumerable<Apartment>>().Result; + return apartmentList.ToList(); + } + } + catch (Exception e) + { + new MessageDialog("Cyka blyat").ShowAsync(); + + } + return null; + } + } + + public void CreateApartment(Apartment apartment) + { + using (var client = new HttpClient(handler)) + { + client.BaseAddress = new Uri(ServerUrl); + client.DefaultRequestHeaders.Clear(); + client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + try + { + string postBody = JsonConvert.SerializeObject(apartment); + var response = client.PostAsync("api/apartments/", + new StringContent(postBody, Encoding.UTF8, "application/json")) + .Result; + if (response.IsSuccessStatusCode) + { + new MessageDialog("Success").ShowAsync(); + } + else + { + new MessageDialog("Error").ShowAsync(); + } + + } + catch (Exception ex) + { + new MessageDialog(ex.Message).ShowAsync(); + } + } + } + ///Get Get Residents/// public List<Resident> GetApartmentResidents(Resident resident) { diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml index 4f8b466..df51ff8 100644 --- a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml +++ b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml @@ -1,5 +1,5 @@ <Page - x:Class="ApartmentManager.View.ApartmentPlanPage" + x:Class="ApartmentManager.View.PlanPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:ApartmentManager.View" @@ -8,15 +8,7 @@ mc:Ignorable="d"> <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - <StackPanel Orientation="Horizontal" Margin="50" VerticalAlignment="Center" HorizontalAlignment="Center" > - <Button Background="{x:Null}" Margin="20,0,20,0" > - <SymbolIcon Symbol="Back" ></SymbolIcon> - </Button> - <Image Height="500" Width="1000" /> - <Button Background="{x:Null}" Margin="20,0,20,0" > - <SymbolIcon Symbol="Forward" ></SymbolIcon> - </Button> - </StackPanel> + <Image Source="ms-appx:///Assets/plan.jpg" Margin="50"></Image> + </Grid> - </Page> diff --git a/ApartmentManager/ApartmentManager/View/PlanPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs index bce6221..bce6221 100644 --- a/ApartmentManager/ApartmentManager/View/PlanPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs diff --git a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml index 8c8d053..c68b1bc 100644 --- a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml +++ b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml @@ -29,7 +29,7 @@ <TextBox Text="{Binding NewResident.Phone, Mode=TwoWay}" /> <StackPanel Orientation="Horizontal"> <Button Margin="0,10,12,10" Content="Create" Width="125" Command="{Binding CreateResidentCommand}"/> - <Button Margin="0,10,0,10" Content="Delte" Width="125" Command="{Binding DeleteResidentCommand}"/> + <Button Margin="0,10,0,10" Content="Delete" Width="125" Command="{Binding DeleteResidentCommand}"/> <Button Margin="13,10,0,10" Content="Update" Width="125" Command="{Binding UpdateResidentCommand}"/> </StackPanel> </StackPanel> diff --git a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs index 46e9f6f..46e9f6f 100644 --- a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs diff --git a/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml new file mode 100644 index 0000000..5deab23 --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml @@ -0,0 +1,31 @@ +<Page + 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" + xmlns:ViewModel="using:ApartmentManager.ViewModel" + x:Class="ApartmentManager.View.BoardMemberManageApartment" + mc:Ignorable="d"> + + + <Page.DataContext> + <ViewModel:ApartmentsViewModel/> + </Page.DataContext> + + + + <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> + <StackPanel Margin="0 0" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="top" > + <Image Source="ms-appx:///Assets/plan.jpg" Margin="0 0" Width="400"></Image> + <Frame Background="Bisque"> + <ListView HorizontalAlignment="Left" Margin="0,0,50,0" VerticalAlignment="Top" ItemsSource="{Binding ApartmentsCatalogSingleton.Apartment}" SelectedItem="{Binding NewApartment, Mode=TwoWay}"/> + </Frame> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 100"> + <Button Width="150" Content="New apartment" VerticalAlignment="Bottom" HorizontalAlignment="Center"></Button> + <Button Width="150" Margin="50 0" Content="Delete apartment" VerticalAlignment="Bottom" HorizontalAlignment="Center"></Button> + <Button Width="150" Content="Update apartment" VerticalAlignment="Bottom" HorizontalAlignment="Center"></Button> + </StackPanel> + </StackPanel> + </Grid> +</Page> diff --git a/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml.cs b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.xaml.cs new file mode 100644 index 0000000..c291b8b --- /dev/null +++ b/ApartmentManager/ApartmentManager/View/BoardMemberManageApartment.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 BoardMemberManageApartment : Page + { + public BoardMemberManageApartment() + { + this.InitializeComponent(); + } + } +} diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml index 9acc60e..b606754 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml +++ b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml @@ -13,12 +13,22 @@ <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - <StackPanel Margin="50" Orientation="Vertical" HorizontalAlignment="Right" VerticalAlignment="top" > - <ListView HorizontalAlignment="Left" Margin="0,0,50,0" VerticalAlignment="Top" ItemsSource="{Binding ApartmentsCatalogSingleton.Apartment}" SelectedItem="{Binding NewApartment, Mode=TwoWay}"/> - <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 100"> - <Button Width="150" Content="Residents" Click="Apartment" VerticalAlignment="Bottom" HorizontalAlignment="Center"></Button> - <Button Width="150" Margin="40 0" Content="Defects" Click="ButtonBase_OnClick" VerticalAlignment="Bottom" HorizontalAlignment="Center"></Button> - <Button Width="150" Content="Apartment" VerticalAlignment="Bottom" HorizontalAlignment="Center"></Button> + + <StackPanel Orientation="Vertical"> + <TextBlock Text="Welcome to board memeber page" HorizontalAlignment="Center" FontSize="20" Margin="0 10"></TextBlock> + <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="top" > + <Image Source="../Assets/Ostbanehus.jpg" Margin="0 0 0 0" Width="450"/> + <StackPanel Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="270 0"> + <Button Width="150" Height="60" Content="Residents" Click="Apartment" VerticalAlignment="Bottom" HorizontalAlignment="Center"/> + <Button Width="150" Height="60" Margin="0 20" Content="Defects" Click="Defect" VerticalAlignment="Bottom" HorizontalAlignment="Center"/> + <Button Width="150" Height="60" Content="Apartment" VerticalAlignment="Bottom" HorizontalAlignment="Center"/> + </StackPanel> + </StackPanel> + <StackPanel Orientation="Vertical" VerticalAlignment="Center"> + <Frame BorderThickness="50" Background="Bisque"> + <ListView HorizontalAlignment="Left" VerticalAlignment="Center" ItemsSource="{Binding ApartmentsCatalogSingleton.Apartment}" SelectedItem="{Binding NewApartment, Mode=TwoWay}"/> + </Frame> + <Button Content="Manage apartment" Width="200" Height="80" Click="ApartmentManage" HorizontalAlignment="Left" Margin="200 0"></Button> </StackPanel> </StackPanel> </Grid> diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs index 2ac43c8..b7eb548 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs @@ -27,7 +27,7 @@ namespace ApartmentManager.View this.InitializeComponent(); } - private void ButtonBase_OnClick(object sender, RoutedEventArgs e) + private void Defect(object sender, RoutedEventArgs e) { Frame.Navigate(typeof(BoardMembersDefectsPage)); } @@ -36,5 +36,10 @@ namespace ApartmentManager.View { this.Frame.Navigate(typeof(InfoForBoardMembers)); } + + private void ApartmentManage(object sender, RoutedEventArgs e) + { + this.Frame.Navigate(typeof(BoardMemberManageApartment)); + } } } diff --git a/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml b/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml index 6c038c7..e77d634 100644 --- a/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml +++ b/ApartmentManager/ApartmentManager/View/DefectsPicturesBoard.xaml @@ -13,17 +13,18 @@ </Page.DataContext> <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - <StackPanel Margin="0 50" Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Center"> - <Image Width="500" Source="../Assets/Person3.jpg"></Image> - <StackPanel> + <StackPanel Orientation="Vertical"> + <StackPanel Margin="0 50" Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Center"> + <Image Width="500" Source="../Assets/Person3.jpg"></Image> <Image Width="500" Source="../Assets/Person1.jpg" Height="309"></Image> - </StackPanel> - <StackPanel> <Image Width="500" Source="../Assets/Person2.jpg"></Image> </StackPanel> - <!--<Image Source="{Binding ApartmentsCatalogSingleton.Defects[0].Picture}"></Image> - <Image Source="{Binding ApartmentsCatalogSingleton.Defects[0].Picture2}"></Image> - <Image Source="{Binding ApartmentsCatalogSingleton.Defects[0].Picture3}"></Image>--> + <StackPanel Orientation="Vertical"> + <TextBlock Text="Description of the deffect:" HorizontalAlignment="Center" FontSize="20"></TextBlock> + <TextBlock Text="{Binding ApartmentsCatalogSingleton.Defects[0].Description}" TextWrapping="Wrap" Margin="0 10" Width="400"></TextBlock> + <TextBlock Text="Comment" HorizontalAlignment="Center" FontSize="20"></TextBlock> + <TextBlock Text="{Binding ApartmentsCatalogSingleton.Defects[0].Comment}" TextWrapping="Wrap" Margin="0 10" Width="400"></TextBlock> + </StackPanel> </StackPanel> </Grid> </Page> diff --git a/ApartmentManager/ApartmentManager/View/PlanPage.xaml b/ApartmentManager/ApartmentManager/View/PlanPage.xaml deleted file mode 100644 index df51ff8..0000000 --- a/ApartmentManager/ApartmentManager/View/PlanPage.xaml +++ /dev/null @@ -1,14 +0,0 @@ -<Page - x:Class="ApartmentManager.View.PlanPage" - xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
