diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs
index 2409d10a..958ea718 100644
--- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs
@@ -12,7 +12,8 @@ namespace CampusAppWP8.Api.GeoApi
using CampusAppWP8.Model;
using CampusAppWP8.Model.GeoDb;
using CampusAppWP8.Model.Utility;
- using CampusAppWP8.Resources;
+ using CampusAppWP8.Resources;
+ using CampusAppWPortalLib8.Model.Utility;
/// Pis api.
/// Stubbfel, 09.09.2013.
diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs
index b6cb614e..7ff2444c 100644
--- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs
@@ -13,6 +13,7 @@ namespace CampusAppWP8.Api.GeoApi
using CampusAppWP8.Model.GeoDb;
using CampusAppWP8.Model.Utility;
using CampusAppWP8.Resources;
+ using CampusAppWPortalLib8.Model.Utility;
/// Pss api.
/// Stubbfel, 09.09.2013.
diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs
index 18d727f7..2a0988ef 100644
--- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs
+++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs
@@ -12,7 +12,8 @@ namespace CampusAppWP8.Api.GeoApi
using CampusAppWP8.Model.GeoDb;
using CampusAppWP8.Model.Utility;
using CampusAppWP8.Resources;
- using CampusAppWP8.Utility;
+ using CampusAppWP8.Utility;
+ using CampusAppWPortalLib8.Model.Utility;
///
/// Class for SPSAPI
diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index 4e9814f4..79607bf7 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -131,7 +131,6 @@
-
Exams.xaml
@@ -198,7 +197,6 @@
-
CampusMapPage.xaml
@@ -554,6 +552,10 @@
{2A51FA6C-791B-4935-B869-FDBA9ED774D7}
CampusAppWP8ScheduledTaskAgent
+
+ {67D80BE2-0FB7-44C8-A495-7D44FC2AC262}
+ CampusAppWPortalLib8
+
diff --git a/CampusAppWP8/CampusAppWP8/Model/MainModel.cs b/CampusAppWP8/CampusAppWP8/Model/MainModel.cs
index 4123275f..fb55ccf4 100644
--- a/CampusAppWP8/CampusAppWP8/Model/MainModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/MainModel.cs
@@ -7,12 +7,12 @@
//-----------------------------------------------------------------------------
namespace CampusAppWP8
{
+ using CampusAppWP8.Utility;
+ using CampusAppWPortalLib8.Model.Utility;
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
- using CampusAppWP8.Model.Utility;
- using CampusAppWP8.Utility;
///
/// Base model io handling class.
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
index ee02e75c..37f79f70 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
@@ -17,6 +17,7 @@ namespace CampusAppWP8.Pages.Lecture
using CampusAppWP8.Resources;
using CampusAppWP8.Utility.Lui.MessageBoxes;
using Microsoft.Phone.Controls;
+ using CampusAppWPortalLib8.Model.Utility;
///
/// Class for the LecturePage
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs
index b95c31e2..289d4ad4 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs
@@ -18,6 +18,7 @@ namespace CampusAppWP8.Pages.Person
using CampusAppWP8.Utility.Lui.MessageBoxes;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Tasks;
+ using CampusAppWPortalLib8.Model.Utility;
/// Person page.
/// Stubbfel, 09.09.2013.
diff --git a/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs b/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs
index 561f0bb5..22a7814a 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs
@@ -1,4 +1,5 @@
using CampusAppWP8ScheduledTaskAgent.Resources;
+using CampusAppWPortalLib8.Utility;
using Microsoft.Phone.Scheduler;
using System;
using System.Collections.Generic;
@@ -8,9 +9,10 @@ using System.Threading.Tasks;
namespace CampusAppWP8.Utility
{
- public class BackgroundTasks
+ public class BackgroundTasks : AbstractBackgroundTasks
{
public static void StartPerodicTask(string taskName, string taskDesc) {
+ BackgroundTasks.StopPerodicTask(BackgroundTasks.LastAddedTaskName);
BackgroundTasks.StopPerodicTask(taskName);
PeriodicTask periodicTask = new PeriodicTask(taskName);
@@ -24,11 +26,19 @@ namespace CampusAppWP8.Utility
catch (Exception e)
{
Logger.LogException(e);
+ return;
}
+
+ BackgroundTasks.LastAddedTaskName = taskName;
}
public static void StopPerodicTask(string taskName)
{
+ if (taskName == null)
+ {
+ return;
+ }
+
PeriodicTask periodicTask = ScheduledActionService.Find(taskName) as PeriodicTask;
if (periodicTask != null)
{
diff --git a/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs b/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs
index e8cd4db7..2d3b73c1 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs
@@ -11,6 +11,7 @@ namespace CampusAppWP8.Utility
using System.Collections.Generic;
using System.Net;
using CampusAppWP8.Model.Utility;
+ using CampusAppWPortalLib8.Model.Utility;
///
/// Class realize the access of restful HttpRequest
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs
index 031643c4..52406b28 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs
@@ -50,6 +50,7 @@ namespace CampusAppWP8.Utility.Lui.Tiles
public static void CreateNewsTile()
{
TileCreator.CreateIconicTile(AppResources.NewsApp_Title, Constants.PathNews_NewsIndexPage, Icons.News, Icons.News);
+ BackgroundTasks.StartNewsTask();
}
public static void CreateLectureTile()
diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/CampusAppWP8ScheduledTaskAgent.csproj b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/CampusAppWP8ScheduledTaskAgent.csproj
index ac3a8489..8f6f7018 100644
--- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/CampusAppWP8ScheduledTaskAgent.csproj
+++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/CampusAppWP8ScheduledTaskAgent.csproj
@@ -84,14 +84,6 @@
4
-
-
-
-
-
-
-
-
AppResources.resx
True
@@ -106,9 +98,6 @@
-
-
-
@@ -125,6 +114,12 @@
+
+
+ {67D80BE2-0FB7-44C8-A495-7D44FC2AC262}
+ CampusAppWPortalLib8
+
+
diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Model/Utility/CleanUrlParamModel.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Model/Utility/CleanUrlParamModel.cs
deleted file mode 100644
index 7e35cd1a..00000000
--- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Model/Utility/CleanUrlParamModel.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-//-----------------------------------------------------------------------
-//
-// Company copyright tag.
-//
-// stubbfel
-// 06.08.2013
-//----------------------------------------------------------------------
-namespace CampusAppWP8ScheduledTaskAgent.Model.Utility
-{
- ///
- /// This class is a Model for the URLParameter like GET-Parameter
- ///
- public class CleanUrlParamModel : UrlParamModel
- {
- #region Constructor
-
- /// Initializes a new instance of the CleanUrlParamModel class.
- /// Stubbfel, 12.09.2013.
- /// the key for the parameter.
- public CleanUrlParamModel(string key)
- : base(key)
- {
- }
-
- /// Initializes a new instance of the CleanUrlParamModel class.
- /// Stubbfel, 12.09.2013.
- /// the key for the parameter.
- /// The value.
- public CleanUrlParamModel(string key, string value)
- : base(key, value)
- {
- }
- #endregion
-
- #region Proberty
-
- ///
- /// Gets the token, which indicate that the parameterList started
- ///
- public override string ParamToken
- {
- get
- {
- return string.Empty;
- }
- }
- #endregion
-
- #region Methods
-
- ///
- /// Method return a formatted string like Key=Value
- ///
- /// return formatted string
- public override string ToString()
- {
- if (!this.IsParamValid())
- {
- return string.Empty;
- }
-
- return "/" + this.key + "/" + this.Value;
- }
- #endregion
- }
-}
diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Model/Utility/URLParamModel.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Model/Utility/URLParamModel.cs
deleted file mode 100644
index b7090214..00000000
--- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Model/Utility/URLParamModel.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-//-----------------------------------------------------------------------
-//
-// Company copyright tag.
-//
-// stubbfel
-// 17.06.2013
-//----------------------------------------------------------------------
-namespace CampusAppWP8ScheduledTaskAgent.Model.Utility
-{
- ///
- /// This class is a Model for the URLParameter like GET-Parameter
- ///
- public class UrlParamModel
- {
- #region Members
-
- ///
- /// Variable of the key
- ///
- protected readonly string key;
-
- #endregion
-
- #region Constructor
-
- ///
- /// Initializes a new instance of the class.
- ///
- /// the key for the parameter
- public UrlParamModel(string key)
- {
- this.key = key;
- }
-
- ///
- /// Initializes a new instance of the class.
- ///
- /// the key for the parameter>
- /// value of the parameter
- public UrlParamModel(string key, string value)
- {
- this.key = key;
- this.Value = value;
- }
- #endregion
-
- #region Proberty
-
- ///
- /// Gets or sets the value of the Parameter
- ///
- public string Value { get; set; }
-
- ///
- /// Gets the key of the parameter
- ///
- public string Key
- {
- get
- {
- return this.key;
- }
- }
-
- ///
- /// Gets the token, which indicate that the parameterList started
- ///
- public virtual string ParamToken
- {
- get
- {
- return "?";
- }
- }
- #endregion
-
- #region Methods
-
- ///
- /// Method check if the parameter is valid
- ///
- /// true if is it valid, otherwise false
- public virtual bool IsParamValid()
- {
- if (this.key == null || string.Empty.Equals(this.key) || string.Empty.Equals(this.Value))
- {
- return false;
- }
-
- return true;
- }
-
- ///
- /// Method return a formatted string like Key=Value
- ///
- /// return formatted string
- public override string ToString()
- {
- if (!this.IsParamValid())
- {
- return string.Empty;
- }
-
- return "&" + this.key + "=" + this.Value;
- }
- #endregion
- }
-}
diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs
index 59879025..e4e6fcca 100644
--- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs
@@ -87,24 +87,6 @@ namespace CampusAppWP8ScheduledTaskAgent.Resources {
}
}
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Aktion ähnelt.
- ///
- public static string MensaApp_Action {
- get {
- return ResourceManager.GetString("MensaApp_Action", resourceCulture);
- }
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Bio ähnelt.
- ///
- public static string MensaApp_Bio {
- get {
- return ResourceManager.GetString("MensaApp_Bio", resourceCulture);
- }
- }
-
///
/// Sucht eine lokalisierte Zeichenfolge, die Die Mensa ist heute geschlossen ähnelt.
///
@@ -113,86 +95,5 @@ namespace CampusAppWP8ScheduledTaskAgent.Resources {
return ResourceManager.GetString("MensaApp_CloseMensa", resourceCulture);
}
}
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Essen 1 ähnelt.
- ///
- public static string MensaApp_Dinner1 {
- get {
- return ResourceManager.GetString("MensaApp_Dinner1", resourceCulture);
- }
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Essen 2 ähnelt.
- ///
- public static string MensaApp_Dinner2 {
- get {
- return ResourceManager.GetString("MensaApp_Dinner2", resourceCulture);
- }
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Essen 3 ähnelt.
- ///
- public static string MensaApp_Dinner3 {
- get {
- return ResourceManager.GetString("MensaApp_Dinner3", resourceCulture);
- }
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Essen 4 ähnelt.
- ///
- public static string MensaApp_Dinner4 {
- get {
- return ResourceManager.GetString("MensaApp_Dinner4", resourceCulture);
- }
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Essen 5 ähnelt.
- ///
- public static string MensaApp_Dinner5 {
- get {
- return ResourceManager.GetString("MensaApp_Dinner5", resourceCulture);
- }
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die 84 ähnelt.
- ///
- public static string MensaApp_DinnerLabelW {
- get {
- return ResourceManager.GetString("MensaApp_DinnerLabelW", resourceCulture);
- }
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Heute nicht im Angbot ähnelt.
- ///
- public static string MensaApp_NotToday {
- get {
- return ResourceManager.GetString("MensaApp_NotToday", resourceCulture);
- }
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Suppe ähnelt.
- ///
- public static string MensaApp_Soup {
- get {
- return ResourceManager.GetString("MensaApp_Soup", resourceCulture);
- }
- }
-
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die Mensaplan ähnelt.
- ///
- public static string MensaApp_Title {
- get {
- return ResourceManager.GetString("MensaApp_Title", resourceCulture);
- }
- }
}
}
diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx
index 31c1f5d6..eeaa3432 100644
--- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx
@@ -117,49 +117,16 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Mensaplan
-
-
- Aktion
-
-
- Bio
-
-
- Essen 1
-
-
- Essen 2
-
-
- Essen 3
-
-
- Essen 4
-
-
- Heute nicht im Angbot
-
-
- 84
-
-
- Essen 5
-
-
- Suppe
-
Hintergrunddienst für die BTU-Mensa
-
- Die Mensa ist heute geschlossen
-
Hintergrunddienst für die BTU-Event-Feed
Hintergrunddienst für die BTU-News-Feed
+
+ Die Mensa ist heute geschlossen
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs
index c2f57b7d..56c2823a 100644
--- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs
+++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs
@@ -1,7 +1,8 @@
-using CampusAppWP8ScheduledTaskAgent.Model.Mensa;
-using CampusAppWP8ScheduledTaskAgent.Model.RSS;
-using CampusAppWP8ScheduledTaskAgent.Resources;
+using CampusAppWP8ScheduledTaskAgent.Resources;
using CampusAppWP8ScheduledTaskAgent.Utility;
+using CampusAppWPortalLib8.Model.Mensa;
+using CampusAppWPortalLib8.Model.RSS;
+using CampusAppWPortalLib8.Utility;
using Microsoft.Phone.Scheduler;
using Microsoft.Phone.Shell;
using System;
diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Utility/BackgroundTasks.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Utility/BackgroundTasks.cs
index 50b9034e..a585873d 100644
--- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Utility/BackgroundTasks.cs
+++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Utility/BackgroundTasks.cs
@@ -1,35 +1,11 @@
-using CampusAppWP8ScheduledTaskAgent.Resources;
+using CampusAppWPortalLib8.Utility;
using Microsoft.Phone.Scheduler;
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace CampusAppWP8ScheduledTaskAgent.Utility
{
- public class BackgroundTasks
+ public class BackgroundTasks : AbstractBackgroundTasks
{
- public static void StartPerodicTask(string taskName, string taskDesc) {
- BackgroundTasks.StopPerodicTask(taskName);
-
- PeriodicTask periodicTask = new PeriodicTask(taskName);
- // load description from localized strings
- periodicTask.Description = taskDesc;
-
- try
- {
- ScheduledActionService.Add(periodicTask);
-
- //ScheduledActionService.LaunchForTest(taskName, TimeSpan.FromSeconds(10));
-
- }
- catch (Exception e)
- {
- Logger.LogException(e);
- }
- }
-
public static void StopPerodicTask(string taskName)
{
PeriodicTask periodicTask = ScheduledActionService.Find(taskName) as PeriodicTask;
diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Utility/HttpRequest.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Utility/HttpRequest.cs
index 4750cb3f..455fad0d 100644
--- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Utility/HttpRequest.cs
+++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Utility/HttpRequest.cs
@@ -7,24 +7,15 @@
//----------------------------------------------------------------------using System;
namespace CampusAppWP8ScheduledTaskAgent.Utility
{
+ using CampusAppWPortalLib8.Utility;
using System;
- using System.Collections.Generic;
using System.Net;
- using CampusAppWP8ScheduledTaskAgent.Model.Utility;
///
/// Class realize the access of restful HttpRequest
///
- public class HttpRequest
+ public class HttpRequest : AbstractHttpRequest
{
- #region Member
-
- ///
- /// BaseAddress of the webClient
- ///
- private string baseAddress;
- #endregion
-
#region Constructor
///
@@ -40,13 +31,12 @@ namespace CampusAppWP8ScheduledTaskAgent.Utility
/// the url of the HttpRequest base address
public HttpRequest(Uri apiBaseAddress)
{
- this.baseAddress = apiBaseAddress.AbsoluteUri;
+ this.BaseAddress = apiBaseAddress.AbsoluteUri;
}
#endregion
#region Methods
- #region public
///
/// Method realize the http-get-method resource
@@ -58,158 +48,7 @@ namespace CampusAppWP8ScheduledTaskAgent.Utility
WebClient client = new WebClient();
client.DownloadStringCompleted += new DownloadStringCompletedEventHandler(action);
client.DownloadStringAsync(url);
- }
-
- /// Method realize the http-get-method resource.
- /// Stubbfel, 03.09.2013.
- /// Url of the resource.
- /// The action.
- public void HttpGet(Uri url, Action