diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
index 2203c800..99b2348a 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml
@@ -277,6 +277,7 @@
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
index dde76ad0..a89a5840 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
@@ -419,6 +419,8 @@ namespace CampusAppWP8.Pages
}
else
{
+ this.GoToAppointment(nfcContent);
+ /* removed for testing
if (AppSettings.BTUTagDefaultHandler.CampusMap == Settings.AppSetting.TagDefaultHandler)
{
// search for placeId
@@ -435,6 +437,7 @@ namespace CampusAppWP8.Pages
this.ShowBtuTagMessageBox();
}
}
+ */
}
this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler);
@@ -446,9 +449,27 @@ namespace CampusAppWP8.Pages
private void GoToCampusMappage(string tagContent)
{
string pid = Wp8StringManager.FilterPlaceIdinNFCResultString(tagContent);
- string urlString = Constants.PathCampusmap_Campusmap;
- urlString += "?" + Constants.ParamModelMap_SearchTermAlias + "=" + pid;
- Uri url = new Uri(urlString as string, UriKind.Relative);
+ string urlString = Constants.PathCampusmap_Campusmap + "?" + Constants.ParamModelMap_SearchTermAlias + "=" + pid;
+ Uri url = new Uri(urlString, UriKind.Relative);
+
+ if (this.Dispatcher != null)
+ {
+ this.Dispatcher.BeginInvoke(new Action(() => NavigationService.Navigate(url)));
+ }
+ else
+ {
+ NavigationService.Navigate(url);
+ }
+ }
+
+ /// Go to appointment.
+ /// Fiedler, 15.11.2013.
+ /// The tag content.
+ private void GoToAppointment(string tagContent)
+ {
+ string pid = Wp8StringManager.FilterPlaceIdinNFCResultString(tagContent);
+ string urlStr = Constants.PathTimeTable_AppointmentEdit + "?" + Constants.ParamPID + "=" + pid;
+ Uri url = new Uri(urlStr, UriKind.Relative);
if (this.Dispatcher != null)
{
@@ -483,5 +504,11 @@ namespace CampusAppWP8.Pages
}
#endregion
+
+ private void ApplicationBarMenuItem_Click_2(object sender, EventArgs e)
+ {
+ Uri url = new Uri("/Pages/Dev/NFC.xaml", UriKind.Relative);
+ NavigationService.Navigate(url);
+ }
}
}
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/AppointmentEdit.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/AppointmentEdit.xaml.cs
index ec213f5b..5103f340 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/TimeTable/AppointmentEdit.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/TimeTable/AppointmentEdit.xaml.cs
@@ -24,6 +24,8 @@ namespace CampusAppWP8.Pages.TimeTable
public partial class AppointmentEdit : PortraitLandscapePage
{
+ //private Place
+
private readonly string[] DurationListText = new string[] { "15 Minuten", "30 Minuten", "1 Stunde", "90 Minuten", "2 Stunden", "Ganztägig", "Benutzerdefiniert" };
private readonly string[] RepeatListText = new string[] { "Einmal", "Täglich", "Jeden Mo-Fr", "Wöchentlich", "Monatlich", "Jährlich" };
private readonly string[] AccessClassListText = new string[] { "Öffentlich", "Privat", "Vertraulich" };
@@ -61,8 +63,10 @@ namespace CampusAppWP8.Pages.TimeTable
base.OnNavigatedTo(e);
string appointmentIndexStr = string.Empty;
+ string pid = string.Empty;
// Navigate to the selected pivotitem
+
if (NavigationContext.QueryString.TryGetValue(Constants.Param_Appointment_Index, out appointmentIndexStr))
{
this.appointmentIndex = int.Parse(appointmentIndexStr);
@@ -89,6 +93,11 @@ namespace CampusAppWP8.Pages.TimeTable
MessageBox.Show("ERROR: appointment index out of range!!! (" + o + ")");
}
}
+ else if(NavigationContext.QueryString.TryGetValue(Constants.ParamPID, out pid))
+ {
+ this.HeadLine.Text = AppResources.Creating;
+ this.InLocation.Text = pid;
+ }
else
{
this.HeadLine.Text = AppResources.Creating;
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index 7db93ad9..45f447f5 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -597,4 +597,7 @@
Appointments.xaml
+
+ pid
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
index 7e7836cf..708bb57c 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
@@ -717,6 +717,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die pid ähnelt.
+ ///
+ public static string ParamPID {
+ get {
+ return ResourceManager.GetString("ParamPID", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die pivotindex ähnelt.
///