From 29bc8620351c44d549ece5eeaa020b954b6a8c47 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 10 Jun 2013 18:45:55 +0200 Subject: [PATCH 1/7] add resultpage --- .../Pages/Lecture/ModulWebPage.xaml | 35 ++++++++++++++++++ .../Pages/Lecture/ModulWebPage.xaml.cs | 20 +++++++++++ .../Pages/Lecture/ResultPage.xaml | 36 +++++++++++++++++++ .../Pages/Lecture/ResultPage.xaml.cs | 33 +++++++++++++++++ .../{pages => Pages}/webmail/WebmailPage.xaml | 0 .../webmail/WebmailPage.xaml.cs | 0 6 files changed, 124 insertions(+) create mode 100644 CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml create mode 100644 CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs create mode 100644 CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml create mode 100644 CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs rename CampusAppWP8/CampusAppWP8/{pages => Pages}/webmail/WebmailPage.xaml (100%) rename CampusAppWP8/CampusAppWP8/{pages => Pages}/webmail/WebmailPage.xaml.cs (100%) diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml new file mode 100644 index 00000000..45e8bd82 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs new file mode 100644 index 00000000..b8c9b463 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs @@ -0,0 +1,20 @@ +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 ModulWebPage : PhoneApplicationPage + { + public ModulWebPage() + { + InitializeComponent(); + } + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml new file mode 100644 index 00000000..a1d44598 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs new file mode 100644 index 00000000..ffccf041 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs @@ -0,0 +1,33 @@ +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; +using CampusAppWP8.Utility; + +namespace CampusAppWP8.Pages.Lecture +{ + public partial class Results : PhoneApplicationPage + { + LectureFeed feed = new LectureFeed(); + public Results() + { + InitializeComponent(); + + this.feed.EventHandler.FeedIsReadyEvent += new FeedEventHandler.FeedReadyHandler(this.FeedIsReady); + feed.LoadFeed(); + } + + /// + /// Method will be execute if the feed is ready + /// + private void FeedIsReady() + { + ResultList.ItemsSource = feed.Model.Activities; + } + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/pages/webmail/WebmailPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/webmail/WebmailPage.xaml similarity index 100% rename from CampusAppWP8/CampusAppWP8/pages/webmail/WebmailPage.xaml rename to CampusAppWP8/CampusAppWP8/Pages/webmail/WebmailPage.xaml diff --git a/CampusAppWP8/CampusAppWP8/pages/webmail/WebmailPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/webmail/WebmailPage.xaml.cs similarity index 100% rename from CampusAppWP8/CampusAppWP8/pages/webmail/WebmailPage.xaml.cs rename to CampusAppWP8/CampusAppWP8/Pages/webmail/WebmailPage.xaml.cs From faa5dc744096bd8a6198ba3294c1f37ceae28a76 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Mon, 10 Jun 2013 18:46:39 +0200 Subject: [PATCH 2/7] add resultpage --- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 13 +++++-- .../CampusAppWP8/Model/Lecture/LectureList.cs | 2 +- .../Pages/Lecture/ModulWebPage.xaml | 11 ++---- .../Pages/Lecture/ModulWebPage.xaml.cs | 13 +++++++ .../Pages/Lecture/ResultPage.xaml | 34 +++++++++++++++++-- .../Pages/Lecture/ResultPage.xaml.cs | 34 ++++++++++++++++++- .../CampusAppWP8/Pages/Lecture/Results.xaml | 34 ------------------- .../Pages/Lecture/Results.xaml.cs | 20 ----------- .../CampusAppWP8/Properties/WMAppManifest.xml | 2 +- 9 files changed, 91 insertions(+), 72 deletions(-) delete mode 100644 CampusAppWP8/CampusAppWP8/Pages/Lecture/Results.xaml delete mode 100644 CampusAppWP8/CampusAppWP8/Pages/Lecture/Results.xaml.cs 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"> + + + + + + + + + + + + + + + + + + - - - + + + + + +