diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index 33bfb91a..b2daf2d1 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -243,6 +243,9 @@
DefaultHeader.xaml
+
+ WeekViewPivotHeader.xaml
+
WeekView.xaml
@@ -526,6 +529,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml
index 798250fa..ffa1094b 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml
@@ -16,67 +16,16 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs
index 029c11bc..58ed4163 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableWeek.xaml.cs
@@ -41,6 +41,7 @@ namespace CampusAppWP8.Pages.TimeTable
public WeekView weekView { get; set; }
//???
public List appointmentList { get; set; }
+ public PivotItem pItemPtr { get; set; }
}
private static readonly int PIVOT_PAGES = 3;
@@ -64,8 +65,6 @@ namespace CampusAppWP8.Pages.TimeTable
firstDay = firstDay.AddDays(7);
}
- this.ThePivot.ItemsSource = this.itemPages;
-
ApplicationBarIconButton dayViewBtn = new ApplicationBarIconButton();
dayViewBtn.Text = AppResources.DayView;
dayViewBtn.IconUri = new Uri(Icons.Info, UriKind.Relative);
@@ -101,6 +100,7 @@ namespace CampusAppWP8.Pages.TimeTable
}
else
{
+ this.ThePivot.ItemsSource = this.itemPages;
this.lastSelectedIndex = PIVOT_PAGES_HALF_DOWN;
this.ThePivot.SelectedIndex = PIVOT_PAGES_HALF_DOWN;
}
@@ -143,7 +143,7 @@ namespace CampusAppWP8.Pages.TimeTable
Page page = App.RootFrame.Content as Page;
page.NavigationService.Navigate(url);
*/
- this.itemPages[this.ThePivot.SelectedIndex].weekView.SetColumnBackground(0, new SolidColorBrush(Colors.Red));
+// this.itemPages[this.ThePivot.SelectedIndex].weekView.SetColumnBackground(0, new SolidColorBrush(Colors.Red));
}
private void OnClickToday(object sender, EventArgs e)
@@ -167,7 +167,7 @@ namespace CampusAppWP8.Pages.TimeTable
this.SetupPage(i);
}
*/
- this.itemPages[this.ThePivot.SelectedIndex].weekView.SetColumnBackground(0);
+ //this.itemPages[this.ThePivot.SelectedIndex].weekView.SetColumnBackground(0);
}
private void OnClickProperties(object sender, EventArgs e)
@@ -206,13 +206,13 @@ namespace CampusAppWP8.Pages.TimeTable
}
//this.itemPages[index].Content.Children.Clear();
- this.itemPages[index].WeekNumber = System.Globalization.DateTimeFormatInfo.CurrentInfo.Calendar.GetWeekOfYear(
- this.itemPages[index].DateFrom,
- System.Globalization.CalendarWeekRule.FirstDay,
- DayOfWeek.Monday);
- this.itemPages[index].WeekChar = ((this.itemPages[index].WeekNumber % 2) == 0) ? 'B' : 'A';
+// this.itemPages[index].WeekNumber = System.Globalization.DateTimeFormatInfo.CurrentInfo.Calendar.GetWeekOfYear(
+// this.itemPages[index].DateFrom,
+// System.Globalization.CalendarWeekRule.FirstDay,
+// DayOfWeek.Monday);
+// this.itemPages[index].WeekChar = ((this.itemPages[index].WeekNumber % 2) == 0) ? 'B' : 'A';
- this.SetupPage(index);
+ //this.SetupPage(index);
this.lastSelectedIndex = this.ThePivot.SelectedIndex;
}
@@ -330,6 +330,7 @@ namespace CampusAppWP8.Pages.TimeTable
private void OnCanvasSizeChanged(object sender, SizeChangedEventArgs e)
{
+ /*
if (e.NewSize.Width.Equals(e.PreviousSize.Width) == false)
{
Canvas tempContainer = (sender as Canvas);
@@ -348,15 +349,16 @@ namespace CampusAppWP8.Pages.TimeTable
this.SetupPage(index);
}
+ */
}
private void SetupPage(int index)
{
// Header
- ((this.ThePivot.Items[index] as PivotItem).Header as Grid).Children.Clear();
+ //((this.ThePivot.Items[index] as PivotItem).Header as Grid).Children.Clear();
- this.DrawHeader(index);
+ //this.DrawHeader(index);
// Items
@@ -628,17 +630,17 @@ namespace CampusAppWP8.Pages.TimeTable
// this.itemPages[itemIndex].Content.Height = WEEK_TABLE_CELL_HEIGHT * 24;
this.itemPages[itemIndex].DateFrom = weekStart;
this.itemPages[itemIndex].DateTo = weekStart.AddDays(6);
- this.itemPages[itemIndex].WeekNumber = System.Globalization.DateTimeFormatInfo.CurrentInfo.Calendar.GetWeekOfYear(
- weekStart,
- System.Globalization.CalendarWeekRule.FirstDay,
- DayOfWeek.Monday);
- this.itemPages[itemIndex].WeekChar = ((this.itemPages[itemIndex].WeekNumber % 2) == 0) ? 'B' : 'A';
+// this.itemPages[itemIndex].WeekNumber = System.Globalization.DateTimeFormatInfo.CurrentInfo.Calendar.GetWeekOfYear(
+// weekStart,
+// System.Globalization.CalendarWeekRule.FirstDay,
+// DayOfWeek.Monday);
+// this.itemPages[itemIndex].WeekChar = ((this.itemPages[itemIndex].WeekNumber % 2) == 0) ? 'B' : 'A';
- PivotItem pvItem = new PivotItem();
- Grid headGrid = new Grid();
- pvItem.Header = headGrid;
+ //PivotItem pvItem = new PivotItem();
+ //Grid headGrid = new Grid();
+ //pvItem.Header = headGrid;
- this.ThePivot.Items.Add(pvItem);
+ //this.ThePivot.Items.Add(pvItem);
}
private void RemoveContentUIElement(int index, UIElement elem)
@@ -814,8 +816,18 @@ namespace CampusAppWP8.Pages.TimeTable
private void TheWeekView_Loaded(object sender, RoutedEventArgs e)
{
- this.itemPages[this.loadedWeekView].weekView = sender as WeekView;
+// this.itemPages[this.loadedWeekView].weekView = sender as WeekView;
this.loadedWeekView++;
}
+
+ private void ThePivot_LoadedPivotItem(object sender, PivotItemEventArgs e)
+ {
+
+ }
+
+ private void Grid_Loaded(object sender, RoutedEventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml
new file mode 100644
index 00000000..b860a6e2
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml.cs
new file mode 100644
index 00000000..eb9270bc
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Header/WeekViewPivotHeader.xaml.cs
@@ -0,0 +1,22 @@
+namespace CampusAppWP8.Utility.Lui.Header
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Net;
+ using System.Windows;
+ using System.Windows.Controls;
+ using System.Windows.Navigation;
+ using Microsoft.Phone.Controls;
+ using Microsoft.Phone.Shell;
+
+ public partial class WeekViewPivotHeader : UserControl
+ {
+
+
+ public WeekViewPivotHeader()
+ {
+ this.InitializeComponent();
+ }
+ }
+}
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml.cs
index 59e57822..395756dd 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Templates/WeekView.xaml.cs
@@ -20,6 +20,8 @@ namespace CampusAppWP8.Utility.Lui.Templates
public partial class WeekView : UserControl
{
+ public static readonly DependencyProperty StartDateProperty = DependencyProperty.Register("StartDate", typeof(DateTime), typeof(WeekView), new PropertyMetadata(null));
+
private List borderList = new List();
private string[] timeStrings = new string[24];
@@ -32,6 +34,19 @@ namespace CampusAppWP8.Utility.Lui.Templates
this.InitLayout();
}
+ public DateTime StartDate
+ {
+ get
+ {
+ return (DateTime)this.GetValue(StartDateProperty);
+ }
+
+ set
+ {
+ this.SetValue(StartDateProperty, value);
+ }
+ }
+
public void SetColumnBackground(int column, Brush brush = null)
{
if (column < this.borderList.Count())
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Utility/DefaultStringManager.cs b/CampusAppWP8/CampusAppWPortalLib8/Utility/DefaultStringManager.cs
index c9639af6..b8c3bd38 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Utility/DefaultStringManager.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Utility/DefaultStringManager.cs
@@ -206,9 +206,9 @@ namespace CampusAppWPortalLib8.Utility
{
int retValue = 0;
- for (int i = 0; i < str.Length; i++)
+ foreach(char tc in str)
{
- if (str[i].Equals(c))
+ if(tc.Equals(c) == true)
{
retValue++;
}