diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs
index b1a1b976..4b062399 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs
@@ -14,20 +14,6 @@ namespace CampusAppWP8.Model.Setting
/// Stubbfel, 15.10.2013.
public class AppSettings
{
- #region Enum
-
- /// Values that represent BTUTagDefaultHandler.
- /// Stubbfel, 15.10.2013.
- public enum BTUTagDefaultHandler
- {
- /// An enum constant representing the information page option.
- InfoPage = 0,
-
- /// An enum constant representing the campus map option.
- CampusMap = 1
- }
-
- #endregion
#region Property
/// Gets or sets a value indicating whether the GeoWatch-Flag.
diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/BTUTagHandlerTypes.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/BTUTagHandlerTypes.cs
index 1967f073..b5586f72 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Setting/BTUTagHandlerTypes.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Setting/BTUTagHandlerTypes.cs
@@ -16,6 +16,9 @@ namespace CampusAppWP8.Model.Setting
InfoPage = 0,
/// An enum constant representing the campus map option.
- CampusMap = 1
+ CampusMap = 1,
+
+ /// An enum constant representing the date creation option.
+ DateCreation = 2
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/TagHandlerListPickerItemListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/TagHandlerListPickerItemListModel.cs
index 95383c6b..4eced32c 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Setting/TagHandlerListPickerItemListModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Setting/TagHandlerListPickerItemListModel.cs
@@ -37,8 +37,9 @@ namespace CampusAppWP8.Model.Setting
///
protected override void LoadList()
{
- this.AddItem(new ListPickerItemModel(AppSettings.BTUTagDefaultHandler.InfoPage.ToString(), AppResources.Setting_TagHandlerInfo));
- this.AddItem(new ListPickerItemModel(AppSettings.BTUTagDefaultHandler.CampusMap.ToString(), AppResources.Setting_TagHandlerMap));
+ this.AddItem(new ListPickerItemModel(BTUTagDefaultHandler.InfoPage.ToString(), AppResources.Setting_TagHandlerInfo));
+ this.AddItem(new ListPickerItemModel(BTUTagDefaultHandler.CampusMap.ToString(), AppResources.Setting_TagHandlerMap));
+ this.AddItem(new ListPickerItemModel(BTUTagDefaultHandler.DateCreation.ToString(), AppResources.Setting_TagHandlerDate));
}
#endregion
diff --git a/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml.cs
index 9c9ffa4a..5efc6e82 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/BTUTag/BTUTagInfo.xaml.cs
@@ -48,7 +48,7 @@ namespace CampusAppWP8.Pages.BTTTag
{
if (NavigationMode.Back == e.NavigationMode)
{
- Settings.AppSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.AppSettings.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.AppSettings.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value);
+ Settings.AppSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value);
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
index 9add78fa..1261966f 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
@@ -226,7 +226,7 @@ namespace CampusAppWP8.Pages.Dev
var result = this.barcodeReader.Decode(this.bit);
- if (result != null )
+ if (result != null)
{
Dispatcher.BeginInvoke(delegate
{
@@ -250,19 +250,24 @@ namespace CampusAppWP8.Pages.Dev
}
else
{
- if (AppSettings.BTUTagDefaultHandler.CampusMap == Settings.AppSetting.TagDefaultHandler)
+ string qrContent = result.Text;
+ switch (Settings.AppSetting.TagDefaultHandler)
{
- this.GoToCampusMappage(result.Text);
- }
- else
- {
- MessageBoxResult msgResult = MessageBoxes.ShowBtuTagInfoOkCancelMessageBox(result.Text);
- if (msgResult.Equals(MessageBoxResult.OK))
- {
- string urlString = Constants.PathBTUTag_Info;
- Uri url = new Uri(urlString as string, UriKind.Relative);
- this.NavigationService.Navigate(url);
- }
+ case BTUTagDefaultHandler.CampusMap:
+ this.GoToCampusMappage(qrContent);
+ break;
+ case BTUTagDefaultHandler.DateCreation:
+ this.GoToAppointment(qrContent);
+ break;
+ default:
+ MessageBoxResult msgResult = MessageBoxes.ShowBtuTagInfoOkCancelMessageBox(result.Text);
+ if (msgResult.Equals(MessageBoxResult.OK))
+ {
+ string urlString = Constants.PathBTUTag_Info;
+ Uri url = new Uri(urlString as string, UriKind.Relative);
+ this.NavigationService.Navigate(url);
+ }
+ break;
}
}
});
@@ -285,6 +290,25 @@ namespace CampusAppWP8.Pages.Dev
NavigationService.Navigate(url);
}
+ /// Go to appointment.
+ /// Fiedler, 15.11.2013.
+ /// The tag content.
+ private void GoToAppointment(string tagContent)
+ {
+ string pid = Wp8StringManager.FilterPlaceIdinQRResultString(tagContent);
+ string urlStr = Constants.PathTimeTable_AppointmentEdit + "?" + Constants.ParamPID + "=" + pid;
+ Uri url = new Uri(urlStr, UriKind.Relative);
+
+ if (this.Dispatcher != null)
+ {
+ this.Dispatcher.BeginInvoke(new Action(() => NavigationService.Navigate(url)));
+ }
+ else
+ {
+ NavigationService.Navigate(url);
+ }
+ }
+
/// Capture thread function.
/// fiedlchr, 15.10.2013.
private void CaptureThreadFunc()
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs
index 6d6c6f86..3527c4a9 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/AppSettingPage.xaml.cs
@@ -50,7 +50,7 @@ namespace CampusAppWP8.Pages.Setting
{
Settings.AppSetting.GeoWatchEnable = GeoWatchToggle.IsChecked.Value;
Settings.AppSetting.OnlyWifi = OnlyWiFiToggle.IsChecked.Value;
- Settings.AppSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.AppSettings.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.AppSettings.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value);
+ Settings.AppSetting.TagDefaultHandler = (CampusAppWP8.Model.Setting.BTUTagDefaultHandler)Enum.Parse(typeof(CampusAppWP8.Model.Setting.BTUTagDefaultHandler), ((CampusAppWPortalLib8.Model.Utility.ListPickerItemModel)this.TagHandler.SelectedItem).Value);
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
index 972a122b..e444dcfc 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs
@@ -217,7 +217,7 @@ namespace CampusAppWP8.Pages
//this.ContentPanel.Margin = new Thickness(76, -24, 24, 0); // LandscapeRight
//this.ContentPanel.Margin = new Thickness(24, -24, 76, 0); // LandscapeLeft
//this.AppTitle.Margin = new Thickness(12, 17, 0, 28);
-
+
if (!this.Row3.Children.Contains(this.MailAppButton)
&& !this.Row3.Children.Contains(this.OpenHoursAppButton)
&& !this.Row3.Children.Contains(this.LinkAppButton))
@@ -437,25 +437,25 @@ namespace CampusAppWP8.Pages
}
else
{
- this.GoToAppointment(nfcContent);
- /* removed for testing
- if (AppSettings.BTUTagDefaultHandler.CampusMap == Settings.AppSetting.TagDefaultHandler)
+ switch (Settings.AppSetting.TagDefaultHandler)
{
- // search for placeId
- this.GoToCampusMappage(nfcContent);
+ case BTUTagDefaultHandler.CampusMap:
+ this.GoToCampusMappage(nfcContent);
+ break;
+ case BTUTagDefaultHandler.DateCreation:
+ this.GoToAppointment(nfcContent);
+ break;
+ default:
+ if (this.Dispatcher != null)
+ {
+ this.Dispatcher.BeginInvoke(new Action(() => this.ShowBtuTagMessageBox()));
+ }
+ else
+ {
+ this.ShowBtuTagMessageBox();
+ }
+ break;
}
- else
- {
- if (this.Dispatcher != null)
- {
- this.Dispatcher.BeginInvoke(new Action(() => this.ShowBtuTagMessageBox()));
- }
- else
- {
- this.ShowBtuTagMessageBox();
- }
- }
- */
}
this.ndefId = this.device.SubscribeForMessage(Constants.NCFMessageType_NDEF, this.NDEFHandler);
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
index 1defd00d..dfaf1fb0 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -1230,6 +1230,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Termin erstellen ähnelt.
+ ///
+ public static string Setting_TagHandlerDate {
+ get {
+ return ResourceManager.GetString("Setting_TagHandlerDate", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die BTU-Tag-Informationsseite anzeigen ähnelt.
///
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index 4d494990..24765ab2 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -617,4 +617,7 @@
Wochenplan
+
+ Termin erstellen
+
\ No newline at end of file