47 files changed, 228 insertions, 177 deletions
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml
deleted file mode 100644
index a102840..0000000
--- a/ApartmentManager/ApartmentManager/View/ApartmentDefectPage.xaml
+++ /dev/null
@@ -1,127 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.ApartmentDefectPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ViewModel="using:ApartmentManager.ViewModel"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:ApartmentManager.View"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <ViewModel:ApartmentViewModel/>
-    </Page.DataContext>
-
-    <Page.BottomAppBar>
-        <CommandBar>
-            <CommandBar.Content>
-                <Grid />
-            </CommandBar.Content>
-            <AppBarButton
-                Click="NavigateNewDefect"               
-                Icon="Add"
-                Label="Create Defect">
-            </AppBarButton>
-        </CommandBar>
-    </Page.BottomAppBar>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="45"/>
-            <RowDefinition/>
-        </Grid.RowDefinitions>
-        
-            <TextBlock Grid.Row="0"
-                HorizontalAlignment="Center"
-                FontSize="30"
-                FontWeight="Bold"
-                Text="Apartment Changes">
-            </TextBlock>
-
-        <ListView ItemsSource="{Binding CatalogSingleton.Defects}" SelectedItem="{Binding CatalogSingleton.SelectedDefect, Mode=TwoWay}" SelectionChanged="NavigateDefectViewPage" Grid.Row="1" Background="LightGray">
-            <ListView.ItemContainerStyle>
-                <Style TargetType="ListViewItem">
-                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                </Style>
-            </ListView.ItemContainerStyle>
-
-
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <Grid Height="200" BorderThickness ="1" Margin="12,12,12,0" BorderBrush="#DFE0E4" Background="White" >
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="200" />
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-
-                        <Image
-                                Margin="5"
-                                Source="{Binding Pictures[0].Picture}"
-                                Stretch="Fill">
-                        </Image>
-
-                        <StackPanel Grid.Column="1" Margin="10">
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock
-                                        Margin="0,0,10,0"
-                                        FontSize="30"
-                                        FontWeight="Bold"
-                                        Text="Name :">
-                                </TextBlock>
-                                <TextBlock
-                                        Margin="0,0,10,0"
-                                        FontSize="30"
-                                        Text="{Binding Name}">
-                                </TextBlock>
-
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock
-                                        Width="800"
-                                        Height="108"
-                                        Margin="0,0,10,0"
-                                        FontSize="20"
-                                        Text="{Binding Description}"
-                                        TextWrapping="Wrap">
-                                </TextBlock>
-                            </StackPanel>
-
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock
-                                        Margin="0,0,10,0"
-                                        FontSize="25"
-                                        FontWeight="Bold"
-                                        Text="Status :">
-                                </TextBlock>
-                                <TextBlock
-                                        Margin="0,0,10,0"
-                                        FontSize="25"
-                                        Text="{Binding Status}">
-                                </TextBlock>
-
-                                <TextBlock
-                                        Margin="700,0,10,0"
-                                        HorizontalAlignment="Left"
-                                        FontSize="25"
-                                        FontWeight="Bold"
-                                        Text="Date Submitted :">
-                                </TextBlock>
-
-                                <TextBlock FontSize="25" Text="{Binding UploadDate.Year}" />
-                                <TextBlock FontSize="25" Text="-" />
-                                <TextBlock FontSize="25" Text="{Binding UploadDate.Month}" />
-                                <TextBlock FontSize="25" Text="-" />
-                                <TextBlock FontSize="25" Text="{Binding UploadDate.Day}" />
-                            </StackPanel>
-                        </StackPanel>
-                    </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-
-        </ListView>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml
index 78907a0..78907a0 100644
--- a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml.cs
index d7d67e6..d7d67e6 100644
--- a/ApartmentManager/ApartmentManager/View/BmApartmentsPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmApartmentsPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml
index 215496b..b0e9a45 100644
--- a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml
@@ -78,7 +78,7 @@
         <ListView
             x:Name="ChangesList"
             Grid.Row="1"
-            ItemsSource="{Binding BmSingleton.ApartmentChanges}"
+            ItemsSource="{Binding BmSingleton.Changes}"
             SelectedItem="{Binding ChangeTemplate, Mode=TwoWay}">
             <ListView.ItemContainerStyle>
                 <Style BasedOn="{StaticResource ListItemStyle}" TargetType="ListViewItem" />
diff --git a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml.cs
index a63f85c..a63f85c 100644
--- a/ApartmentManager/ApartmentManager/View/BmChangesPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmChangesPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml
index 3c63754..3c63754 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml.cs
index 41c3f67..41c3f67 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateApartmentPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateApartmentPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml
index e2e19cd..e2e19cd 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml.cs
index 054bca6..054bca6 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateChangePage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateChangePage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml
index e667583..e667583 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml.cs
index 62fc8d2..62fc8d2 100644
--- a/ApartmentManager/ApartmentManager/View/BmCreateDefectPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmCreateDefectPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml
index b6c9759..b6c9759 100644
--- a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml.cs
index 8b38af0..8b38af0 100644
--- a/ApartmentManager/ApartmentManager/View/BmDefectsPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmDefectsPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml
index 46ea641..46ea641 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml.cs
index 63e71eb..63e71eb 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditApartmentPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditApartmentPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml
index 6d8518a..6d8518a 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml.cs
index 715f47e..715f47e 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditChangePage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditChangePage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml
index 5089904..5089904 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml
diff --git a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml.cs
index edba09e..edba09e 100644
--- a/ApartmentManager/ApartmentManager/View/BmEditDefectPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmEditDefectPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml
index 3cf03a3..e812cc0 100644
--- a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml
@@ -19,6 +19,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="600" />
                 <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="200" />
             </Grid.ColumnDefinitions>
             <Image
                 Grid.Column="0"
@@ -29,7 +30,7 @@
                     Margin="0,0,0,10"
                     HorizontalAlignment="Stretch"
                     FontSize="20"
-                    Text="Manage:" />
+                    Text="Manage all:" />
                 <Button
                     Margin="0,0,0,10"
                     HorizontalAlignment="Stretch"
@@ -76,7 +77,54 @@
                     Content="Apartment changes">
                     <interactivity:Interaction.Behaviors>
                         <core:EventTriggerBehavior EventName="Click">
-                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmApartmentChangesPage" />
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.BmChangesPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+            </StackPanel>
+            <StackPanel Grid.Column="2" Margin="20,0,0,0">
+                <TextBlock
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    FontSize="20"
+                    Text="Manage your:" />
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Apartment">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.ApartmentPlanPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Apartment Residents">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.ApartmentResidentsPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Apartment Defects">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.ApartmentDefectPage" />
+                        </core:EventTriggerBehavior>
+                    </interactivity:Interaction.Behaviors>
+                </Button>
+                <Button
+                    Margin="0,0,0,10"
+                    HorizontalAlignment="Stretch"
+                    Content="Apartment changes">
+                    <interactivity:Interaction.Behaviors>
+                        <core:EventTriggerBehavior EventName="Click">
+                            <core:NavigateToPageAction TargetPage="ApartmentManager.View.ApartmentChangesPage" />
                         </core:EventTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                 </Button>
diff --git a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml.cs b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml.cs
index 5d287f1..5d287f1 100644
--- a/ApartmentManager/ApartmentManager/View/BmMainPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmMainPage.xaml.cs
diff --git a/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml
index 332ef2a..332ef2a 100644
--- a/ApartmentManager/ApartmentManager/View/BmResidentsPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/Board member pages/BmResidentsPage.xaml
diff --git a/ApartmentManager/Ap