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> diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml b/ApartmentManager/ApartmentManager/View/BoardMembersMainPage.xaml index 8c72de5..0cc58ab 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml +++ b/ApartmentManager/ApartmentManager/View/BoardMembersMainPage.xaml @@ -5,10 +5,10 @@ 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.BoardMembersPage" + x:Class="ApartmentManager.View.BoardMembersMainPage" mc:Ignorable="d"> <Page.DataContext> - <ViewModel:ApartmentsViewModel/> + <ViewModel:BoardMemberViewModel/> </Page.DataContext> diff --git a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs b/ApartmentManager/ApartmentManager/View/BoardMembersMainPage.xaml.cs index dbf2f45..3cde697 100644 --- a/ApartmentManager/ApartmentManager/View/BoardMembersPage.xaml.cs +++ b/ApartmentManager/ApartmentManager/View/BoardMembersMainPage.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 BoardMembersPage : Page + public sealed partial class BoardMembersMainPage : Page { - public BoardMembersPage() + public BoardMembersMainPage() { 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"> <Page.DataContext> - <ViewModel:ApartmentsViewModel/> + <ViewModel:BoardMemberViewModel/> </Page.DataContext> <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> @@ -21,9 +21,9 @@ </StackPanel> <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="{Binding BoardMemberCatalogSingleton.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> + <TextBlock Text="{Binding BoardMemberCatalogSingleton.Defects[0].Comment}" TextWrapping="Wrap" Margin="0 10" Width="400"></TextBlock> </StackPanel> </StackPanel> </Grid> 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"> <Page.DataContext> - <ViewModel:ApartmentsViewModel/> + <ViewModel:BoardMemberViewModel/> </Page.DataContext> <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <StackPanel Margin="50" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="top" > <StackPanel Width="650"> <StackPanel> - <ListView ItemsSource="{Binding ApartmentsCatalogSingleton.Residents}" SelectedItem="{Binding NewResident, Mode=TwoWay}"></ListView> + <ListView ItemsSource="{Binding BoardMemberCatalogSingleton.Residents}" SelectedItem="{Binding NewResident, Mode=TwoWay}"></ListView> </StackPanel> </StackPanel> <StackPanel Margin="50" Orientation="Horizontal" HorizontalAlignment="Right"> 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/BoardMemberViewModel.cs index 2ee6c20..293e4bf 100644 --- a/ApartmentManager/ApartmentManager/ViewModel/ApartmentsViewModel.cs +++ b/ApartmentManager/ApartmentManager/ViewModel/BoardMemberViewModel.cs @@ -12,16 +12,18 @@ using ApartmentManager.Model; namespace ApartmentManager.ViewModel { - public class ApartmentsViewModel : INotifyPropertyChanged + public class BoardMemberViewModel : INotifyPropertyChanged { - public ApartmentsCatalogSingleton ApartmentsCatalogSingleton { get; set; } + 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.BoardApartmentsHandler BoardApartmentsHandler { get; set; } + public Handler.BoardMemberHandler BoardMemberHandler { get; set; } public Handler.BoardResidentsHandler BoardResidentsHandler { get; set; } @@ -31,18 +33,23 @@ namespace ApartmentManager.ViewModel public ICommand DeleteDefectCommand { get; set; } - public ApartmentsViewModel() + public BoardMemberViewModel() { 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(); + 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(); } diff --git a/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs b/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs index 73b5cf6..cabee1b 100644 --- a/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs +++ b/ApartmentManager/ApartmentManager/ViewModel/LoginViewModel.cs @@ -68,7 +68,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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" /> - <Import Project="..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props')" /> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion> - </ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{D777744A-9676-4193-BD59-6F30C724C87A}</ProjectGuid> - <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>HousingWebApi</RootNamespace> - <AssemblyName>HousingWebApi</AssemblyName> - <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> - <MvcBuildViews>false</MvcBuildViews> - <UseIISExpress>true</UseIISExpress> - <IISExpressSSLPort /> - <IISExpressAnonymousAuthentication /> - <IISExpressWindowsAuthentication /> - <IISExpressUseClassicPipelineMode /> - <UseGlobalApplicationHostFile /> - <NuGetPackageImportStamp> - </NuGetPackageImportStamp> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <ItemGroup> - <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> - <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath> - </Reference> - <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> - <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath> - </Reference> - <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath> - </Reference> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System" /> - <Reference Include="System.Data" /> - <Reference Include="System.Drawing" /> - <Reference Include="System.Security" /> - <Reference Include="System.Web.Entity" /> - <Reference Include="System.Web.ApplicationServices" /> - <Reference Include="System.ComponentModel.DataAnnotations" /> - <Reference Include="System.Core" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Web" /> - <Reference Include="System.Web.Abstractions" /> - <Reference Include="System.Web.Routing" /> - <Reference Include="System.Xml" /> - <Reference Include="System.Configuration" /> - <Reference Include="System.Runtime.Serialization" /> - <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <Private>True</Private> - <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath> - </Reference> - <Reference Include="Newtonsoft.Json"> - <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath> - </Reference> - <Reference Include="System.Net.Http"> - </Reference> - <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath> - </Reference> - <Reference Include="System.Net.Http.WebRequest"> - </Reference> - <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <Private>True</Private> - <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath> - </Reference> - <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath> - </Reference> - <Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath> - </Reference> - <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <Private>True</Private> - <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath> - </Reference> - <Reference Include="System.Web.Optimization"> - <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath> - </Reference> - <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <Private>True</Private> - <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath> - </Reference> - <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <Private>True</Private> - <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath> - </Reference> - <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <Private>True</Private> - <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath> - </Reference> - <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <Private>True</Private> - <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath> - </Reference> - <Reference Include="WebGrease"> - <Private>True</Private> - <HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath> - </Reference> - <Reference Include="Antlr3.Runtime"> - <Private>True</Private> - <HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath> - </Reference> - </ItemGroup> - <ItemGroup> - <Reference Include="Microsoft.ApplicationInsights"> - <HintPath>..\packages\Microsoft.ApplicationInsights.2.2.0\lib\net45\Microsoft.ApplicationInsights.dll</HintPath> - </Reference> - <Reference Include="Microsoft.AI.Agent.Intercept"> - <HintPath>..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.0.6\lib\net45\Microsoft.AI.Agent.Intercept.dll</HintPath> - </Reference> - <Reference Include="Microsoft.AI.DependencyCollector"> - <HintPath>..\packages\Microsoft.ApplicationInsights.DependencyCollector.2.2.0\lib\net45\Microsoft.AI.DependencyCollector.dll</HintPath> - </Reference> - <Reference Include="Microsoft.AI.PerfCounterCollector"> - <HintPath>..\packages\Microsoft.ApplicationInsights.PerfCounterCollector.2.2.0\lib\net45\Microsoft.AI.PerfCounterCollector.dll</HintPath> - </Reference> - <Reference Include="Microsoft.AI.ServerTelemetryChannel"> - <HintPath>..\packages\Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.2.2.0\lib\net45\Microsoft.AI.ServerTelemetryChannel.dll</HintPath> - </Reference> - <Reference Include="Microsoft.AI.WindowsServer"> - <HintPath>..\packages\Microsoft.ApplicationInsights.WindowsServer.2.2.0\lib\net45\Microsoft.AI.WindowsServer.dll</HintPath> - </Reference> - <Reference Include="Microsoft.AI.Web"> - <HintPath>..\packages\Microsoft.ApplicationInsights.Web.2.2.0\lib\net45\Microsoft.AI.Web.dll</HintPath> - </Reference> - </ItemGroup> - <ItemGroup> - <Compile Include="Models\AllResident.cs" /> - <Compile Include="Models\Apartment.cs" /> - <Compile Include="Models\ApartmentResident.cs" /> - <Compile Include="Controllers\ApartmentsController.cs" /> - <Compile Include="Controllers\DefectsController.cs" /> - <Compile Include="Controllers\PastContractOwnersController.cs" /> - <Compile Include="Controllers\ResidentsController.cs" /> - <Compile Include="Controllers\UsersController.cs" /> - <Compile Include="App_Start\BundleConfig.cs" /> - <Compile Include="App_Start\FilterConfig.cs" /> - <Compile Include="App_Start\RouteConfig.cs" /> - <Compile Include="App_Start\WebApiConfig.cs" /> - <Compile Include="Areas\HelpPage\ApiDescriptionExtensions.cs" /> - <Compile Include="Areas\HelpPage\App_Start\HelpPageConfig.cs" /> - <Compile Include="Areas\HelpPage\Controllers\HelpController.cs" /> - <Compile Include="Areas\HelpPage\HelpPageAreaRegistration.cs" /> - <Compile Include="Areas\HelpPage\HelpPageConfigurationExtensions.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\CollectionModelDescription.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\ComplexTypeModelDescription.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\DictionaryModelDescription.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\EnumTypeModelDescription.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\EnumValueDescription.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\IModelDocumentationProvider.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\KeyValuePairModelDescription.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\ModelDescription.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\ModelDescriptionGenerator.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\ModelNameAttribute.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\ModelNameHelper.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\ParameterAnnotation.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\ParameterDescription.cs" /> - <Compile Include="Areas\HelpPage\ModelDescriptions\SimpleTypeModelDescription.cs" /> - <Compile Include="Areas\HelpPage\Models\HelpPageApiModel.cs" /> - <Compile Include="Areas\HelpPage\SampleGeneration\HelpPageSampleGenerator.cs" /> - <Compile Include="Areas\HelpPage\SampleGeneration\HelpPageSampleKey.cs" /> - <Compile Include="Areas\HelpPage\SampleGeneration\ImageSample.cs" /> - <Compile Include="Areas\HelpPage\SampleGeneration\InvalidSample.cs" /> - <Compile Include="Areas\HelpPage\SampleGeneration\ObjectGenerator.cs" /> - <Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" /> - <Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" /> - <Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" /> - <Compile Include="Controllers\HomeController.cs" /> - <Compile Include="Models\database_firewall_rules.cs" /> - <Compile Include="DataModel.cs" /> - <Compile Include="Models\Defect.cs" /> - <Compile Include="Global.asax.cs"> - <DependentUpon>Global.asax</DependentUpon> - </Compile> - <Compile Include="Models\PastContractOwner.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Models\ResidentList.cs" /> - <Compile Include="Models\Resident.cs" /> - <Compile Include="Models\User.cs" /> - </ItemGroup> - <ItemGroup> - <Content Include="Areas\HelpPage\HelpPage.css" /> - <Content Include="Content\bootstrap.css" /> - <Content Include="Content\bootstrap.min.css" /> - <Content Include="favicon.ico" /> - <Content Include="fonts\glyphicons-halflings-regular.svg" /> - <Content Include="Global.asax" /> - <Content Include="Scripts\bootstrap.js" /> - <Content Include="Scripts\bootstrap.min.js" /> - <Content Include="Areas\HelpPage\Views\Web.config" /> - <Content Include="Areas\HelpPage\Views\Shared\_Layout.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\ResourceModel.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\Index.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\TextSample.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\SimpleTypeModelDescription.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\Samples.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\Parameters.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ModelDescriptionLink.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\KeyValuePairModelDescription.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\InvalidSample.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ImageSample.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\HelpPageApiModel.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\EnumTypeModelDescription.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\DictionaryModelDescription.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ComplexTypeModelDescription.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\CollectionModelDescription.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ApiGroup.cshtml" /> - <Content Include="Areas\HelpPage\Views\Help\Api.cshtml" /> - <Content Include="ApplicationInsights.config"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <None Include="Scripts\jquery-1.10.2.intellisense.js" /> - <Content Include="Scripts\jquery-1.10.2.js" /> - <Content Include="Scripts\jquery-1.10.2.min.js" /> - <Content Include="Scripts\modernizr-2.6.2.js" /> - <Content Include="Scripts\respond.js" /> - <Content Include="Scripts\respond.min.js" /> - <Content Include="Web.config"> - <SubType>Designer</SubType> - </Content> - <Content Include="Web.Debug.config"> - <DependentUpon>Web.config</DependentUpon> - </Content> - <Content Include="Web.Release.config"> - <DependentUpon>Web.config</DependentUpon> - </Content> - <Content Include="Areas\HelpPage\Views\_ViewStart.cshtml" /> - <Content Include="Content\Site.css" /> - <Content Include="Views\Web.config" /> - <Content Include="Views\_ViewStart.cshtml" /> - <Content Include="Views\Home\Index.cshtml" /> - <Content Include="Views\Shared\Error.cshtml" /> - <Content Include="Views\Shared\_Layout.cshtml" /> - </ItemGroup> - <ItemGroup> - <Folder Include="App_Data\" /> - </ItemGroup> - <ItemGroup> - <Content Include="fonts\glyphicons-halflings-regular.woff" /> - </ItemGroup> - <ItemGroup> - <Content Include="fonts\glyphicons-halflings-regular.ttf" /> - </ItemGroup> - <ItemGroup> - <Content Include="fonts\glyphicons-halflings-regular.eot" /> - </ItemGroup> - <ItemGroup> - <Content Include="packages.config" /> - </ItemGroup> - <ItemGroup> - <Content Include="Scripts\jquery-1.10.2.min.map" /> - </ItemGroup> - <PropertyGroup> - <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion> - <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> - </PropertyGroup> - <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" /> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" /> - <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'"> - <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" /> - </Target> - <ProjectExtensions> - <VisualStudio> - <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> - <WebProjectProperties> - <UseIIS>True</UseIIS> - <AutoAssignPort>True</AutoAssignPort> - <DevelopmentServerPort>58478</DevelopmentServerPort> - <DevelopmentServerVPath>/</DevelopmentServerVPath> - <IISUrl>http://localhost:60916/</IISUrl> - <NTLMAuthentication>False</NTLMAuthentication> - <UseCustomServer>False</UseCustomServer> - <CustomServerUrl> - </CustomServerUrl> - <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> - </WebProjectProperties> - </FlavorProperties> - </VisualStudio> - </ProjectExtensions> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>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}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props'))" /> - <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" /> - </Target> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> --> -</Project>
\ No newline at end of file diff --git a/Diagrams/DatabaseDiagram.vsdx b/Diagrams/DatabaseDiagram.vsdx Binary files differindex 1cfefe1..e933214 100644 --- a/Diagrams/DatabaseDiagram.vsdx +++ b/Diagrams/DatabaseDiagram.vsdx |