diff --git a/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs b/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs
index ea62725b..f02fc958 100644
--- a/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs
+++ b/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs
@@ -37,7 +37,7 @@ using CampusAppWP8.Resources;
return false;
}
- return true;
+ return false;
}
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Model/GeoDb/SpsModel.cs b/CampusAppWP8/CampusAppWP8/Model/GeoDb/SpsModel.cs
index 213dd8e4..769df19f 100644
--- a/CampusAppWP8/CampusAppWP8/Model/GeoDb/SpsModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/GeoDb/SpsModel.cs
@@ -172,5 +172,22 @@ namespace CampusAppWP8.Model.GeoDb
return true;
}
+
+ /// Filter by PID.
+ /// Stubbfel, 11.09.2013.
+ /// List of pids.
+ /// .
+ public List FilterByPid(List pidList)
+ {
+ List fitlerList = new List();
+ foreach (PlaceModel place in this.Places)
+ {
+ if (pidList.Contains(place.PlaceId))
+ {
+ fitlerList.Add(place);
+ }
+ }
+ return fitlerList;
+ }
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml.cs
index 3a9eca4a..8d8dbe6b 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/PlaceNews/PlaceNews.xaml.cs
@@ -43,6 +43,7 @@ namespace CampusAppWP8.Pages.PlaceNews
/// true to force reqest.
private bool forceReqest;
+ private List searchPidList;
/// Initializes a new instance of the PlaceNews class.
/// Stubbfel, 09.09.2013.
@@ -111,6 +112,10 @@ namespace CampusAppWP8.Pages.PlaceNews
this.spsApi.OnLoaded += new SpsApi.OnIO(this.SpsApiIsReady);
this.spsApi.OnFailedLoad += new SpsApi.OnFailed(this.ApiIsFail);
this.spsApi.SetupCurrentPlaceRequest(Constants.SpsDomain_Buildings);
+ if (this.forceReqest)
+ {
+ this.spsApi.LoadData();
+ }
}
// init pis API
@@ -210,22 +215,22 @@ namespace CampusAppWP8.Pages.PlaceNews
this.waitForApi--;
this.places.Model.AddPlaces(this.spsApi.Model.Places.ToList());
- List pidlist = this.spsApi.Model.CreatePidList();
+ searchPidList = this.spsApi.Model.CreatePidList();
List infoNames = new List() { Constants.PisInformationName_Name };
List serviceNames = new List() { Constants.PssServiceName_PlaceNews };
// load from pis api
- if (this.forceReqest || !this.places.Model.ContainsInformationNames(pidlist, infoNames))
+ if (this.forceReqest || !this.places.Model.ContainsInformationNames(searchPidList, infoNames))
{
- this.pisApi.SetupInformationRequest(pidlist, infoNames);
+ this.pisApi.SetupInformationRequest(searchPidList, infoNames);
this.pisApi.LoadData();
this.waitForApi++;
}
-
+
// load from pis api
- if (this.forceReqest || !this.places.Model.ContainsServiceNames(pidlist, serviceNames))
+ if (this.forceReqest || !this.places.Model.ContainsServiceNames(searchPidList, serviceNames))
{
- this.pssApi.SetupServiceRequest(pidlist, serviceNames);
+ this.pssApi.SetupServiceRequest(searchPidList, serviceNames);
this.pssApi.LoadData();
this.waitForApi++;
}
@@ -237,7 +242,7 @@ namespace CampusAppWP8.Pages.PlaceNews
/// Stubbfel, 09.09.2013.
private void SetupResultBox()
{
- this.ResultBox.ItemsSource = this.places.Model.Places;
+ this.ResultBox.ItemsSource = this.places.Model.FilterByPid(this.searchPidList);
this.ProgressBar.Visibility = Visibility.Collapsed;
this.places.SaveData();
App.SaveToIsolatedStorage(Constants.IsolatedStorage_AllPlaces, this.places.Model);
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
index 1904f740..9b04fcca 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
@@ -907,7 +907,7 @@ namespace CampusAppWP8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die name ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die Name ähnelt.
///
public static string PisInformationName_Name {
get {
@@ -979,7 +979,7 @@ namespace CampusAppWP8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die 3 ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die 1 ähnelt.
///
public static string SpsApi_CampusDomain {
get {
@@ -1015,7 +1015,7 @@ namespace CampusAppWP8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die 1 ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die 2 ähnelt.
///
public static string SpsDomain_Buildings {
get {
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index fc6b58b5..20106915 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -391,7 +391,7 @@
http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=Senftenberg&v=1
- 3
+ 1
domain
@@ -505,7 +505,7 @@
pid
- name
+ Name
typ
@@ -520,7 +520,7 @@
PlaceNews
- 1
+ 2
http://141.43.76.140/service/pis