From c6ea2b5ed7982afd2733be72be54353a134a51a6 Mon Sep 17 00:00:00 2001 From: Christian Fiedler Date: Thu, 24 Oct 2013 13:38:39 +0200 Subject: [PATCH] bla --- .../Pages/TimeTable/TimeTableWeek.xaml | 5 +-- .../Pages/TimeTable/TimeTableWeek.xaml.cs | 7 +++- .../CampusAppWP8/Properties/WMAppManifest.xml | 2 +- .../Lui/Header/WeekViewPivotHeader.xaml | 2 +- .../Lui/Header/WeekViewPivotHeader.xaml.cs | 32 ++++++++++++++++++- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml index ffa1094b..1693c64b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml @@ -5,6 +5,7 @@ xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone" xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone" xmlns:templ="clr-namespace:CampusAppWP8.Utility.Lui.Templates" + xmlns:header="clr-namespace:CampusAppWP8.Utility.Lui.Header" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" FontFamily="{StaticResource PhoneFontFamilyNormal}" @@ -16,10 +17,10 @@ - + - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs index 58ed4163..c1f3ab39 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs @@ -21,6 +21,7 @@ namespace CampusAppWP8.Pages.TimeTable using CampusAppWP8.Model.TimeTable; using CampusAppWP8.Resources; using CampusAppWP8.Utility.Lui.Templates; + using CampusAppWP8.Utility.Lui.Header; public partial class TimeTableWeek : PhoneApplicationPage { @@ -822,12 +823,16 @@ namespace CampusAppWP8.Pages.TimeTable private void ThePivot_LoadedPivotItem(object sender, PivotItemEventArgs e) { - } private void Grid_Loaded(object sender, RoutedEventArgs e) { } + + private void ThePivot_LoadingPivotItem(object sender, PivotItemEventArgs e) + { + + } } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml index 288b01c9..ebcb1c37 100644 --- a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml +++ b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml @@ -13,7 +13,7 @@ - + diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml index b860a6e2..39e9fd70 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml @@ -29,7 +29,7 @@ - + diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml.cs index eb9270bc..c5c3fdd7 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml.cs @@ -12,11 +12,41 @@ public partial class WeekViewPivotHeader : UserControl { - + public static readonly DependencyProperty DateFromProperty = DependencyProperty.Register("DateFrom", typeof(DateTime), typeof(WeekViewPivotHeader), new PropertyMetadata(null)); + public static readonly DependencyProperty DateToProperty = DependencyProperty.Register("DateTo", typeof(DateTime), typeof(WeekViewPivotHeader), new PropertyMetadata(null)); + public static readonly DependencyProperty DaysProperty = DependencyProperty.Register("Days", typeof(int), typeof(WeekViewPivotHeader), new PropertyMetadata(null)); public WeekViewPivotHeader() { + this.Days = 5; this.InitializeComponent(); } + + public DateTime DateFrom + { + get + { + return (DateTime)this.GetValue(DateFromProperty); + } + + set + { + this.SetValue(DateFromProperty, value); + this.SetValue(DateToProperty, value.AddDays(this.Days)); + } + } + + public int Days + { + get + { + return (int)this.GetValue(DaysProperty); + } + + set + { + this.SetValue(DaysProperty, value); + } + } } }