diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index ab05e896..f7fc8dd5 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -122,8 +122,11 @@
-
- Results.xaml
+
+ ModulWebPage.xaml
+
+
+ ResultPage.xaml
MensaPage.xaml
@@ -179,7 +182,11 @@
Designer
MSBuild:Compile
-
+
+ Designer
+ MSBuild:Compile
+
+
Designer
MSBuild:Compile
diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureList.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureList.cs
index ac8e3fda..167d9457 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureList.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureList.cs
@@ -28,7 +28,7 @@ namespace CampusAppWP8.Model.Lecture
[XmlArray("veranstaltungsliste")]
[XmlArrayItem("veranstaltung")]
- public ObservableCollection Activity { get; set; }
+ public ObservableCollection Activities { get; set; }
#endregion
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml
index 45e8bd82..f52dd8f2 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml
@@ -9,26 +9,19 @@
FontFamily="{StaticResource PhoneFontFamilyNormal}"
FontSize="{StaticResource PhoneFontSizeNormal}"
Foreground="{StaticResource PhoneForegroundBrush}"
- SupportedOrientations="Portrait" Orientation="Portrait"
+ SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
mc:Ignorable="d"
shell:SystemTray.IsVisible="True">
-
-
-
-
-
-
-
-
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs
index b8c9b463..dc55b355 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs
@@ -7,6 +7,7 @@ using System.Windows.Controls;
using System.Windows.Navigation;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
+using System.Threading.Tasks;
namespace CampusAppWP8.Pages.Lecture
{
@@ -16,5 +17,17 @@ namespace CampusAppWP8.Pages.Lecture
{
InitializeComponent();
}
+
+ protected override void OnNavigatedTo(NavigationEventArgs e)
+ {
+
+ if (NavigationContext.QueryString.ContainsKey("URL"))
+ {
+ string url = NavigationContext.QueryString["URL"];
+
+ this.WebmailBrowser.Navigate(new Uri(url, UriKind.Absolute));
+ }
+ base.OnNavigatedTo(e);
+ }
}
}
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
index a1d44598..f75742c6 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
@@ -9,10 +9,37 @@
FontFamily="{StaticResource PhoneFontFamilyNormal}"
FontSize="{StaticResource PhoneFontSizeNormal}"
Foreground="{StaticResource PhoneForegroundBrush}"
- SupportedOrientations="Portrait" Orientation="Portrait"
+ SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
mc:Ignorable="d"
shell:SystemTray.IsVisible="True">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -28,9 +55,10 @@
-
+
-
\ No newline at end of file
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs
index ffccf041..b2c0f4f8 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs
@@ -17,7 +17,7 @@ namespace CampusAppWP8.Pages.Lecture
public Results()
{
InitializeComponent();
-
+
this.feed.EventHandler.FeedIsReadyEvent += new FeedEventHandler.FeedReadyHandler(this.FeedIsReady);
feed.LoadFeed();
}
@@ -29,5 +29,37 @@ namespace CampusAppWP8.Pages.Lecture
{
ResultList.ItemsSource = feed.Model.Activities;
}
+
+ private void ShowOptions(object sender, RoutedEventArgs e)
+ {
+ Button btn = (Button)sender;
+ Grid test = (Grid)btn.Parent;
+ Button link = (Button)test.FindName("Link");
+ Button details = (Button)test.FindName("Details");
+ this.ToogleVisibility(link);
+ this.ToogleVisibility(details);
+ }
+
+ private void ToogleVisibility(UIElement element)
+ {
+ if (System.Windows.Visibility.Visible.Equals(element.Visibility))
+ {
+ element.Visibility = System.Windows.Visibility.Collapsed;
+ }
+ else
+ {
+ element.Visibility = System.Windows.Visibility.Visible;
+ }
+ }
+
+ private void ShowModulWebPage(object sender, RoutedEventArgs e)
+ {
+ Button btn = (Button)sender;
+ NavigationService.Navigate(new Uri("/Pages/Lecture/ModulWebPage.xaml?URL="+btn.Tag, UriKind.Relative));
+ }
+ private void ShowDetailPage(object sender, RoutedEventArgs e)
+ {
+ }
+
}
}
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/Results.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/Results.xaml
deleted file mode 100644
index 119c3071..00000000
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/Results.xaml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/Results.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/Results.xaml.cs
deleted file mode 100644
index 4897337f..00000000
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/Results.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-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;
-
-namespace CampusAppWP8.Pages.Lecture
-{
- public partial class Results : PhoneApplicationPage
- {
- public Results()
- {
- InitializeComponent();
- }
- }
-}
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
index b65e09d5..ed1f2f60 100644
--- a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
+++ b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
@@ -13,7 +13,7 @@
-
+