Merge pull request #18 from Standaard-boos/ProfileV2

Profile v2

Author: Standaard-boos

Gateway/ProfileDataAccess.cs

@@ -0,0 +1,17 @@
+using Dapper;
+using System.Collections.Generic;
+using System.Data;
+
+namespace Gateway
+{
+    public class ProfileDataAccess
+    {
+
+        public static List<string> GetAllInterests()
+        {
+            using IDbConnection connection = new System.Data.SqlClient.SqlConnection(FiddleHelper.GetConnectionStringSql("StudentMatcherDB"));
+            return (List<string>)connection.Query<string>("SELECT HobbyName FROM HobbyType");
+        }
+
+    }
+}

Model/Student.cs

@@ -13,50 +13,33 @@ public class Student
         //public Account Account { get; set; }
         public int ID { get; set; }
         public string Email { get; set; }
-        public string City { 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 string FirstName { get; set; }
+        public string LastName { get; set; }
+        public bool Sex { get; set; }
 
         public Student(string email)
         {
             //Account = account;
             Email = email;
-            City = (string)LoadObject(DataKeys.City);
-            DateOfBirth = (DateTime)LoadObject(DataKeys.DateOfBirth);
+            City = (string)"";
+            DateOfBirth = (DateTime)DateTime.MaxValue;
             Age = CalculateAge(DateOfBirth).ToString() + " Jaar";
-            School = (School)LoadObject(DataKeys.School);
-            Relationships = (HashSet<Relationships>)LoadObject(DataKeys.Relationships);
+            School = (School)new School("", "", "");
+            Relationships = (HashSet<Relationships>)new HashSet<Relationships>();
+
             Profile = new Profile(this);
         }
 
         public Student()
         {
-        }
-
-        private object LoadObject(DataKeys data)
-        {
-
-            //this method will connect to the database and load the correct data for the object
-            switch (data)
-            {
-                case DataKeys.City:
-                    break;
-                case DataKeys.DateOfBirth:
-                    break;
-                case DataKeys.School:
-                    break;
-                case DataKeys.Relationships:
-                    break;
-                default:
-                    break;
-            }
-
-            return null;
+            Profile = new Profile(this);
         }
 
         private static int CalculateAge(DateTime birthDay)

View/App.xaml

@@ -2,7 +2,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:View"
-             xmlns:stylingHelperTools="clr-namespace:View.StylingHelperTools"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary Source="Styling/Main.xaml"/>

View/Converters/MultiPageEqualsConverter.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Windows.Data;
+
+namespace View.Converters
+{
+    public class MultiPageEqualsConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool ret = true;
+            if (values.Length == 0) return true;
+            if (values[0].GetType() != typeof(string)) throw new NotImplementedException();
+            string first = (string)(values[0]);
+            foreach (var val in values)
+            {
+                if (val.GetType() != typeof(string)) throw new NotImplementedException();
+                if (!(
+                    ((string)val).Equals(first) ||
+                    ((string)val).Equals("View;component/" + first)
+                    ))
+                    ret = false;
+            }
+            return ret;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotSupportedException();
+        }
+    }
+}

…tylingHelperTools/isLessThanConverter.cs View/Converters/isLessThanConverter.csView/StylingHelperTools/isLessThanConverter.cs renamed to View/Converters/isLessThanConverter.cs View/StylingHelperTools/isLessThanConverter.cs renamed to View/Converters/isLessThanConverter.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Windows.Data;
 
-namespace View.StylingHelperTools
+namespace View.Converters
 {
     public class isLessThanConverter : IValueConverter
     {

View/HomePage.xaml

@@ -0,0 +1,17 @@
+<Page x:Class="View.HomePage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:View"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="HomePage">
+
+    <Grid>
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock Text="Welkom persoon!" Margin="5"/>
+            <Button Click="Login_Click" Content="Login" HorizontalAlignment="Center" VerticalAlignment="Center" Padding="5,2,5,2" Margin="5"/>
+        </StackPanel>
+    </Grid>
+</Page>

View/HomePage.xaml.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using View.Authentication;
+
+namespace View
+{
+    /// <summary>
+    /// Interaction logic for HomePage.xaml
+    /// </summary>
+    public partial class HomePage : Page
+    {
+        public HomePage()
+        {
+            InitializeComponent();
+        }
+
+        private void Login_Click(object sender, RoutedEventArgs e)
+        {
+            AuthenticationWindow authenticationWindow = new AuthenticationWindow();
+            authenticationWindow.Show();
+        }
+    }
+}

View/MainWindow.xaml

@@ -6,6 +6,7 @@
         xmlns:local="clr-namespace:View"
         xmlns:vm="clr-namespace:ViewModel;assembly=ViewModel"
         xmlns:vmc="clr-namespace:ViewModel.Commands;assembly=ViewModel"
+        xmlns:converters="clr-namespace:View.Converters"
         mc:Ignorable="d"
         Style="{StaticResource {x:Type Window}}"
         Title="Stugether" Height="450" Width="800">
@@ -21,16 +22,19 @@
             <RowDefinition Height="35"/>
             <RowDefinition Height="1*"/>
         </Grid.RowDefinitions>
-        <Grid Height="{Binding ActualHeight, ElementName=tbContentTitle, Mode=OneWay}">
+        <Grid Height="{Binding ActualHeight, ElementName=tbContentTitle, Mode=OneWay}" Background="{StaticResource BackgroundSecundary}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*" />
                 <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
-            <Button x:Name="btPreviousButton" Content="&lt;" Margin="5,5,5,5" Click="NavigationNextPreviousButton_Click"/>
-            <Button x:Name="btNextButton" Content="&gt;" Grid.Column="1" Margin="5" Click="NavigationNextPreviousButton_Click"/>
+            <Button x:Name="btPreviousButton" Margin="5,5,5,5" Command="NavigationCommands.BrowseBack" CommandTarget="{Binding ElementName=frContent}">
+                <Path Margin="0,0,2,0" HorizontalAlignment="Center" VerticalAlignment="Center" Data="M 4 0 L 0 4 L 4 8 Z" Fill="#FF444444"/>
+            </Button>
+            <Button x:Name="btNextButton" Grid.Column="1" Margin="5" Command="NavigationCommands.BrowseForward" CommandTarget="{Binding ElementName=frContent}">
+                <Path Margin="0,0,2,0" HorizontalAlignment="Center" VerticalAlignment="Center" Data="M 0 0 L 4 4 L 0 8 Z" Fill="#FF444444"/>
+            </Button>
         </Grid>
         <!-- The Stackpanel doesn't allow a binding for its children, so we use a ItemsControl instead -->
-        <StackPanel Grid.Row="1"> <!-- TEMPORARY for login button -->
             <ItemsControl x:Name="icMenuItems" Grid.Row="1" ItemsSource="{Binding MainNavigationItems}">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
@@ -39,15 +43,25 @@
                 </ItemsControl.ItemsPanel>
                 <ItemsControl.ItemTemplate>
                     <ItemContainerTemplate>
-                        <local:MainWindowNavigationItem Content="{Binding Title}" Page="{Binding Page}" ExtraNavigationInformation="{Binding ExtraInformation}" Command="{Binding Path=DataContext.NavigateButtonCommand, RelativeSource={RelativeSource AncestorType=Window},Mode=Default}" CommandParameter="{Binding Mode=OneWay}"/>
+                    <local:MainWindowNavigationItem 
+                            Content="{Binding Title}" Page="{Binding Page}" ExtraNavigationInformation="{Binding ExtraInformation}" 
+                            Command="{Binding Path=DataContext.NavigateButtonCommand, RelativeSource={RelativeSource AncestorType=Window},Mode=Default}" CommandParameter="{Binding Mode=OneWay}">
+                        <local:MainWindowNavigationItem.IsChecked>
+                            <MultiBinding Mode="OneWay">
+                                <MultiBinding.Converter>
+                                    <converters:MultiPageEqualsConverter/>
+                                </MultiBinding.Converter>
+                                <Binding Path="Page" Mode="OneWay"/>
+                                <Binding Path="DataContext.CurrentVisiblePage" RelativeSource="{RelativeSource AncestorType=Window}" Mode="OneWay"/>
+                            </MultiBinding>
+                        </local:MainWindowNavigationItem.IsChecked>
+                    </local:MainWindowNavigationItem>
                     </ItemContainerTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
-            <local:MainWindowNavigationItem Content="Login" ExtraNavigationInformation="" Click="Login_Click"/>
-        </StackPanel>
-        <TextBlock x:Name="tbContentTitle" Grid.Column="1" FontSize="22" FontWeight="Bold" Text="{Binding Title}"/>
+        <TextBlock x:Name="tbContentTitle" Grid.Column="1" FontSize="22" FontWeight="Bold" Text="{Binding Content.Title, ElementName=frContent}"/>
         <ScrollViewer Grid.Column="1" Grid.Row="1" VerticalScrollBarVisibility="Auto" >
-            <Frame x:Name="frContent" Grid.Column="1" Grid.Row="1"  NavigationUIVisibility="Hidden" Navigated="frContent_Navigated" Source="{Binding CurrentVisiblePage}"/>
+            <Frame x:Name="frContent" Grid.Column="1" Grid.Row="1"  NavigationUIVisibility="Hidden" Source="{Binding CurrentVisiblePage, Mode=TwoWay}"/>
         </ScrollViewer>
     </Grid>
 </Window>

View/MainWindow.xaml.cs

@@ -16,49 +16,5 @@ public MainWindow()
             InitializeComponent();
             SSHConnection.InitializeSsh(); // TODO: Not MVVM, this needs to be moved somewhere soon
         }
-
-
-        /// <summary>
-        /// Occurs when the back/forward buttons are clicked
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The event data.</param>
-        private void NavigationNextPreviousButton_Click(object sender, RoutedEventArgs e)
-        {
-            if ((Button)sender == btPreviousButton)
-            {
-                frContent.GoBack();
-            }
-            else if ((Button)sender == btNextButton)
-            {
-                frContent.GoForward();
-            }
-        }
-
-        /// <summary>
-        /// Occurs when navigation happened in the frame
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The event data.</param>
-        private void frContent_Navigated(object sender, NavigationEventArgs e)
-        {
-            btPreviousButton.IsEnabled = ((Frame)sender).CanGoBack;
-            btNextButton.IsEnabled = ((Frame)sender).CanGoForward;
-            if (((Frame)sender).Content.GetType() == typeof(Page)) 
-            {
-                tbContentTitle.Text = ((Page)((Frame)sender).Content).Title;
-            }
-        }
-
-        private void MainWindowNavigationItem_Checked(object sender, RoutedEventArgs e)
-        {
-
-        }
-
-        private void Login_Click(object sender, RoutedEventArgs e)
-        {
-            AuthenticationWindow authenticationWindow = new AuthenticationWindow();
-            authenticationWindow.Show();
-        }
     }
 }

View/MainWindowNavigationItem.xaml.cs

@@ -20,13 +20,13 @@ namespace View
     public partial class MainWindowNavigationItem : RadioButton
     {
         public static readonly DependencyProperty PageProperty = DependencyProperty.Register(
-            "Page", typeof(UIElement), typeof(MainWindowNavigationItem));
+            "Page", typeof(string), typeof(MainWindowNavigationItem));
         /// <summary>
         /// The page to be navigated to
         /// </summary>
-        public UIElement Page
+        public string Page
         {
-            get { return GetValue(PageProperty) as UIElement; }
+            get { return GetValue(PageProperty) as string; }
             set { SetValue(PageProperty, value); }
         }