Merge pull request #12 from Standaard-boos/ProfileV2

Standaard-boos · web-flow · commit 3968d1c56da9 · 2021-11-29T23:14:18.000+01:00
Profile v2
diff --git a/Model/BlockList.cs b/Model/BlockList.cs
@@ -4,31 +4,34 @@
 
 namespace Model
 {
+    /*This class contains the list of all blocked students for the current user*/
     public class BlockList
     {
 
-        private List<Student> BlockedStudents { get; set; }
+        public List<Student> BlockedStudents { get; set; }
         private Student Student;
-
         public BlockList(Student student)
         {
             Student = student;
             BlockedStudents = new List<Student>();
             //update list according to database
         }
 
+        /*Adds arg student to blocked list*/
         public void AddBlock(Student student)
         {
             BlockedStudents.Add(student);
             //database update
         }
 
+        /*removes arg student from blocked list*/
         public void RemoveBlock(Student student)
         {
             BlockedStudents.Remove(student);
             //database update
         }
 
+        /*returns if arg student is in the blocked list*/
         public bool IsBlocked(Student student)
         {
             return BlockedStudents.Contains(student);
diff --git a/Model/MatchList.cs b/Model/MatchList.cs
@@ -4,10 +4,9 @@
 
 namespace Model
 {
-    class MatchList
+    public class MatchList
     {
-
-        private HashSet<Match> Matches { get; set; }
+        public HashSet<Match> Matches { get; set; }
         private Student Student;
 
         public MatchList(Student student)
diff --git a/Model/Profile.cs b/Model/Profile.cs
@@ -7,26 +7,23 @@ namespace Model
     public class Profile
     {
 
-        private Student Student { get; set; }
-        private QAData QAData { get; set; }
-        private MoralsData MoralsData { get; set; }
-        private InterestsData InterestsData { get; set; }
-        private string Description { get; set; }
-        private Media Media { get; set; }
-        private MatchList MatchList { get; set; }
-        private BlockList BlockList { get; set; }
+        public QAData QAData { get; set; }
+        public MoralsData MoralsData { get; set; }
+        public InterestsData InterestsData { get; set; }
+        public string Description { get; set; }
+        public Media Media { get; set; }
+        public MatchList MatchList { get; set; }
+        public BlockList BlockList { get; set; }
 
         public Profile(Student student)
         {
-            Student = student;
             QAData = new QAData(student);
             MoralsData = new MoralsData(student);
             InterestsData = new InterestsData(student);
             Media = new Media(student);
             MatchList = new MatchList(student);
             BlockList = new BlockList(student);
-            Description = ""; //get description from db
-
+            Description = "";
         }
 
     }
diff --git a/Model/Student.cs b/Model/Student.cs
@@ -6,28 +6,36 @@ namespace Model
 {
 
     public enum Relationships { Friends, Business, Love, Study };
-    internal enum DataKeys { Education, Address, DateOfBirth, School, Relationships}
+    internal enum DataKeys { Education, City, DateOfBirth, School, Relationships}
     public class Student
     {
 
         //public Account Account { get; set; }
         public int ID { get; set; }
         public string Email { get; set; }
-        public string Eduction { get; set; }
-        public string Address { get; set; } 
+        public string City { get; set; } 
         public DateTime DateOfBirth { get; set; }
+
+        public string Age { get; set; }
         public School School { get; set; }
         public HashSet<Relationships> Relationships { get; set; }
+        public Profile Profile { get; set; }
+        public string Name { get; set; }
 
         public Student(string email)
         {
             //Account = account;
             Email = email;
-            Eduction = (string)LoadObject(DataKeys.Education);
-            Address = (string)LoadObject(DataKeys.Address);
+            City = (string)LoadObject(DataKeys.City);
             DateOfBirth = (DateTime)LoadObject(DataKeys.DateOfBirth);
+            Age = CalculateAge(DateOfBirth).ToString() + " Jaar";
             School = (School)LoadObject(DataKeys.School);
             Relationships = (HashSet<Relationships>)LoadObject(DataKeys.Relationships);
+            Profile = new Profile(this);
+        }
+
+        public Student()
+        {
         }
 
         private object LoadObject(DataKeys data)
@@ -36,9 +44,7 @@ private object LoadObject(DataKeys data)
             //this method will connect to the database and load the correct data for the object
             switch (data)
             {
-                case DataKeys.Education:
-                    break;
-                case DataKeys.Address:
+                case DataKeys.City:
                     break;
                 case DataKeys.DateOfBirth:
                     break;
@@ -53,6 +59,16 @@ private object LoadObject(DataKeys data)
             return null;
         }
 
+        private static int CalculateAge(DateTime birthDay)
+        {
+            int years = DateTime.Now.Year - birthDay.Year;
+            if ((birthDay.Month > DateTime.Now.Month) || (birthDay.Month == DateTime.Now.Month && birthDay.Day > DateTime.Now.Day))
+            {
+                years--;
+            }
+
+            return years;
+        }
 
     }
 }
diff --git a/View/ProfilePage.xaml b/View/ProfilePage.xaml
@@ -4,11 +4,20 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:View"
+      xmlns:VM="clr-namespace:ViewModel;assembly=ViewModel"
       mc:Ignorable="d" 
       d:DesignHeight="1920" d:DesignWidth="1080"
       Title="Profile">
 
-    <Grid x:Name="AllGrids">
+
+    <Page.Resources>
+        <VM:ProfilePageViewModel x:Key="vm"/>
+    </Page.Resources>
+
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
+    
+    <Grid x:Name="AllGrids" Background="White" DataContext="{StaticResource vm}">
+
         <Grid.RowDefinitions>
             <RowDefinition Height="5*"/>
             <RowDefinition Height="35*"/>
@@ -17,17 +26,19 @@
             <RowDefinition Height="10*"/>
             <RowDefinition Height="10*"/>
             <RowDefinition Height="20*"/>
-            <RowDefinition Height="5*"/>
+            <RowDefinition Height="5*" MinHeight="50px"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="9*"/>
             <ColumnDefinition Width="80*"/>
-            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="9*"/>
+            <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
+
         <Canvas x:Name="PhotoCarousel" Grid.Column="1" Grid.Row ="1" Grid.ColumnSpan="3" Grid.RowSpan="1" Background="#23000000"/>
         <Grid x:Name="MainInfoGrid" Grid.Column="2" Grid.Row="2" Background="{StaticResource BackgroundSecundary}">
+
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="25*"/>
                 <ColumnDefinition Width="25*"/>
@@ -38,20 +49,24 @@
                 <RowDefinition Height="60*"/>
                 <RowDefinition Height="40*"/>
             </Grid.RowDefinitions>
-            <Label x:Name="NameLabel" HorizontalAlignment="Center" Content="PETER JANSEN" Grid.ColumnSpan="4" Grid.RowSpan="1" FontSize="48"/>
-            <Label x:Name="AgeLabel" Content="24 jaar" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Stretch"/>
-            <Label x:Name="LocationLabel" Content="Zwolle" Grid.Column="1" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Stretch"/>
-            <Label x:Name="SchoolNameLabel" Content="Windesheim" Grid.Column="2" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Stretch"/>
-            <Label x:Name="EducationLabel" Content="HBO-ICT" Grid.Column="3" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Stretch"/>
+
+            <Label x:Name="NameLabel" HorizontalAlignment="Center" Content="{Binding Name}" Grid.ColumnSpan="4" Grid.RowSpan="1" FontSize="32"/>
+            <Label x:Name="AgeLabel" Content="{Binding Age}" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Stretch" FontSize="16"/>
+            <Label x:Name="LocationLabel" Content="{Binding City}" Grid.Column="1" HorizontalAlignment="Center" Grid.Row="1" FontSize="16" VerticalAlignment="Stretch"/>
+            <Label x:Name="SchoolNameLabel" Content="{Binding School}" Grid.Column="2" HorizontalAlignment="Center" Grid.Row="1" FontSize="16" VerticalAlignment="Stretch"/>
+            <Label x:Name="EducationLabel" Content="{Binding Study}" Grid.Column="3" HorizontalAlignment="Center" Grid.Row="1" FontSize="16" VerticalAlignment="Stretch"/>
         </Grid>
-        <Grid x:Name="InterestsGrid" Grid.Column="2" Grid.Row="3" Background="{StaticResource BackgroundSecundary}"/>
-        <Grid x:Name="InformationTextGrid" Grid.Column="2" Grid.Row="4" Background="{StaticResource BackgroundSecundary}">
-            <TextBlock x:Name="DescriptionTextBox" TextWrapping="WrapWithOverflow" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."/>
+        <Grid x:Name="InterestsGrid" Grid.Column="2" Grid.Row="3" Background="{StaticResource BackgroundSecundary}" MinHeight="100px"/>
+        <Grid x:Name="InformationTextGrid" Grid.Column="2" Grid.Row="4" Background="{StaticResource BackgroundSecundary}" MinHeight="250px">
+            <TextBlock x:Name="DescriptionTextBox" TextWrapping="WrapWithOverflow" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" FontSize="18" Text="{Binding Description}"/>
         </Grid>
-        <Grid/>
+        <Grid/>      
+
         <Grid x:Name="QAGrid" Grid.Column="2" Grid.Row="5" Background="{StaticResource BackgroundSecundary}"/>
         <Grid/>
         <Grid x:Name="PriorityGrid" Grid.Column="2" Grid.Row="6" Background="{StaticResource BackgroundSecundary}">
+          
+
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="2*"/>
                 <ColumnDefinition Width="8*"/>
@@ -65,6 +80,7 @@
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
+
             <Label x:Name="PriorityLabelIntelligence" Grid.Column="0" Grid.Row="0" Content="Intelligentie" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="10,0,0,0"/>
             <ProgressBar x:Name="IntelligenceProgressBar" Grid.Column="1" Grid.Row="0" Background="{StaticResource BackgroundSecundary}" Margin="10,10,10,10" Value="50" Foreground="{StaticResource BackgroundQuaternary}" MaxHeight="12" MinHeight="12"/>
 
@@ -85,7 +101,9 @@
 
             <Label x:Name="ClimateLabel" Grid.Column="0" Grid.Row="6" Content="Klimaat" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="10,0,0,0"/>
             <ProgressBar x:Name="ClimateProgressBar" Grid.Column="1" Grid.Row="6" Background="{StaticResource BackgroundSecundary}" Margin="10,10,10,10" Value="10" Foreground="{StaticResource BackgroundQuaternary}" MaxHeight="12" MinHeight="12"/>
+
         </Grid>
 
     </Grid>
+    </ScrollViewer>
 </Page>
diff --git a/ViewModel/ProfilePageViewModel.cs b/ViewModel/ProfilePageViewModel.cs
@@ -0,0 +1,93 @@
+﻿using System;
+using System.ComponentModel;
+using Model;
+namespace ViewModel
+{
+    public class ProfilePageViewModel : INotifyPropertyChanged
+    {
+        public string Name
+        {
+            get => _student.Name;
+            set
+            {
+                _student.Name = value;
+                OnPropertyChanged("Name");
+            }
+        }
+
+        public string School
+        {
+            get => _student.School.Name;
+            set
+            {
+                _student.School.Name = value;
+                OnPropertyChanged("School");
+            }
+        }
+
+        public string City
+        {
+            get => _student.City;
+            set
+            {
+                _student.City = value;
+                OnPropertyChanged("Address");
+            }
+        }
+
+        public string Study
+        {
+            get => _student.School.Study;
+            set
+            {
+                _student.School.Study = value;
+                OnPropertyChanged("Study");
+            }
+        }
+
+        public string Age
+        {
+            get => _student.Age;
+            set
+            {
+                _student.Age = value;
+                OnPropertyChanged("Age");
+            }
+        }
+
+        public string Description
+        {
+            get => _student.Profile.Description;
+            set
+            {
+                _student.Profile.Description = value;
+                OnPropertyChanged("Description");
+            }
+        }
+
+        private Student _student;
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public ProfilePageViewModel()
+        {
+            _student = new Student
+            {
+                Name = "Henk Pitjes",
+                School = new School("Windesheim", "Zwolle", "HBO-ICT"),
+                Age = "25 jaar",
+                City = "Leeuwarden",
+                Email = "Foo@bar.com",
+                ID = 1,
+                Profile = new Profile(_student)
+            };
+            _student.Profile.Description = "Laat me raden... Je hebt al de nodige bagage. Dit hele online daten is niet wat je wilt, omdat je liever iemand in de supermarkt ontmoet. Dat begrijp ik. En eerlijk gezegd? Ik ook. Hoi, ik ben Jack. Ik lijk niet op Ryan Gosling. Ik heb geen vrijwilligerswerk gedaan in Madagaskar. En heel eerlijk? Grote vissen vind té eng om mee te poseren. Wat ik wil zeggen is… dat ik niet perfect ben. En dat verwacht ik ook niet van jou. Wat ik wel ben? Doordeweeks ga ik door het leven als datingconsulent. Het geeft me een fijn gevoel om te zien hoe eenzame mensen veranderen in stralende levensgenieters. Mensen vragen me weleens wat ik doe.En dan zeg ik: “Ik voorspel de toekomst“. Als datingconsulent heb ik geen glazen bol nodig. Ik leg foto’s van mensen naast elkaar op tafel, geen tarot kaarten.Maar wat ik van maandag tot vrijdag vooral doe, is uitkijken naar zaterdag en zondag. Want dan gaan de serieuze kleren uit en spring ik in het diepe. Letterlijk, want ik zwem graag. Het liefst met een duikfles op mijn rug om de verloren schatten van de Rijn te ontdekken. Tot nu toe zijn het alleen halve fietswrakken geweest en verroeste auto-onderdelen, maar hey… ik geef de moed niet op. Een andere schat waar ik naar op zoek ben is intelligent, creatief en een familiemens. Klinkt dat als jou? Ik geef eerlijk toe dat ik soms met een beetje geluk de toekomst van anderen kan voorspellen, maar ik ben geen helderziende.Dus, als je denkt dat wij een klik kunnen hebben… Stuur me een bericht!"; //get description from db
+        }
+
+        private void OnPropertyChanged(string property = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
+        }
+
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -4,31 +4,34 @@`
`4`	`4`
`5`	`5`	`namespace Model`
`6`	`6`	`{`
	`7`	`+ /This class contains the list of all blocked students for the current user/`
`7`	`8`	`public class BlockList`
`8`	`9`	`{`
`9`	`10`
`10`		`- private List<Student> BlockedStudents { get; set; }`
	`11`	`+ public List<Student> BlockedStudents { get; set; }`
`11`	`12`	`private Student Student;`
`12`		`-`
`13`	`13`	`public BlockList(Student student)`
`14`	`14`	`{`
`15`	`15`	`Student = student;`
`16`	`16`	`BlockedStudents = new List<Student>();`
`17`	`17`	`//update list according to database`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ /Adds arg student to blocked list/`
`20`	`21`	`public void AddBlock(Student student)`
`21`	`22`	`{`
`22`	`23`	`BlockedStudents.Add(student);`
`23`	`24`	`//database update`
`24`	`25`	`}`
`25`	`26`
	`27`	`+ /removes arg student from blocked list/`
`26`	`28`	`public void RemoveBlock(Student student)`
`27`	`29`	`{`
`28`	`30`	`BlockedStudents.Remove(student);`
`29`	`31`	`//database update`
`30`	`32`	`}`
`31`	`33`
	`34`	`+ /returns if arg student is in the blocked list/`
`32`	`35`	`public bool IsBlocked(Student student)`
`33`	`36`	`{`
`34`	`37`	`return BlockedStudents.Contains(student);`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,9 @@`
`4`	`4`
`5`	`5`	`namespace Model`
`6`	`6`	`{`
`7`		`- class MatchList`
	`7`	`+ public class MatchList`
`8`	`8`	`{`
`9`		`-`
`10`		`- private HashSet<Match> Matches { get; set; }`
	`9`	`+ public HashSet<Match> Matches { get; set; }`
`11`	`10`	`private Student Student;`
`12`	`11`
`13`	`12`	`public MatchList(Student student)`