diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index 7993a775..83bfbf50 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -107,6 +107,7 @@
+
diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs
index 46ff44eb..d92a582a 100644
--- a/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs
+++ b/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs
@@ -73,9 +73,36 @@ namespace CampusAppWP8.Model.Setting
STAFF = 2,
}
+ ///
+ /// Specifies the campus of the user.
+ ///
+ public enum Campus
+ {
+ ///
+ /// Cottbus -> MainCampus
+ ///
+ CB_MAIN = 1,
+
+ ///
+ /// Cottbus -> NorthCampus
+ ///
+ CB_NORTH = 4,
+
+ ///
+ /// Cottbus -> SouthCampus
+ ///
+ CB_SOUTH = 2,
+
+ ///
+ /// Senftenberg -> MainCampus
+ ///
+ SFB_MAIN = 3
+ }
+
#endregion
#region Proberties
+
///
/// Gets or sets the course of the user
///
@@ -95,6 +122,23 @@ namespace CampusAppWP8.Model.Setting
}
}
+
+ ///
+ /// Gets or sets the defaultCampus of the user
+ ///
+ public Campus DefaultCampus
+ {
+ get
+ {
+ return App.LoadFromAppState(Constants.UserSettings_DefaultCampus);
+ }
+
+ set
+ {
+ App.SaveToAppState(Constants.UserSettings_DefaultCampus, value);
+ }
+ }
+
///
/// Gets or sets the role of the user
///
diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs
new file mode 100644
index 00000000..88ea0d39
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs
@@ -0,0 +1,47 @@
+//
+// Company copyright tag.List
+//
+// stubbfel
+// 08.08.2013
+//----------------------------------------------------------------------
+namespace CampusAppWP8.Model.Utility
+{
+ using CampusAppWP8.Resources;
+
+ ///
+ /// This Class creates a list of degrees
+ ///
+ public class CampusListPickerItemListModel : ListPickerItemListModel
+ {
+ #region Constructor
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public CampusListPickerItemListModel()
+ : base()
+ {
+ }
+
+ #endregion
+
+ #region Method
+
+ #region private
+
+ ///
+ /// Overrides the LoadList-Method
+ ///
+ protected override void LoadList()
+ {
+ this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_MAIN).ToString(), AppResources.Campus_CBMain));
+ this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_NORTH).ToString(), AppResources.Campus_CBNorth));
+ this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_SOUTH).ToString(), AppResources.Campus_CBSouth));
+ this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.SFB_MAIN).ToString(), AppResources.Campus_SFBMain));
+ }
+
+ #endregion
+
+ #endregion
+ }
+}
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
index 027aa00f..976875b5 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
@@ -35,6 +35,7 @@
+
@@ -108,6 +109,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs
index 405634eb..ad348121 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs
@@ -56,16 +56,19 @@ namespace CampusAppWP8.Pages.Setting
DegreeListPickerItemListModel degreeList = new DegreeListPickerItemListModel();
SemesterListPickerItemListModel semesterList = new SemesterListPickerItemListModel();
RoleListPickerItemListModel roleList = new RoleListPickerItemListModel();
+ CampusListPickerItemListModel campusList = new CampusListPickerItemListModel();
this.Course.ItemsSource = courseList.List;
this.Degree.ItemsSource = degreeList.List;
this.Semster.ItemsSource = semesterList.List;
this.Role.ItemsSource = roleList.List;
+ this.Campus.ItemsSource = campusList.List;
this.Course.SelectedIndex = courseList.GetIndexOrDefault(this.userProfil.Course.ToString().PadLeft(3, '0'));
this.Degree.SelectedIndex = degreeList.GetIndexOrDefault(((int)this.userProfil.Degree).ToString());
this.Semster.SelectedIndex = semesterList.GetIndexOrDefault(this.userProfil.Semester.ToString());
this.Role.SelectedIndex = roleList.GetIndexOrDefault(this.userProfil.Role.ToString());
+ this.Campus.SelectedIndex = campusList.GetIndexOrDefault(((int)this.userProfil.DefaultCampus).ToString());
}
///
@@ -79,6 +82,7 @@ namespace CampusAppWP8.Pages.Setting
this.userProfil.Degree = (CampusAppWP8.Model.Setting.UserProfilModel.DegreeType)Enum.Parse(typeof(CampusAppWP8.Model.Setting.UserProfilModel.DegreeType), ((ListPickerItemModel)this.Degree.SelectedItem).Value);
this.userProfil.Semester = int.Parse(((ListPickerItemModel)this.Semster.SelectedItem).Value);
this.userProfil.Role = (CampusAppWP8.Model.Setting.UserProfilModel.RoleType)Enum.Parse(typeof(CampusAppWP8.Model.Setting.UserProfilModel.RoleType), ((ListPickerItemModel)this.Role.SelectedItem).Value);
+ this.userProfil.DefaultCampus = (CampusAppWP8.Model.Setting.UserProfilModel.Campus)Enum.Parse(typeof(CampusAppWP8.Model.Setting.UserProfilModel.Campus), ((ListPickerItemModel)this.Campus.SelectedItem).Value);
}
catch (Exception e)
{
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
index 7a24e051..cb61d417 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -105,6 +105,42 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Hauptcampus ähnelt.
+ ///
+ public static string Campus_CBMain {
+ get {
+ return ResourceManager.GetString("Campus_CBMain", resourceCulture);
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Nordcampus ähnelt.
+ ///
+ public static string Campus_CBNorth {
+ get {
+ return ResourceManager.GetString("Campus_CBNorth", resourceCulture);
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Südcampus ähnelt.
+ ///
+ public static string Campus_CBSouth {
+ get {
+ return ResourceManager.GetString("Campus_CBSouth", resourceCulture);
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Senftenberg Hauptcampus ähnelt.
+ ///
+ public static string Campus_SFBMain {
+ get {
+ return ResourceManager.GetString("Campus_SFBMain", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die Campusplan ähnelt.
///
@@ -393,6 +429,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Campusauswahl ähnelt.
+ ///
+ public static string ListPickerHeaderCampus {
+ get {
+ return ResourceManager.GetString("ListPickerHeaderCampus", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die Studiengangsauswahl ähnelt.
///
@@ -663,6 +708,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Campus ähnelt.
+ ///
+ public static string Setting_UserCampus {
+ get {
+ return ResourceManager.GetString("Setting_UserCampus", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die Studiengang ähnelt.
///
@@ -700,7 +754,7 @@ namespace CampusAppWP8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die Semster ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die Semester ähnelt.
///
public static string Setting_UserSemester {
get {
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index 0a92d7fd..4e7afc85 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -333,7 +333,7 @@
Rolle
- Semster
+ Semester
Mitarbeiter
@@ -365,4 +365,22 @@
Dürfen Positionsdaten enhoben und verwendet werden?
+
+ Cottbus Hauptcampus
+
+
+ Cottbus Nordcampus
+
+
+ Cottbus Südcampus
+
+
+ Senftenberg Hauptcampus
+
+
+ Campusauswahl
+
+
+ Campus
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
index 7c4137ce..2b67bdc9 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
@@ -735,6 +735,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die UserSettings.DefaultCampus ähnelt.
+ ///
+ public static string UserSettings_DefaultCampus {
+ get {
+ return ResourceManager.GetString("UserSettings_DefaultCampus", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die UserSettings.Degree ähnelt.
///
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index 3df7fc27..b277f0f9 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -363,4 +363,7 @@
UserSettings.Semester
+
+ UserSettings.DefaultCampus
+
\ No newline at end of file