diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
index 4dc52a98..82346753 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
@@ -59,9 +59,9 @@
+
-
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
index 6e076da1..8a9b7ab1 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml.cs
@@ -82,19 +82,19 @@ namespace CampusAppWP8.Pages.Campusmap
ApplicationBarMenuItem menuItem2 = ApplicationBar.MenuItems[1] as ApplicationBarMenuItem;
ApplicationBarMenuItem menuItem3 = ApplicationBar.MenuItems[2] as ApplicationBarMenuItem;
- if (menuItem1 != null)
- {
- menuItem1.Text = AppResources.App_ScanQR;
- }
-
if (menuItem2 != null)
{
- menuItem2.Text = AppResources.App_ScanNfc;
+ menuItem2.Text = AppResources.App_ScanQR;
}
if (menuItem3 != null)
{
- menuItem3.Text = AppResources.CampusMapApp_EnableBuildInfo;
+ menuItem3.Text = AppResources.App_ScanNfc;
+ }
+
+ if (menuItem1 != null)
+ {
+ menuItem1.Text = AppResources.CampusMapApp_EnableBuildInfo;
}
if (this.file == null)
@@ -175,7 +175,7 @@ namespace CampusAppWP8.Pages.Campusmap
{
//this.ShowAllPlacesByPlaceIdAsSearchPin(searchPid);
- if (place.ParentId.Equals(this.campusMap.CampusId))
+ if (place.ParentId.Equals(this.campusMap.CampusId) || place.PlaceId.Equals(this.campusMap.CampusId))
{
this.ShowAllPlacesByPlaceIdAsSearchPin(searchPid);
}
@@ -390,7 +390,7 @@ namespace CampusAppWP8.Pages.Campusmap
menuText = AppResources.CampusMapApp_EnableBuildInfo;
}
- ApplicationBarMenuItem item = ApplicationBar.MenuItems[2] as ApplicationBarMenuItem;
+ ApplicationBarMenuItem item = ApplicationBar.MenuItems[0] as ApplicationBarMenuItem;
item.Text = menuText;
}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs
index c740b5fe..f3b89e12 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs
@@ -134,8 +134,11 @@ namespace CampusAppWP8.Pages.Departments
{
base.OnNavigatedTo(e);
- if (NavigationMode.Back != e.NavigationMode)
+ if (NavigationContext.QueryString.ContainsKey(Constants.ParamRemoveBack))
{
+ if (NavigationContext.QueryString[Constants.ParamRemoveBack].Equals("true")) {
+ NavigationService.RemoveBackEntry();
+ }
}
}
@@ -177,11 +180,11 @@ namespace CampusAppWP8.Pages.Departments
DepartmentIndexPage.feed = new DepartmentFeed(false);
}
- if(onLoaded != null)
+ if (onLoaded != null)
DepartmentIndexPage.feed.OnLoaded += new DepartmentFeed.OnIO(onLoaded);
- if(failedWeb != null)
+ if (failedWeb != null)
DepartmentIndexPage.feed.OnFailedWeb += new DepartmentFeed.OnFailed(failedWeb);
- if(failedFile != null)
+ if (failedFile != null)
DepartmentIndexPage.feed.OnFailedFile += new DepartmentFeed.OnFailed(failedFile);
DepartmentIndexPage.feed.LoadData(Utilities.GetLoadModus());
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentInfoPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentInfoPage.xaml.cs
index 64baf51b..2c5ee655 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentInfoPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentInfoPage.xaml.cs
@@ -53,8 +53,8 @@ namespace CampusAppWP8.Pages.Departments
this.feedLoadedFlag = false;
string url = string.Empty;
-
- if(NavigationContext.QueryString.TryGetValue(Constants.ParamName, out this.chairName))
+
+ if (NavigationContext.QueryString.TryGetValue(Constants.ParamName, out this.chairName))
{
this.DefHeader.HeaderName = this.chairName;
}
@@ -90,7 +90,7 @@ namespace CampusAppWP8.Pages.Departments
private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e)
{
}
-
+
///
/// On feed ready.
///
@@ -124,7 +124,7 @@ namespace CampusAppWP8.Pages.Departments
{
case MessageBoxResult.OK:
{
- NavigationService.Navigate(new Uri(Constants.PathDepartment_DepartmentIndexPage, UriKind.Relative));
+ NavigationService.Navigate(new Uri(Constants.PathDepartment_DepartmentIndexPage+"?"+Constants.ParamRemoveBack +"=true", UriKind.Relative));
}
break;
case MessageBoxResult.Cancel:
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
index 15003e4f..8c7c9b23 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs
@@ -111,7 +111,12 @@ namespace CampusAppWP8.Pages.Dev
if (this.cam != null)
{
this.captureThreadExit = true;
- this.captureThread.Join();
+
+ if (this.captureThread != null)
+ {
+ this.captureThread.Join();
+ }
+
this.cam.Dispose();
@@ -163,11 +168,14 @@ namespace CampusAppWP8.Pages.Dev
{
if (e.Succeeded)
{
- this.cam.Focus();
+ if (this.cam != null && !this.captureThreadExit)
+ {
+ this.cam.Focus();
- this.captureThreadExit = false;
- this.captureThread = new Thread(this.CaptureThreadFunc);
- this.captureThread.Start();
+ this.captureThreadExit = false;
+ this.captureThread = new Thread(this.CaptureThreadFunc);
+ this.captureThread.Start();
+ }
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
index 2ea28fca..0d4c9b2f 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
@@ -24,8 +24,7 @@
-
-
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
index 76fa444d..606a9366 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
@@ -93,7 +93,7 @@ namespace CampusAppWP8.Pages.Lecture
///
private void LoadPageModel()
{
- this.ProgressBar.Visibility = Visibility.Visible;
+ this.DefHeader.ProgressVisibility = Visibility.Visible;
this.pageModel = new LecturePageModel();
this.pageModel.OnLoaded += new LecturePageModel.OnIO(this.SetupListPickers);
this.pageModel.LoadLists();
@@ -119,7 +119,7 @@ namespace CampusAppWP8.Pages.Lecture
this.SetSelectedIndex();
this.init = true;
- this.ProgressBar.Visibility = Visibility.Collapsed;
+ this.DefHeader.ProgressVisibility = Visibility.Collapsed;
}
///
@@ -169,7 +169,7 @@ namespace CampusAppWP8.Pages.Lecture
this.api = new LectureApi();
this.api.OnLoaded += new LectureApi.OnIO(this.ApiIsReady);
this.api.OnFailedLoad += new LectureApi.OnFailed(this.ApiIsFail);
- this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
+ this.DefHeader.ProgressVisibility = System.Windows.Visibility.Visible;
List parameterList = this.CreateUrlParameter();
this.api.SetUriParams(parameterList);
this.api.LoadData();
@@ -208,7 +208,7 @@ namespace CampusAppWP8.Pages.Lecture
}
App.SaveToIsolatedStorage(Constants.IsolatedStorage_LectureModel, this.api.Model);
- this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed;
+ this.DefHeader.ProgressVisibility = System.Windows.Visibility.Collapsed;
Uri url = new Uri(Constants.PathLecture_ResultPage, UriKind.Relative);
NavigationService.Navigate(url);
}
@@ -254,7 +254,7 @@ namespace CampusAppWP8.Pages.Lecture
private void ApiIsFail()
{
MessageBoxResult result = MessageBoxes.ShowMainModelErrorMessageBox(AppResources.MsgBox_ErrorMainModelLoad);
- this.ProgressBar.Visibility = Visibility.Collapsed;
+ this.DefHeader.ProgressVisibility = Visibility.Collapsed;
}
#endregion
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
index 10256218..939c49ab 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
@@ -36,7 +36,7 @@
-
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml
index 88313344..60a65188 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml
@@ -35,91 +35,93 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
index 74ae667d..d2495c78 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
@@ -58,63 +58,65 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml
index f968bec9..25db516a 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml
@@ -47,15 +47,17 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index c3712b17..422f7698 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -582,4 +582,7 @@
BTUTagDefaultHandler
+
+ removeBack
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
index 475bf057..2696d384 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs
@@ -735,6 +735,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die removeBack ähnelt.
+ ///
+ public static string ParamRemoveBack {
+ get {
+ return ResourceManager.GetString("ParamRemoveBack", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die ParamRoomId ähnelt.
///
diff --git a/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs b/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs
index a6f71040..c37ee3c8 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/AppUriMapper.cs
@@ -11,6 +11,7 @@ namespace CampusAppWP8.Utility
using System;
using System.Windows.Navigation;
using CampusAppWP8.Resources;
+ using System.Windows.Controls;
///
/// Class map Uri to AppPages
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Utility/DefaultStringManager.cs b/CampusAppWP8/CampusAppWPortalLib8/Utility/DefaultStringManager.cs
index 7f33422d..8f931d3a 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Utility/DefaultStringManager.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Utility/DefaultStringManager.cs
@@ -131,6 +131,12 @@ namespace CampusAppWPortalLib8.Utility
/// the id if it was found it in the string otherwise null
public static string FilterPlaceIdinQRResultString(string qrcodeResult)
{
+ if (qrcodeResult == null)
+ {
+ return null;
+
+ }
+
string[] lines = qrcodeResult.Split('\n');
string tmpLineTrim;
@@ -153,6 +159,11 @@ namespace CampusAppWPortalLib8.Utility
/// true if the string contains only digit, otherwise false
public static bool IsDigitsOnly(string str)
{
+ if (str == null || str.Length < 1)
+ {
+ return false;
+ }
+
foreach (char c in str)
{
if (c < '0' || c > '9')