diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index 0fa040ea..ee755e20 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -130,8 +130,9 @@
TimeTableDay.xaml
+
-
+
diff --git a/CampusAppWP8/CampusAppWP8/Model/TimeTable/AppointmentModel.cs b/CampusAppWP8/CampusAppWP8/Model/TimeTable/AppointmentModel.cs
index ec071ba8..8dc202a2 100644
--- a/CampusAppWP8/CampusAppWP8/Model/TimeTable/AppointmentModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/TimeTable/AppointmentModel.cs
@@ -13,6 +13,8 @@ namespace CampusAppWP8.Model.TimeTable
using System.Text.RegularExpressions;
using System.Windows.Shapes;
using System.Xml.Serialization;
+ using System.Windows.Controls;
+ using System.Windows.Media;
using CampusAppWP8.Utility;
///
@@ -24,17 +26,18 @@ namespace CampusAppWP8.Model.TimeTable
/// The Visual object.
private Rectangle rect = null;
- private ICSObject icsObj;
+ private ICalObject icalObj = null;
/// Initializes a new instance of the class.
public AppointmentModel()
{
- this.icsObj = new ICSObject();
+ this.rect = new Rectangle();
}
public AppointmentModel(string icsData) : this()
{
- this.icsObj.ImportFromICS(icsData);
+ this.icalObj = ICSManager.ImportFromICS(icsData);
+ this.CalcRect();
}
public Rectangle GetRectangle()
@@ -42,9 +45,33 @@ namespace CampusAppWP8.Model.TimeTable
return this.rect;
}
-
- private void CreateRect()
+ private void CalcRect()
{
+ this.rect.Width = 200;
+ this.rect.MinHeight = 16;
+ this.rect.MaxHeight = 600;
+ this.rect.Height = 200;
+
+ this.rect.StrokeThickness = 4;
+
+ SolidColorBrush borderBrush = new SolidColorBrush();
+ borderBrush.Color = Colors.Red;
+
+ this.rect.Stroke = borderBrush;
+
+ Vis
+
+ VisualBrush myBrush = new VisualBrush();
+ StackPanel aPanel = new StackPanel();
+
+
+ if (this.icalObj != null)
+ {
+ TextBlock tb = new TextBlock();
+ tb.Text = this.icalObj.Header.Value;
+
+ this.rect.Resources = tb;
+ }
}
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml
index 7a7746ae..4f8d4fda 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml
@@ -14,24 +14,22 @@
shell:SystemTray.IsVisible="True">
-
-
-
-
+
+
-
+ -->
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml.cs
index f6e10131..140b18e8 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/TimeTableDay.xaml.cs
@@ -8,7 +8,7 @@ using System.Windows.Navigation;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
using CampusAppWP8.Model.TimeTable;
-
+using CampusAppWP8.Utility;
namespace CampusAppWP8.Pages.TimeTable
{
@@ -20,6 +20,23 @@ namespace CampusAppWP8.Pages.TimeTable
{
InitializeComponent();
this.testMod = new AppointmentModel("BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:ownCloud Calendar 0.6.3\r\nX-WR-CALNAME:Das is der Titel\r\nBEGIN:VEVENT\r\nCREATED;VALUE=DATE-TIME:20130827T113216Z\r\nUID:c9904ea73c\r\nLAST-MODIFIED;VALUE=DATE-TIME:20130827T113216Z\r\nDTSTAMP;VALUE=DATE-TIME:20130827T113216Z\r\nSUMMARY:Das is der Titel\r\nDTSTART;VALUE=DATE:20130828\r\nDTEND;VALUE=DATE:20130829\r\nCLASS:PUBLIC\r\nLOCATION:BTU Campus\r\nDESCRIPTION:For Outlook 2003, the behavior is peculiar. It can save the sa\r\n me calendar entry in both .ics and .vcs format, but it only read & displa\r\n y .vcs file correctly. It can read .ics file but it omits some fields and \r\n does not display it in calendar mode. My guess is that back then Microsoft\r\n wanted to provide .ics to be compatible with Mac's iCal but not quite com\r\n mitted to v2.0 yet.\r\nCATEGORIES:Projekte\r\nEND:VEVENT\r\nEND:VCALENDAR");
+
+ }
+
+ protected override void OnNavigatedTo(NavigationEventArgs e)
+ {
+ base.OnNavigatedTo(e);
+
+ //List elemList = Utilities.GetChild(this.thePivot.Items[0] as UIElement, "TestGrid");
+
+ //if (elemList.Count() > 0)
+ {
+ TextBlock tb = new TextBlock();
+ tb.Text = "kk";
+
+ this.LayoutRoot.Children.Add(tb);
+ this.LayoutRoot.Children.Add(this.testMod.GetRectangle());
+ }
}
}
}
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Utility/ICSObject.cs b/CampusAppWP8/CampusAppWP8/Utility/ICSObject.cs
deleted file mode 100644
index 0ca56588..00000000
--- a/CampusAppWP8/CampusAppWP8/Utility/ICSObject.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Company copyright tag.
-//
-// fiedlchr
-// 27.08.2013
-//-----------------------------------------------------------------------------
-namespace CampusAppWP8.Utility
-{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Text;
- using System.Text.RegularExpressions;
- using System.Threading.Tasks;
- using System.Windows.Shapes;
- using System.Xml.Serialization;
-
- /// Ics object.
- public class ICSObject
- {
- private List readParentList = null;
-
- private struct VCalendar
- {
- public List