Merge.

12 files changed, 77 insertions, 91 deletions

diff --git a/ApartmentAdmin b/ApartmentAdmin
new file mode 160000
+Subproject f4d7fc3fa885184fb073fbae2aea28a476a85b8
diff --git a/ApartmentManager/ApartmentManager/ApartmentManager.csproj b/ApartmentManager/ApartmentManager/ApartmentManager.csproj
index 1f2eda3..23935b1 100644
--- a/ApartmentManager/ApartmentManager/ApartmentManager.csproj
+++ b/ApartmentManager/ApartmentManager/ApartmentManager.csproj
@@ -100,21 +100,18 @@
     </Compile>
     <Compile Include="Common\RelayCommand.cs" />
     <Compile Include="Controls\NavMenuListView.cs" />
-    <Compile Include="Model\Class1.cs" />
     <Compile Include="Model\NavMenuItem.cs" />
+    <Compile Include="Model\User.cs" />
     <Compile Include="Persistency\Persistency.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="View\ApartmentPage.xaml.cs">
       <DependentUpon>ApartmentPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\ApartmentPlanPage.xaml.cs">
-      <DependentUpon>ApartmentPlanPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="View\LoginPage.xaml.cs">
       <DependentUpon>LoginPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\PersonalInfoPagexaml.xaml.cs">
-      <DependentUpon>PersonalInfoPagexaml.xaml</DependentUpon>
+    <Compile Include="View\PersonalInfoPage.xaml.cs">
+      <DependentUpon>PersonalInfoPage.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -138,27 +135,15 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="AppShell.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Styles\Styles.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="View\ApartmentPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
-    </Page>
-    <Page Include="View\ApartmentPlanPage.xaml">
       <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
     </Page>
     <Page Include="View\LoginPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\PersonalInfoPagexaml.xaml">
+    <Page Include="View\PersonalInfoPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/ApartmentManager/ApartmentManager/Model/Class1.cs b/ApartmentManager/ApartmentManager/Model/Class1.cs
deleted file mode 100644
index 08e3d73..0000000
--- a/ApartmentManager/ApartmentManager/Model/Class1.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ApartmentManager.Model
-{
-    class Class1
-    {
-    }
-}
diff --git a/ApartmentManager/ApartmentManager/Model/User.cs b/ApartmentManager/ApartmentManager/Model/User.cs
new file mode 100644
index 0000000..280d959
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/Model/User.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ApartmentManager.Model
+{
+   public class User
+    {
+        public string Name { get; set; }
+        public string LastName { get; set; }
+        public int Phone { get; set; }
+        public DateTime BirthDate { get; set; }
+        public string Email { get; set; }
+        public int ApartmentNr { get; set; }
+
+        public User() { }
+
+        public User(string Name, string LastName, int Phone, DateTime BirthDate, string Email, int ApartmentNr)
+        {
+            this.Name = Name;
+            this.LastName = LastName;
+            this.Phone = Phone;
+            this.BirthDate = BirthDate;
+            this.Email = Email;
+            this.ApartmentNr = ApartmentNr;
+
+        }
+
+        //public override string ToString()
+        //{
+        //    return string.Format("Hotelno {0} Name {1} Address {2}", Hotel_No, Name, Address);
+        //}
+
+    }
+}
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml
index da8d7dd..c2a3594 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml
+++ b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml
@@ -19,7 +19,7 @@
             </StackPanel>
             <StackPanel Width="400" Height="300" VerticalAlignment="Top" HorizontalAlignment="Right">
                 <Button  Margin="0,10,0,10" Content="Apartment Plan" HorizontalAlignment="Stretch" Click="click"/>
-                <Button  Margin="0,10,0,10" Content="Personal Info" HorizontalAlignment="Stretch"></Button>
+                <Button  Margin="0,10,0,10" Content="Personal Info" HorizontalAlignment="Stretch" Click="GotoPernalInfoPage"></Button>
                 <Button  Margin="0,10,0,10" Content="Residents" HorizontalAlignment="Stretch"></Button>
                 <Button  Margin="0,10,0,10" Content="Apartment Changes" HorizontalAlignment="Stretch"></Button>
                 <Button  Margin="0,10,0,10" Content="Apartment Defects" HorizontalAlignment="Stretch"></Button>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs
index 32f0079..f977517 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/ApartmentPage.xaml.cs
@@ -29,7 +29,12 @@ namespace ApartmentManager.View
 
         private void click(object sender, RoutedEventArgs e)
         {
-            Frame.Navigate(typeof(ApartmentPlanPage));
+            
+        }
+
+        private void GotoPernalInfoPage(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(PersonalInfoPage));
         }
     }
 }
diff --git a/ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml b/ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml
new file mode 100644
index 0000000..5e84fcf
--- /dev/null
+++ b/ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml
@@ -0,0 +1,27 @@
+<Page
+    x:Class="ApartmentManager.View.PersonalInfoPage"
+    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}">
+        <StackPanel Margin="50">
+            <StackPanel Width="400">
+                <TextBlock Margin="0,10,0,10" Text="Name"></TextBlock>
+                <TextBox ></TextBox>
+                <TextBlock Margin="0,10,0,10" Text="Last Name"></TextBlock>
+                <TextBox ></TextBox>
+                <TextBlock Margin="0,10,0,10" Text="Birthdate"></TextBlock>
+                <DatePicker HorizontalAlignment="Stretch"></DatePicker>
+                <TextBlock Margin="0,10,0,10" Text="Email Address"></TextBlock>
+                <TextBox ></TextBox>
+                <TextBlock Margin="0,10,0,10" Text="Phone Number"></TextBlock>
+                <TextBox ></TextBox>
+                <Button  Margin="0,10,0,10" Content="Update" HorizontalAlignment="Stretch"></Button>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs b/ApartmentManager/ApartmentManager/View/PersonalInfoPage.xaml.cs
index 45feb63..984e8af 100644
--- a/ApartmentManager/ApartmentManager/View/ApartmentPlanPage.xaml.cs
+++ b/ApartmentManager/ApartmentManager/View/PersonalInfoPage.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 ApartmentPlanPage : Page
+    public sealed partial class PersonalInfoPage : Page
     {
-        public ApartmentPlanPage()
+        public PersonalInfoPage()
         {
             this.InitializeComponent();
         }
diff --git a/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml b/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml
deleted file mode 100644
index de41310..0000000
--- a/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Page
-    x:Class="ApartmentManager.View.PersonalInfoPagexaml"
-    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}">
-        <StackPanel Margin="50">
-        <StackPanel Width="400">
-            <TextBlock Margin="0,10,0,10" Text="User Name"></TextBlock>
-            <TextBox ></TextBox>
-            <TextBlock Margin="0,10,0,10" Text="Password"></TextBlock>
-                <TextBox ></TextBox>
-            <TextBlock Margin="0,10,0,10" Text="Password"></TextBlock>
-            <TextBox ></TextBox>
-            </StackPanel>
-        <StackPanel>
-            <Button  Margin="0,10,0,10" Content="Log In" HorizontalAlignment="Stretch"></Button>
-        </StackPanel>
-        </StackPanel>
-
-    </Grid>
-</Page>
diff --git a/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml.cs b/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.xaml.cs
deleted file mode 100644
index 692570e..0000000
--- a/ApartmentManager/ApartmentManager/View/PersonalInfoPagexaml.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 PersonalInfoPagexaml : Page
-    {
-        public PersonalInfoPagexaml()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/HousingDatabase.ldf b/HousingDatabase.ldf
index f653838..12dcf09 100644
--- a/HousingDatabase.ldf
+++ b/HousingDatabase.ldf
diff --git a/HousingDatabase.mdf b/HousingDatabase.mdf
index 14ef64e..25f4551 100644
--- a/HousingDatabase.mdf
+++ b/HousingDatabase.mdf