From 68d95074babccf9e2d714a03748241c25f432210 Mon Sep 17 00:00:00 2001
From: Donatas Adamonis <dona0169@edu.easj.dk>
Date: Fri, 5 May 2017 17:24:37 +0200
Subject: rename pages

---
 .../ApartmentManager/ApartmentManager.csproj       | 12 +++----
 .../ApartmentManager/View/ApartmentPlanPage.xaml   | 14 ++------
 .../View/ApartmentPlanPage.xaml.cs                 | 30 +++++++++++++++++
 .../View/ApartmentResidentsPage.xaml               | 38 ++++++++++++++++++++++
 .../View/ApartmentResidentsPage.xaml.cs            | 30 +++++++++++++++++
 .../ApartmentManager/View/PlanPage.xaml            | 14 --------
 .../ApartmentManager/View/PlanPage.xaml.cs         | 30 -----------------
 .../ApartmentManager/View/ResidentsPage.xaml       | 38 ----------------------
 .../ApartmentManager/View/ResidentsPage.xaml.cs    | 30 -----------------
 .../HousingWebApi/HousingWebApi.csproj             |  4 +--
 10 files changed, 109 insertions(+), 131 deletions(-)
 create mode 100644 ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs
 create mode 100644 ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml
 create mode 100644 ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/PlanPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/PlanPage.xaml.cs
 delete mode 100644 ApartmentManager/ApartmentManager/View/ResidentsPage.xaml
 delete mode 100644 ApartmentManager/ApartmentManager/View/ResidentsPage.xaml.cs

diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj
index dfd029d..f433093 100644
--- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj
+++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj
@@ -140,11 +140,11 @@
     <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>
@@ -213,11 +213,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/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/ApartmentPlanPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs
new file mode 100644
index 0000000..bce6221
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.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 PlanPage : Page
+    {
+        public PlanPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml
new file mode 100644
index 0000000..c68b1bc
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml
@@ -0,0 +1,38 @@
+<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.ResidentsPage"
+    mc:Ignorable="d">
+
+    <Page.DataContext>
+        <ViewModel:ApartmentViewModel/>
+    </Page.DataContext>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel Margin="50" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="top" >
+            <ListView  HorizontalAlignment="Left" Margin="0,50,50,0" VerticalAlignment="Top" ItemsSource="{Binding CatalogSingleton.Residents}" SelectedItem="{Binding NewResident, Mode=TwoWay}"/>
+            <StackPanel Width="400" Margin="0,0,50,0">
+                <TextBlock Margin="0,10,0,10" Text="Resident Info" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"/>
+                <TextBlock Margin="0,10,0,10" Text="Name"/>
+                <TextBox Text="{Binding NewResident.FirstName, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Last Name"/>
+                <TextBox Text="{Binding NewResident.LastName, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Birthdate"/>
+                <DatePicker HorizontalAlignment="Stretch" Date="{Binding NewResident.BirthDate, Mode=TwoWay}"/>
+                <TextBlock Margin="0,10,0,10" Text="Email Address"/>
+                <TextBox Text="{Binding NewResident.Email, Mode=TwoWay}" />
+                <TextBlock Margin="0,10,0,10" Text="Phone Number"/>
+                <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="Delete" Width="125" Command="{Binding DeleteResidentCommand}"/>
+                    <Button  Margin="13,10,0,10" Content="Update" Width="125" Command="{Binding UpdateResidentCommand}"/>
+                </StackPanel>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.xaml.cs
new file mode 100644
index 0000000..46e9f6f
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/ApartmentResidentsPage.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 ResidentsPage : Page
+    {
+        public ResidentsPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
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"
-    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"
-    mc:Ignorable="d">
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <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/PlanPage.xaml.cs
deleted file mode 100644
index bce6221..0000000
--- a/ApartmentManager/ApartmentManager/View/PlanPage.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class PlanPage : Page
-    {
-        public PlanPage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml b/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml
deleted file mode 100644
index c68b1bc..0000000
--- a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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.ResidentsPage"
-    mc:Ignorable="d">
-
-    <Page.DataContext>
-        <ViewModel:ApartmentViewModel/>
-    </Page.DataContext>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <StackPanel Margin="50" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="top" >
-            <ListView  HorizontalAlignment="Left" Margin="0,50,50,0" VerticalAlignment="Top" ItemsSource="{Binding CatalogSingleton.Residents}" SelectedItem="{Binding NewResident, Mode=TwoWay}"/>
-            <StackPanel Width="400" Margin="0,0,50,0">
-                <TextBlock Margin="0,10,0,10" Text="Resident Info" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold"/>
-                <TextBlock Margin="0,10,0,10" Text="Name"/>
-                <TextBox Text="{Binding NewResident.FirstName, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Last Name"/>
-                <TextBox Text="{Binding NewResident.LastName, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Birthdate"/>
-                <DatePicker HorizontalAlignment="Stretch" Date="{Binding NewResident.BirthDate, Mode=TwoWay}"/>
-                <TextBlock Margin="0,10,0,10" Text="Email Address"/>
-                <TextBox Text="{Binding NewResident.Email, Mode=TwoWay}" />
-                <TextBlock Margin="0,10,0,10" Text="Phone Number"/>
-                <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="Delete" Width="125" Command="{Binding DeleteResidentCommand}"/>
-                    <Button  Margin="13,10,0,10" Content="Update" Width="125" Command="{Binding UpdateResidentCommand}"/>
-                </StackPanel>
-            </StackPanel>
-        </StackPanel>
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml.cs
deleted file mode 100644
index 46e9f6f..0000000
--- a/ApartmentManager/ApartmentManager/View/ResidentsPage.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace ApartmentManager.View
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ResidentsPage : Page
-    {
-        public ResidentsPage()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/ApartmentManager/HousingWebApi/HousingWebApi.csproj b/ApartmentManager/HousingWebApi/HousingWebApi.csproj
index f824c8e..6f8fde1 100644
--- a/ApartmentManager/HousingWebApi/HousingWebApi.csproj
+++ b/ApartmentManager/HousingWebApi/HousingWebApi.csproj
@@ -151,12 +151,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Models\Apartment.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="Models\Apartment.cs" />
     <Compile Include="App_Start\BundleConfig.cs" />
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
@@ -198,8 +198,8 @@
     <Compile Include="Models\PastContractOwner.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Models\Resident.cs" />
-    <Compile Include="Models\User.cs" />
     <Compile Include="ResidentList.cs" />
+    <Compile Include="Models\User.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\HelpPage\HelpPage.css" />
-- 
cgit v1.2.3