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

mv listpickers

Browse Source
This commit is contained in:
stubbfel
2013-10-01 14:53:03 +02:00
parent dc3c527996
commit 7668450d9c
17 changed files with 255 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
View File

@@ -132,9 +132,7 @@
<Compile Include="Model\Person\PersonModel.cs" />
<Compile Include="Model\Setting\AppSettings.cs" />
<Compile Include="Model\Setting\UserProfilModel.cs" />
<Compile Include="Model\Utility\CourseListPickerItemListModel.cs" />
<Compile Include="Model\Utility\DegreeListPickerItemListModel.cs" />
<Compile Include="Model\Utility\CampusListPickerItemListModel.cs" />
<Compile Include="Model\Utility\CourseListPickerItemListWp8Model.cs" />
<Compile Include="Pages\Campusmap\RoomListPage.xaml.cs">
<DependentUpon>RoomListPage.xaml</DependentUpon>
</Compile>
@@ -162,7 +160,6 @@
<Compile Include="Utility\NDEF\NDEFMessage.cs" />
<Compile Include="Utility\NDEF\NDEFRecord.cs" />
<Compile Include="Utility\NDEF\NDEFShortRecord.cs" />
<Compile Include="Model\Utility\RoleListPickerItemListModel.cs" />
<Compile Include="Pages\Dev\NFC.xaml.cs">
<DependentUpon>NFC.xaml</DependentUpon>
</Compile>

2
CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs
View File

@@ -22,7 +22,7 @@ namespace CampusAppWP8.Feed.Mensa
public MensaFeedCBMain()
: base(Constants.FileMensa_Shedule_CBMain, CampusAppWPortalLib8.Resources.Constants.UrlMensa_Week_CBMain)
{
this.Title = AppResources.Campus_CBMain;
this.Title = CampusAppWPortalLib8.Resources.AppResources.Campus_CBMain;
}
#endregion

2
CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs
View File

@@ -22,7 +22,7 @@ namespace CampusAppWP8.Feed.Mensa
public MensaFeedCBNorth()
: base(Constants.FileMensa_Shedule_CBNorth, CampusAppWPortalLib8.Resources.Constants.UrlMensa_Week_CBNorth)
{
this.Title = AppResources.Campus_CBNorth;
this.Title = CampusAppWPortalLib8.Resources.AppResources.Campus_CBNorth;
}
#endregion

2
CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs
View File

@@ -22,7 +22,7 @@ namespace CampusAppWP8.Feed.Mensa
public MensaFeedCBSouth()
: base(Constants.FileMensa_Shedule_CBSouth, CampusAppWPortalLib8.Resources.Constants.UrlMensa_Week_CBSouth)
{
this.Title = AppResources.Campus_CBSouth;
this.Title = CampusAppWPortalLib8.Resources.AppResources.Campus_CBSouth;
}
#endregion

2
CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs
View File

@@ -22,7 +22,7 @@ namespace CampusAppWP8.Feed.Mensa
public MensaFeedSBFMain()
: base(Constants.FileMensa_Shedule_SBFMain, CampusAppWPortalLib8.Resources.Constants.UrlMensa_Week_SBFMain)
{
this.Title = AppResources.Campus_SFBMain;
this.Title = CampusAppWPortalLib8.Resources.AppResources.Campus_SFBMain;
}
#endregion

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

@@ -56,7 +56,7 @@ namespace CampusAppWP8.Model.Lecture
/// <remarks>
/// need to be extend to full list
/// </remarks>
private CourseListPickerItemListModel courseList;
private CourseListPickerItemListWp8Model courseList;
/// <summary>
/// List of the degrees
@@ -266,8 +266,8 @@ namespace CampusAppWP8.Model.Lecture
/// </summary>
public void LoadLists()
{
this.courseList = new CourseListPickerItemListModel();
this.courseList.OnLoaded += new CourseListPickerItemListModel.OnIO(this.CourseListIsReady);
this.courseList = new CourseListPickerItemListWp8Model();
this.courseList.OnLoaded += new CourseListPickerItemListWp8Model.OnIO(this.CourseListIsReady);
this.courseList.LoadCourseList();
}

123
CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListWp8Model.cs Normal file
View File

@@ -0,0 +1,123 @@
// <copyright file="CourseListPickerItemListWp8Model.cs" company="BTU/IIT">
// Company copyright tag.List
// </copyright>
// <author>stubbfel</author>
// <sience>25.07.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Utility
{
using System.Collections.Generic;
using System.Linq;
using CampusAppWP8.Feed.Utility;
using CampusAppWP8.Utility;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>
/// This is a class for the courseList
/// </summary>
public class CourseListPickerItemListWp8Model : CampusAppWPortalLib8.Model.Utility.CourseListPickerItemListModel
{
#region Member
/// <summary>List of courses.</summary>
private CourseFeed courseList;
#endregion
#region Constructor
/// <summary>
/// Initializes a new instance of the <see cref="CourseListPickerItemListWp8Model" /> class.
/// </summary>
public CourseListPickerItemListWp8Model()
{
}
#endregion
#region Events
/// <summary>
/// Delegate of the OnIO callback function.
/// </summary>
public delegate void OnIO();
/// <summary>
/// Callback pointer, called after loading.
/// </summary>
public event OnIO OnLoaded = null;
#endregion
#region Method
#region public
/// <summary>
/// Overrides the LoadList-Method <see cref="ListPickerItemListModel"/>
/// </summary>
public void LoadCourseList()
{
if (this.courseList == null || this.courseList.Model == null)
{
this.courseList = new CourseFeed();
this.courseList.OnLoaded += new CourseFeed.OnIO(this.FeedIsReady);
this.courseList.OnFailedWeb += new CourseFeed.OnFailed(this.FeedIsFail);
this.courseList.OnFailedFile += new CourseFeed.OnFailed(this.FeedIsFail);
this.courseList.LoadData();
}
else
{
this.CallOnLoaded();
}
}
#endregion
#region private
/// <summary>Feed is fail.</summary>
/// <remarks>Stubbfel, 10.09.2013.</remarks>
private void FeedIsFail()
{
this.FallBackList();
this.CallOnLoaded();
}
/// <summary>Feed is ready.</summary>
/// <remarks>Stubbfel, 10.09.2013.</remarks>
private void FeedIsReady()
{
this.ConvertToListPickerItemModel(this.courseList.Model.CreateCourseList());
this.CallOnLoaded();
}
/// <summary>Converts a courseList to a list picker item model.</summary>
/// <remarks>Stubbfel, 10.09.2013.</remarks>
/// <param name="courseList">List of courses.</param>
private void ConvertToListPickerItemModel(List<CourseModel> courseList)
{
foreach (CourseModel course in courseList)
{
this.AddItem(new ListPickerItemModel(course.CourseNumber, Wp8StringManager.StripAndDecodeHTML(course.CourseText)));
}
this.List = this.List.OrderBy(o => o.Text).ToList();
this.courseList.SaveData();
}
/// <summary>Call on loaded.</summary>
/// <remarks>Stubbfel, 10.09.2013.</remarks>
private void CallOnLoaded()
{
if (this.OnLoaded != null)
{
this.OnLoaded();
}
}
#endregion
#endregion
}
}

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

@@ -73,17 +73,17 @@ namespace CampusAppWP8.Pages.Mensa
if (menuItem1 != null)
{
menuItem1.Text = AppResources.Campus_CBMain;
menuItem1.Text = CampusAppWPortalLib8.Resources.AppResources.Campus_CBMain;
}
if (menuItem2 != null)
{
menuItem2.Text = AppResources.Campus_CBSouth;
menuItem2.Text = CampusAppWPortalLib8.Resources.AppResources.Campus_CBSouth;
}
if (menuItem3 != null)
{
menuItem3.Text = AppResources.Campus_SFBMain;
menuItem3.Text = CampusAppWPortalLib8.Resources.AppResources.Campus_SFBMain;
}
}

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

@@ -29,7 +29,7 @@ namespace CampusAppWP8.Pages.Setting
private UserProfilModel userProfil;
/// <summary>List of courses.</summary>
private CourseListPickerItemListModel courseList;
private CourseListPickerItemListWp8Model courseList;
#endregion
@@ -72,8 +72,8 @@ namespace CampusAppWP8.Pages.Setting
private void LoadListPicker()
{
this.ProgressBar.Visibility = Visibility.Visible;
this.courseList = new CourseListPickerItemListModel();
this.courseList.OnLoaded += new CourseListPickerItemListModel.OnIO(this.SetupListPickers);
this.courseList = new CourseListPickerItemListWp8Model();
this.courseList.OnLoaded += new CourseListPickerItemListWp8Model.OnIO(this.SetupListPickers);
this.courseList.LoadCourseList();
}

81
CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs generated
View File

@@ -105,42 +105,6 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Cottbus Hauptcampus ähnelt.
/// </summary>
public static string Campus_CBMain {
get {
return ResourceManager.GetString("Campus_CBMain", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Cottbus Nordcampus ähnelt.
/// </summary>
public static string Campus_CBNorth {
get {
return ResourceManager.GetString("Campus_CBNorth", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Cottbus Südcampus ähnelt.
/// </summary>
public static string Campus_CBSouth {
get {
return ResourceManager.GetString("Campus_CBSouth", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Senftenberg Hauptcampus ähnelt.
/// </summary>
public static string Campus_SFBMain {
get {
return ResourceManager.GetString("Campus_SFBMain", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Gebäudeinfos ausblenden ähnelt.
/// </summary>
@@ -195,33 +159,6 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Bachelor ähnelt.
/// </summary>
public static string Degree_Bachelor {
get {
return ResourceManager.GetString("Degree_Bachelor", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Diplom ähnelt.
/// </summary>
public static string Degree_Diploma {
get {
return ResourceManager.GetString("Degree_Diploma", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Master ähnelt.
/// </summary>
public static string Degree_Master {
get {
return ResourceManager.GetString("Degree_Master", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Löschen ähnelt.
/// </summary>
@@ -915,24 +852,6 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Mitarbeiter ähnelt.
/// </summary>
public static string Setting_RoleStaff {
get {
return ResourceManager.GetString("Setting_RoleStaff", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Student ähnelt.
/// </summary>
public static string Setting_RoleStudent {
get {
return ResourceManager.GetString("Setting_RoleStudent", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Profileinstellungen ähnelt.
/// </summary>

27
CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
View File

@@ -236,15 +236,6 @@
<data name="NewsLinkBtn" xml:space="preserve">
<value>Link</value>
</data>
<data name="Degree_Bachelor" xml:space="preserve">
<value>Bachelor</value>
</data>
<data name="Degree_Diploma" xml:space="preserve">
<value>Diplom</value>
</data>
<data name="Degree_Master" xml:space="preserve">
<value>Master</value>
</data>
<data name="Building" xml:space="preserve">
<value>Gebäude</value>
</data>
@@ -311,12 +302,6 @@
<data name="Setting_UserSemester" xml:space="preserve">
<value>Semester</value>
</data>
<data name="Setting_RoleStaff" xml:space="preserve">
<value>Mitarbeiter</value>
</data>
<data name="Setting_RoleStudent" xml:space="preserve">
<value>Student</value>
</data>
<data name="ListPickerHeaderCourse" xml:space="preserve">
<value>Studiengangsauswahl</value>
</data>
@@ -335,18 +320,6 @@
<data name="MsgBox_GeoWatchOptInText" xml:space="preserve">
<value>Dürfen Positionsdaten enhoben und verwendet werden?</value>
</data>
<data name="Campus_CBMain" xml:space="preserve">
<value>Cottbus Hauptcampus</value>
</data>
<data name="Campus_CBNorth" xml:space="preserve">
<value>Cottbus Nordcampus</value>
</data>
<data name="Campus_CBSouth" xml:space="preserve">
<value>Cottbus Südcampus</value>
</data>
<data name="Campus_SFBMain" xml:space="preserve">
<value>Senftenberg Hauptcampus</value>
</data>
<data name="ListPickerHeaderCampus" xml:space="preserve">
<value>Campusauswahl</value>
</data>

4
CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs
View File

@@ -4,9 +4,9 @@
// <author>stubbfel</author>
// <sience>08.08.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Utility
namespace CampusAppWPortalLib8.Model.Utility
{
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Resources;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>

111
CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseListPickerItemListModel.cs
View File

@@ -4,81 +4,20 @@
// <author>stubbfel</author>
// <sience>25.07.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Utility
namespace CampusAppWPortalLib8.Model.Utility
{
using System.Collections.Generic;
using System.Linq;
using CampusAppWP8.Feed.Utility;
using CampusAppWP8.Utility;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>
/// This is a class for the courseList
/// </summary>
public class CourseListPickerItemListModel : ListPickerItemListModel
public abstract class CourseListPickerItemListModel : ListPickerItemListModel
{
#region Member
/// <summary>List of courses.</summary>
private CourseFeed courseList;
#endregion
#region Constructor
/// <summary>
/// Initializes a new instance of the <see cref="CourseListPickerItemListModel" /> class.
/// </summary>
public CourseListPickerItemListModel()
{
}
#endregion
#region Events
/// <summary>
/// Delegate of the OnIO callback function.
/// </summary>
public delegate void OnIO();
/// <summary>
/// Callback pointer, called after loading.
/// </summary>
public event OnIO OnLoaded = null;
#endregion
#region Method
#region public
/// <summary>
/// Overrides the LoadList-Method <see cref="ListPickerItemListModel"/>
/// </summary>
public void LoadCourseList()
{
if (this.courseList == null || this.courseList.Model == null)
{
this.courseList = new CourseFeed();
this.courseList.OnLoaded += new CourseFeed.OnIO(this.FeedIsReady);
this.courseList.OnFailedWeb += new CourseFeed.OnFailed(this.FeedIsFail);
this.courseList.OnFailedFile += new CourseFeed.OnFailed(this.FeedIsFail);
this.courseList.LoadData();
}
else
{
this.CallOnLoaded();
}
}
#endregion
#region private
#region Method
/// <summary>Fall back list.</summary>
/// <remarks>Stubbfel, 10.09.2013.</remarks>
private void FallBackList()
protected void FallBackList()
{
this.AddItem(new ListPickerItemModel("017", "Bauingenieurwesen"));
this.AddItem(new ListPickerItemModel("021", "Betriebswirtschaftslehre"));
@@ -124,48 +63,6 @@ namespace CampusAppWP8.Model.Utility
this.List = this.List.OrderBy(o => o.Text).ToList();
}
/// <summary>Feed is fail.</summary>
/// <remarks>Stubbfel, 10.09.2013.</remarks>
private void FeedIsFail()
{
this.FallBackList();
this.CallOnLoaded();
}
/// <summary>Feed is ready.</summary>
/// <remarks>Stubbfel, 10.09.2013.</remarks>
private void FeedIsReady()
{
this.ConvertToListPickerItemModel(this.courseList.Model.CreateCourseList());
this.CallOnLoaded();
}
/// <summary>Converts a courseList to a list picker item model.</summary>
/// <remarks>Stubbfel, 10.09.2013.</remarks>
/// <param name="courseList">List of courses.</param>
private void ConvertToListPickerItemModel(List<CourseModel> courseList)
{
foreach (CourseModel course in courseList)
{
this.AddItem(new ListPickerItemModel(course.CourseNumber, Wp8StringManager.StripAndDecodeHTML(course.CourseText)));
}
this.List = this.List.OrderBy(o => o.Text).ToList();
this.courseList.SaveData();
}
/// <summary>Call on loaded.</summary>
/// <remarks>Stubbfel, 10.09.2013.</remarks>
private void CallOnLoaded()
{
if (this.OnLoaded != null)
{
this.OnLoaded();
}
}
#endregion
#endregion
}
}

4
CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Utility/DegreeListPickerItemListModel.cs
View File

@@ -4,9 +4,9 @@
// <author>stubbfel</author>
// <sience>25.07.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Utility
namespace CampusAppWPortalLib8.Model.Utility
{
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Resources;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>

4
CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs → CampusAppWP8/CampusAppWPortalLib8/Model/Utility/RoleListPickerItemListModel.cs
View File

@@ -4,9 +4,9 @@
// <author>stubbfel</author>
// <sience>25.07.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Utility
namespace CampusAppWPortalLib8.Model.Utility
{
using CampusAppWP8.Resources;
using CampusAppWPortalLib8.Resources;
using CampusAppWPortalLib8.Model.Utility;
/// <summary>

81
CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs generated
View File

@@ -61,6 +61,69 @@ namespace CampusAppWPortalLib8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Cottbus Hauptcampus ähnelt.
/// </summary>
public static string Campus_CBMain {
get {
return ResourceManager.GetString("Campus_CBMain", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Cottbus Nordcampus ähnelt.
/// </summary>
public static string Campus_CBNorth {
get {
return ResourceManager.GetString("Campus_CBNorth", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Cottbus Südcampus ähnelt.
/// </summary>
public static string Campus_CBSouth {
get {
return ResourceManager.GetString("Campus_CBSouth", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Senftenberg Hauptcampus ähnelt.
/// </summary>
public static string Campus_SFBMain {
get {
return ResourceManager.GetString("Campus_SFBMain", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Bachelor ähnelt.
/// </summary>
public static string Degree_Bachelor {
get {
return ResourceManager.GetString("Degree_Bachelor", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Diplom ähnelt.
/// </summary>
public static string Degree_Diploma {
get {
return ResourceManager.GetString("Degree_Diploma", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Master ähnelt.
/// </summary>
public static string Degree_Master {
get {
return ResourceManager.GetString("Degree_Master", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Fakultät ähnelt.
/// </summary>
@@ -141,5 +204,23 @@ namespace CampusAppWPortalLib8.Resources {
return ResourceManager.GetString("MensaApp_Soup", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Mitarbeiter ähnelt.
/// </summary>
public static string Setting_RoleStaff {
get {
return ResourceManager.GetString("Setting_RoleStaff", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Student ähnelt.
/// </summary>
public static string Setting_RoleStudent {
get {
return ResourceManager.GetString("Setting_RoleStudent", resourceCulture);
}
}
}
}

27
CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
View File

@@ -117,6 +117,27 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Campus_CBMain" xml:space="preserve">
<value>Cottbus Hauptcampus</value>
</data>
<data name="Campus_CBNorth" xml:space="preserve">
<value>Cottbus Nordcampus</value>
</data>
<data name="Campus_CBSouth" xml:space="preserve">
<value>Cottbus Südcampus</value>
</data>
<data name="Campus_SFBMain" xml:space="preserve">
<value>Senftenberg Hauptcampus</value>
</data>
<data name="Degree_Bachelor" xml:space="preserve">
<value>Bachelor</value>
</data>
<data name="Degree_Diploma" xml:space="preserve">
<value>Diplom</value>
</data>
<data name="Degree_Master" xml:space="preserve">
<value>Master</value>
</data>
<data name="Faculty" xml:space="preserve">
<value>Fakultät</value>
</data>
@@ -144,4 +165,10 @@
<data name="MensaApp_Soup" xml:space="preserve">
<value>Suppe</value>
</data>
<data name="Setting_RoleStaff" xml:space="preserve">
<value>Mitarbeiter</value>
</data>
<data name="Setting_RoleStudent" xml:space="preserve">
<value>Student</value>
</data>
</root>