diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs
new file mode 100644
index 00000000..d68c2c0e
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs
@@ -0,0 +1,79 @@
+//-----------------------------------------------------------------------
+//
+// Company copyright tag.
+//
+// stubbfel
+// 13.06.2013
+//----------------------------------------------------------------------
+namespace CampusAppWP8.Model.Lecture
+{
+ using CampusAppWP8.Resources;
+ using CampusAppWPortalLib8.Model.Lecture;
+
+ ///
+ /// Model for a Activity
+ ///
+ public class LectureWp8Activity : LectureActivity
+ {
+ #region Members
+
+ /// URL of the icon.
+ private string iconUrl;
+
+ #endregion
+
+ #region Proberty
+
+ /// Gets URL of the icon.
+ /// The icon URL.
+ public string IconUrl
+ {
+ get
+ {
+ this.CreateIconUrl();
+ return this.iconUrl;
+ }
+ }
+ #endregion
+
+ #region Methods
+
+ #region private
+
+ /// Creates icon URL.
+ /// Stubbfel, 12.09.2013.
+ private void CreateIconUrl()
+ {
+ string typeStr = this.Type;
+
+ if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeLecture))
+ {
+ this.iconUrl = Icons.Lecture;
+ }
+ else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeExam))
+ {
+ this.iconUrl = Icons.Exams;
+ }
+ else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypePract))
+ {
+ this.iconUrl = Icons.Practise;
+ }
+ else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeSeminar))
+ {
+ this.iconUrl = Icons.Seminar;
+ }
+ else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeLab))
+ {
+ this.iconUrl = Icons.Lab;
+ }
+ else
+ {
+ this.iconUrl = Icons.Info;
+ }
+ }
+
+ #endregion
+
+ #endregion
+ }
+}
diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs
new file mode 100644
index 00000000..a2ca637d
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs
@@ -0,0 +1,34 @@
+//-----------------------------------------------------------------------
+//
+// Company copyright tag.
+//
+// stubbfel
+// 10.06.2013
+//----------------------------------------------------------------------
+namespace CampusAppWP8.Model.Lecture
+{
+ using System.Linq;
+ using System.Xml.Serialization;
+
+ ///
+ /// Model for a List of LectureActivity
+ ///
+ [XmlRoot("lsf_auszug")]
+ public class LectureWp8List : CampusAppWPortalLib8.Model.Lecture.LectureList
+ {
+ #region Methods
+
+ ///
+ /// Method return a certain activity
+ ///
+ /// id of the activity
+ /// the activity (FirstOrDefault)
+ public new LectureWp8Activity GetActivity(int id)
+ {
+ LectureWp8Activity activity = this.Activities.Where(p => p.Id == id).FirstOrDefault();
+ return base.GetActivity(id) as LectureWp8Activity;
+ }
+
+ #endregion
+ }
+}
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs
index abecce29..551d5b7c 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs
@@ -16,7 +16,7 @@ namespace CampusAppWPortalLib8.Model.Exams
/// Exam list model.
/// Stubbfel, 02.09.2013.
[XmlRoot("links")]
- public class ExamListModel
+ public class ExamListModel where T : ExamModel
{
#region Property
@@ -35,14 +35,8 @@ namespace CampusAppWPortalLib8.Model.Exams
public List CreateCourseList()
{
List result = new List();
- foreach (T item in this.Exams)
+ foreach (T exam in this.Exams)
{
- ExamModel exam = item as ExamModel;
- if (exam == null)
- {
- continue;
- }
-
CourseModel tmpModel = new CourseModel(exam.CourseNumber, exam.CourseText);
if (!result.Contains(tmpModel))
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs
index c56cfa3b..fcb2db88 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs
@@ -13,7 +13,7 @@ namespace CampusAppWPortalLib8.Model.Person
/// Interface for PersonModel classes
///
/// PersonFunctionModel template
- public interface IPersonModel
+ public interface IPersonModel where T : IPersonFunctionModel
{
/// Gets or sets the functions of a person.
/// The functions.
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs
index 381e3a0f..d79729a8 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs
@@ -35,7 +35,7 @@ namespace CampusAppWPortalLib8.Model.Person
{
foreach (T item in this.Persons)
{
- IPersonModel person = item as IPersonModel;
+ IPersonModel person = item as IPersonModel;
if (person != null)
{
person.SetPersonIdToFunction();
@@ -47,11 +47,11 @@ namespace CampusAppWPortalLib8.Model.Person
/// Stubbfel, 05.09.2013.
/// The identifier.
/// The person.
- public IPersonModel GetPerson(string id)
+ public IPersonModel GetPerson(string id)
{
foreach (T item in this.Persons)
{
- IPersonModel tmpPerson = item as IPersonModel;
+ IPersonModel tmpPerson = item as IPersonModel;
if (tmpPerson == null)
{
continue;
@@ -63,7 +63,7 @@ namespace CampusAppWPortalLib8.Model.Person
}
}
- return default(IPersonModel);
+ return default(IPersonModel);
}
/// Removes the non function and set identifiers person.
@@ -81,7 +81,7 @@ namespace CampusAppWPortalLib8.Model.Person
List removeList = new List();
foreach (T item in this.Persons)
{
- IPersonModel tmpPerson = item as IPersonModel;
+ IPersonModel tmpPerson = item as IPersonModel;
if (tmpPerson == null)
{
continue;
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs
index 91623e1a..931104d3 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs
@@ -13,7 +13,7 @@ namespace CampusAppWPortalLib8.Model.Person
/// Person model.
/// Stubbfel, 05.09.2013.
/// template for the PersonFunction-Class
- public class PersonModel : IPersonModel
+ public class PersonModel : IPersonModel where T : IPersonFunctionModel
{
#region Member