stubbfel/win8phoneApp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mv enums

Browse Source
This commit is contained in:
stubbfel
2013-10-01 14:10:20 +02:00
parent 80d05b9c45
commit dc3c527996
18 changed files with 128 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs
View File

@@ -56,14 +56,14 @@ namespace CampusAppWP8.Api.GeoApi
/// Method return the campus of the placeList
/// </summary>
/// <returns>actual campus</returns>
public CampusAppWP8.Model.Setting.UserProfilModel.Campus GetCampus()
public CampusAppWPortalLib8.Model.Settings.Campus GetCampus()
{
if (this.Model == null)
{
return Settings.UserProfil.DefaultCampus;
}
CampusAppWP8.Model.Setting.UserProfilModel.Campus campus;
CampusAppWPortalLib8.Model.Settings.Campus campus;
foreach (PlaceModel place in this.Model.Places)
{
if (Enum.TryParse(place.PlaceId, true, out campus))

3
CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
View File

@@ -163,8 +163,6 @@
<Compile Include="Utility\NDEF\NDEFRecord.cs" />
<Compile Include="Utility\NDEF\NDEFShortRecord.cs" />
<Compile Include="Model\Utility\RoleListPickerItemListModel.cs" />
<Compile Include="Model\Utility\SemesterListPickerItemListModel.cs" />
<Compile Include="Model\Utility\ListPickerItemListModel.cs" />
<Compile Include="Pages\Dev\NFC.xaml.cs">
<DependentUpon>NFC.xaml</DependentUpon>
</Compile>
@@ -230,7 +228,6 @@
<Compile Include="Pages\Lecture\ModulWebPage.xaml.cs">
<DependentUpon>ModulWebPage.xaml</DependentUpon>
</Compile>
<Compile Include="Model\Utility\ListPickerItemModel.cs" />
<Compile Include="Pages\Lecture\ResultDetailPage.xaml.cs">
<DependentUpon>ResultDetailPage.xaml</DependentUpon>
</Compile>

10
CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
View File

@@ -52,17 +52,17 @@ namespace CampusAppWP8.Feed.Mensa
/// </summary>
/// <param name="campus"> camus parameter </param>
/// <returns> the correct mensaFeed</returns>
public static MensaFeed CreateCampusMensaFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus campus)
public static MensaFeed CreateCampusMensaFeed(CampusAppWPortalLib8.Model.Settings.Campus campus)
{
switch (campus)
{
case CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_MAIN:
case CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN:
return new MensaFeedCBMain();
case CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_NORTH:
case CampusAppWPortalLib8.Model.Settings.Campus.CB_NORTH:
return new MensaFeedCBNorth();
case CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_SOUTH:
case CampusAppWPortalLib8.Model.Settings.Campus.CB_SOUTH:
return new MensaFeedCBSouth();
case CampusAppWP8.Model.Setting.UserProfilModel.Campus.SFB_MAIN:
case CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN:
return new MensaFeedSBFMain();
default:
return new MensaFeedCBMain();

2
CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs
View File

@@ -21,7 +21,7 @@ namespace CampusAppWP8.Model.Campusmap
#region Member
/// <summary>Variable for the identify of the campus.</summary>
private static readonly string Campus = ((int)CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_MAIN).ToString();
private static readonly string Campus = ((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN).ToString();
#endregion

1
CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs
View File

@@ -10,6 +10,7 @@ namespace CampusAppWP8.Model.Lecture
using System.Runtime.Serialization;
using CampusAppWP8.Model.Setting;
using CampusAppWP8.Model.Utility;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>
/// Model for the LecturePage

67
CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs
View File

@@ -9,6 +9,7 @@ namespace CampusAppWP8.Model.Setting
{
using System.Xml.Serialization;
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model.Settings;
/// <summary>
/// Model for the profile of an user
@@ -35,72 +36,6 @@ namespace CampusAppWP8.Model.Setting
#endregion
#region Enums
/// <summary>
/// Specifies the degrees.
/// </summary>
public enum DegreeType
{
/// <summary>
/// bachelor degree
/// </summary>
BACHELOR = 82,
/// <summary>
/// master degree
/// </summary>
MASTER = 88,
/// <summary>
/// diploma degree
/// </summary>
DIPLOM = 11
}
/// <summary>
/// Specifies the role of the user.
/// </summary>
public enum RoleType
{
/// <summary>
/// for students (01).
/// </summary>
STUDENT = 1,
/// <summary>
/// for staffs (10).
/// </summary>
STAFF = 2,
}
/// <summary>
/// Specifies the campus of the user.
/// </summary>
public enum Campus
{
/// <summary>
/// Cottbus -> MainCampus
/// </summary>
CB_MAIN = 1,
/// <summary>
/// Cottbus -> NorthCampus
/// </summary>
CB_NORTH = 4,
/// <summary>
/// Cottbus -> SouthCampus
/// </summary>
CB_SOUTH = 2,
/// <summary>
/// Senftenberg -> MainCampus
/// </summary>
SFB_MAIN = 3
}
#endregion
#region Proberties
/// <summary>

9
CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs
View File

@@ -7,6 +7,7 @@
namespace CampusAppWP8.Model.Utility
{
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>
/// This Class creates a list of degrees
@@ -33,10 +34,10 @@ namespace CampusAppWP8.Model.Utility
/// </summary>
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));
this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN).ToString(), AppResources.Campus_CBMain));
this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_NORTH).ToString(), AppResources.Campus_CBNorth));
this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.CB_SOUTH).ToString(), AppResources.Campus_CBSouth));
this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN).ToString(), AppResources.Campus_SFBMain));
}
#endregion

7
CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs
View File

@@ -7,6 +7,7 @@
namespace CampusAppWP8.Model.Utility
{
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>
/// This Class creates a list of degrees
@@ -33,9 +34,9 @@ namespace CampusAppWP8.Model.Utility
/// </summary>
protected override void LoadList()
{
this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.BACHELOR).ToString(), AppResources.Degree_Bachelor));
this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.MASTER).ToString(), AppResources.Degree_Master));
this.AddItem(new ListPickerItemModel(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.DIPLOM).ToString(), AppResources.Degree_Diploma));
this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.BACHELOR).ToString(), AppResources.Degree_Bachelor));
this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.MASTER).ToString(), AppResources.Degree_Master));
this.AddItem(new ListPickerItemModel(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.DIPLOM).ToString(), AppResources.Degree_Diploma));
}
#endregion

5
CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs
View File

@@ -7,6 +7,7 @@
namespace CampusAppWP8.Model.Utility
{
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>
/// Class for the RoleList
@@ -33,8 +34,8 @@ namespace CampusAppWP8.Model.Utility
/// </summary>
protected override void LoadList()
{
this.AddItem(new ListPickerItemModel(CampusAppWP8.Model.Setting.UserProfilModel.RoleType.STUDENT.ToString(), AppResources.Setting_RoleStudent));
this.AddItem(new ListPickerItemModel(CampusAppWP8.Model.Setting.UserProfilModel.RoleType.STAFF.ToString(), AppResources.Setting_RoleStaff));
this.AddItem(new ListPickerItemModel(CampusAppWPortalLib8.Model.Settings.RoleType.STUDENT.ToString(), AppResources.Setting_RoleStudent));
this.AddItem(new ListPickerItemModel(CampusAppWPortalLib8.Model.Settings.RoleType.STAFF.ToString(), AppResources.Setting_RoleStaff));
}
#endregion

14
CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs
View File

@@ -115,17 +115,17 @@ namespace CampusAppWP8.Pages.Exams
private void SetupExamList()
{
var bachelorList = from exam in this.feed.Model.Exams
where exam.DegreeNumber.Equals(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.BACHELOR).ToString())
where exam.DegreeNumber.Equals(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.BACHELOR).ToString())
orderby exam.CourseText, exam.Version
select exam;
var masterList = from exam in this.feed.Model.Exams
where exam.DegreeNumber.Equals(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.MASTER).ToString())
where exam.DegreeNumber.Equals(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.MASTER).ToString())
orderby exam.CourseText, exam.Version
select exam;
var diplomaList = from exam in this.feed.Model.Exams
where exam.DegreeNumber.Equals(((int)CampusAppWP8.Model.Setting.UserProfilModel.DegreeType.DIPLOM).ToString())
where exam.DegreeNumber.Equals(((int)CampusAppWPortalLib8.Model.Settings.DegreeType.DIPLOM).ToString())
orderby exam.CourseText, exam.Version
select exam;
@@ -143,17 +143,17 @@ namespace CampusAppWP8.Pages.Exams
int result = App.LoadFromIsolatedStorage<int>(Constants.ExamPageModelKey);
if (result < 0 || result > 2)
{
Model.Setting.UserProfilModel.DegreeType degree = Settings.UserProfil.Degree;
CampusAppWPortalLib8.Model.Settings.DegreeType degree = Settings.UserProfil.Degree;
switch (degree)
{
case Model.Setting.UserProfilModel.DegreeType.BACHELOR:
case CampusAppWPortalLib8.Model.Settings.DegreeType.BACHELOR:
result = 0;
break;
case Model.Setting.UserProfilModel.DegreeType.MASTER:
case CampusAppWPortalLib8.Model.Settings.DegreeType.MASTER:
result = 1;
break;
case Model.Setting.UserProfilModel.DegreeType.DIPLOM:
case CampusAppWPortalLib8.Model.Settings.DegreeType.DIPLOM:
result = 2;
break;
default:

8
CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
View File

@@ -163,7 +163,7 @@ namespace CampusAppWP8.Pages.Mensa
/// Method initialize the Feed depends of a campus
/// </summary>
/// <param name="campus">campus parameter</param>
private void InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus campus)
private void InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus campus)
{
this.feed = MensaFeed.CreateCampusMensaFeed(campus);
this.feed.OnLoaded += new MensaFeed.OnIO(this.FeedIsReady);
@@ -335,7 +335,7 @@ namespace CampusAppWP8.Pages.Mensa
private void ApplicationBarMenuItem_Click(object sender, EventArgs e)
{
this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
this.InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_MAIN);
this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.CB_MAIN);
}
/// <summary>Event handler. Called by ApplicationBarMenuItem2 for click events.</summary>
@@ -345,7 +345,7 @@ namespace CampusAppWP8.Pages.Mensa
private void ApplicationBarMenuItem2_Click(object sender, EventArgs e)
{
this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
this.InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus.CB_SOUTH);
this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.CB_SOUTH);
}
/// <summary>Event handler. Called by ApplicationBarMenuItem3 for click events.</summary>
@@ -355,7 +355,7 @@ namespace CampusAppWP8.Pages.Mensa
private void ApplicationBarMenuItem3_Click(object sender, EventArgs e)
{
this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
this.InitializeFeed(CampusAppWP8.Model.Setting.UserProfilModel.Campus.SFB_MAIN);
this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN);
}
#endregion

7
CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs
View File

@@ -14,6 +14,7 @@ namespace CampusAppWP8.Pages.Setting
using CampusAppWP8.Model.Utility;
using CampusAppWPortalLib8.Utility;
using Microsoft.Phone.Controls;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>
/// Class for the UserProfilePage
@@ -108,10 +109,10 @@ namespace CampusAppWP8.Pages.Setting
try
{
this.userProfil.Course = int.Parse(((ListPickerItemModel)this.Course.SelectedItem).Value);
this.userProfil.Degree = (CampusAppWP8.Model.Setting.UserProfilModel.DegreeType)Enum.Parse(typeof(CampusAppWP8.Model.Setting.UserProfilModel.DegreeType), ((ListPickerItemModel)this.Degree.SelectedItem).Value);
this.userProfil.Degree = (CampusAppWPortalLib8.Model.Settings.DegreeType)Enum.Parse(typeof(CampusAppWPortalLib8.Model.Settings.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);
this.userProfil.Role = (CampusAppWPortalLib8.Model.Settings.RoleType)Enum.Parse(typeof(CampusAppWPortalLib8.Model.Settings.RoleType), ((ListPickerItemModel)this.Role.SelectedItem).Value);
this.userProfil.DefaultCampus = (CampusAppWPortalLib8.Model.Settings.Campus)Enum.Parse(typeof(CampusAppWPortalLib8.Model.Settings.Campus), ((ListPickerItemModel)this.Campus.SelectedItem).Value);
}
catch (Exception e)
{

34
CampusAppWP8/CampusAppWPortalLib8/Model/Settings/CampusTypes.cs Normal file
View File

@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CampusAppWPortalLib8.Model.Settings
{
/// <summary>
/// Specifies the campus of the user.
/// </summary>
public enum Campus
{
/// <summary>
/// Cottbus -> MainCampus
/// </summary>
CB_MAIN = 1,
/// <summary>
/// Cottbus -> NorthCampus
/// </summary>
CB_NORTH = 4,
/// <summary>
/// Cottbus -> SouthCampus
/// </summary>
CB_SOUTH = 2,
/// <summary>
/// Senftenberg -> MainCampus
/// </summary>
SFB_MAIN = 3
}
}

29
CampusAppWP8/CampusAppWPortalLib8/Model/Settings/DegreeTypes.cs Normal file
View File

@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CampusAppWPortalLib8.Model.Settings
{
/// <summary>
/// Specifies the degrees.
/// </summary>
public enum DegreeType
{
/// <summary>
/// bachelor degree
/// </summary>
BACHELOR = 82,
/// <summary>
/// master degree
/// </summary>
MASTER = 88,
/// <summary>
/// diploma degree
/// </summary>
DIPLOM = 11
}
}

24
CampusAppWP8/CampusAppWPortalLib8/Model/Settings/RolesTypes.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CampusAppWPortalLib8.Model.Settings
{
/// <summary>
/// Specifies the role of the user.
/// </summary>
public enum RoleType
{
/// <summary>
/// for students (01).
/// </summary>
STUDENT = 1,
/// <summary>
/// for staffs (10).
/// </summary>
STAFF = 2,
}
}

2
CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemListModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemListModel.cs
View File

@@ -5,7 +5,7 @@
// <author>stubbfel</author>
// <sience>25.07.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Utility
namespace CampusAppWPortalLib8.Model.Utility
{
using System.Collections.Generic;

2
CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemModel.cs
View File

@@ -5,7 +5,7 @@
// <author>stubbfel</author>
// <sience>13.06.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Utility
namespace CampusAppWPortalLib8.Model.Utility
{
/// <summary>
/// Model for the ListPickerItems

6
CampusAppWP8/CampusAppWP8/Model/Utility/SemesterListPickerItemListModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Utility/SemesterListPickerItemListModel.cs
View File

@@ -4,10 +4,8 @@
// <author>stubbfel</author>
// <sience>25.07.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Utility
namespace CampusAppWPortalLib8.Model.Utility
{
using CampusAppWP8.Resources;
/// <summary>
/// Class for the SemesterList
/// </summary>
@@ -33,9 +31,9 @@ namespace CampusAppWP8.Model.Utility
/// </summary>
protected override void LoadList()
{
this.AddItem(new ListPickerItemModel("20131", "SoSe 13"));
this.AddItem(new ListPickerItemModel("20132", "WiSe 13/14"));
this.AddItem(new ListPickerItemModel("20141", "SoSe 14"));
this.AddItem(new ListPickerItemModel("20142", "WiSe 14/15"));
}
#endregion