diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs
index a26bfb79..5c32e0ed 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs
@@ -10,6 +10,7 @@ namespace CampusAppWP8.Model.Lecture
using System.Collections.ObjectModel;
using System.Xml.Serialization;
using CampusAppWP8.Utility;
+ using CampusAppWP8.Resources;
///
/// Model for a Activity
@@ -38,6 +39,24 @@ namespace CampusAppWP8.Model.Lecture
///
private string topic;
+ /// URL of the icon.
+ private string iconUrl;
+
+ /// The activity icon name lecture.
+ private const string ActivityIconNameLecture = "Vorlesung";
+
+ /// The activity icon name seminar.
+ private const string ActivityIconNameSeminar = "Seminar";
+
+ /// The activity icon name pract.
+ private const string ActivityIconNamePract = "Übung";
+
+ /// The activity icon name lab.
+ private const string ActivityIconNameLab = "Labor";
+
+ /// The activity icon name exam.
+ private const string ActivityIconNameExam = "Prüfung";
+
#endregion
#region Constructor
@@ -184,6 +203,16 @@ namespace CampusAppWP8.Model.Lecture
}
}
+ /// Gets URL of the icon.
+ /// The icon URL.
+ public string IconUrl
+ {
+ get
+ {
+ this.CreateIconUrl();
+ return this.iconUrl;
+ }
+ }
#endregion
#region Methods
@@ -216,6 +245,38 @@ namespace CampusAppWP8.Model.Lecture
this.CourseString = StringManager.RemoveNewLine(result);
}
+ /// Creates icon URL.
+ /// Stubbfel, 12.09.2013.
+ private void CreateIconUrl()
+ {
+ string typeStr = this.Type;
+
+ if (typeStr.Contains(LectureActivity.ActivityIconNameLecture))
+ {
+ this.iconUrl = Icons.Lecture;
+ }
+ else if (typeStr.Contains(LectureActivity.ActivityIconNameExam))
+ {
+ this.iconUrl = Icons.Exams;
+ }
+ else if (typeStr.Contains(LectureActivity.ActivityIconNamePract))
+ {
+ this.iconUrl = Icons.Practise;
+ }
+ else if (typeStr.Contains(LectureActivity.ActivityIconNameSeminar))
+ {
+ this.iconUrl = Icons.Info;
+ }
+ else if (typeStr.Contains(LectureActivity.ActivityIconNameLab))
+ {
+ this.iconUrl = Icons.Lab;
+ }
+ else
+ {
+ this.iconUrl = Icons.Info;
+ }
+ }
+
#endregion
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
index a2854ff7..0575f070 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml
@@ -47,9 +47,12 @@
-
-
-
+
+
+
+
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs
index b52d7047..eb719a52 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs
@@ -33,6 +33,17 @@ namespace CampusAppWP8.Resources
}
}
+ ///
+ /// Gets the uri string of the AddContact icon.
+ ///
+ public static string AddContact
+ {
+ get
+ {
+ return Themerize("add_contact_159.png");
+ }
+ }
+
///
/// Gets the uri string of the Campus icon.
///
@@ -176,6 +187,17 @@ namespace CampusAppWP8.Resources
}
}
+ ///
+ /// Gets the uri string of the Lab icon.
+ ///
+ public static string Lab
+ {
+ get
+ {
+ return Themerize("lab_159.png");
+ }
+ }
+
///
/// Gets the uri string of the Lamb icon.
///
@@ -187,6 +209,17 @@ namespace CampusAppWP8.Resources
}
}
+ ///
+ /// Gets the uri string of the Lecture icon.
+ ///
+ public static string Lecture
+ {
+ get
+ {
+ return Themerize("lecture_159.png");
+ }
+ }
+
///
/// Gets the uri string of the Lectures icon.
///
@@ -275,6 +308,17 @@ namespace CampusAppWP8.Resources
}
}
+ ///
+ /// Gets the uri string of the Practise icon.
+ ///
+ public static string Practise
+ {
+ get
+ {
+ return Themerize("practise_159.png");
+ }
+ }
+
///
/// Gets the uri string of the Schedule icon.
///
@@ -308,6 +352,17 @@ namespace CampusAppWP8.Resources
}
}
+ ///
+ /// Gets the uri string of the Seminar icon.
+ ///
+ public static string Seminar
+ {
+ get
+ {
+ return Themerize("seminar_159.png");
+ }
+ }
+
///
/// Gets the uri string of the StudentCouncil icon.
///
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx
index 1cdc52f7..35f73cf8 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx
@@ -120,6 +120,9 @@
add_159.png
+
+ add_contact_159.png
+
campus_159.png
@@ -159,9 +162,15 @@
info_159.png
+
+ lab_159.png
+
info_159.png
+
+ lecture_159.png
+
lectures_159.png
@@ -186,6 +195,9 @@
info_159.png
+
+ practise_159.png
+
schedule_159.png
@@ -195,6 +207,9 @@
search_place_159.png
+
+ seminar_159.png
+
student_council_159.png
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/AddPersonButton.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/AddPersonButton.cs
index 6653f038..0f434b53 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/AddPersonButton.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/AddPersonButton.cs
@@ -1,19 +1,28 @@
-using CampusAppWP8.Resources;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media.Imaging;
+//-----------------------------------------------------------------------
+//
+// Company copyright tag.
+//
+// stubbfel
+// 09.09.2013
+//----------------------------------------------------------------------
namespace CampusAppWP8.Utility.Lui.Button
{
+ using System;
+ using System.Windows;
+ using System.Windows.Controls;
+ using System.Windows.Media.Imaging;
+ using CampusAppWP8.Resources;
+
+ /// Add person button.
+ /// Stubbfel, 12.09.2013.
public class AddPersonButton : System.Windows.Controls.Button
{
- private static BitmapImage icon = new BitmapImage(new Uri(Icons.Add, UriKind.Relative));
+ /// The icon.
+ private static BitmapImage icon = new BitmapImage(new Uri(Icons.AddContact, UriKind.Relative));
+ /// Initializes a new instance of the AddPersonButton class.
+ /// Stubbfel, 12.09.2013.
public AddPersonButton()
: base()
{
@@ -23,17 +32,22 @@ namespace CampusAppWP8.Utility.Lui.Button
};
}
+ /// The person identifier property.
public static readonly DependencyProperty PersonIdProperty = DependencyProperty.Register("PersonID", typeof(object), typeof(AddPersonButton), new PropertyMetadata(false));
-
+ /// The function index property.
public static readonly DependencyProperty FunctionIndexProperty = DependencyProperty.Register("FunctionIndex", typeof(object), typeof(AddPersonButton), new PropertyMetadata(false));
+ /// Gets or sets the identifier of the person.
+ /// The identifier of the person.
public object PersonId
{
get { return (object)this.GetValue(PersonIdProperty); }
set { this.SetValue(PersonIdProperty, value); }
}
+ /// Gets or sets zero-based index of the function.
+ /// The function index.
public object FunctionIndex
{
get { return (object)this.GetValue(FunctionIndexProperty); }