diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index f142f19f..fdf8ab7b 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -198,8 +198,6 @@ - - CampusMapPage.xaml diff --git a/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs index abd7d900..26c1e860 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs @@ -10,7 +10,7 @@ namespace CampusAppWP8.Feed.StudentCouncil using System; using System.IO; using CampusAppWP8.Model; - using CampusAppWP8.Model.StudentCouncil; + using CampusAppWPortalLib8.Model.StudentCouncil; using CampusAppWP8.Resources; using CampusAppWP8.Utility; using CampusAppWPortalLib8.Model; diff --git a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilListModel.cs b/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilListModel.cs deleted file mode 100644 index 914798d1..00000000 --- a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilListModel.cs +++ /dev/null @@ -1,81 +0,0 @@ -//----------------------------------------------------------------------- -// -// Company copyright tag. -// -// stubbfel -// 02.07.2013 -//---------------------------------------------------------------------- -namespace CampusAppWP8.Model.StudentCouncil -{ - using System; - using System.Collections.Generic; - using System.Collections.ObjectModel; - using System.Linq; - using System.Xml.Serialization; - - /// - /// Model for menus in one week - /// - [XmlRoot("root")] - public class StudentCouncilListModel - { - #region Members - /// - /// Time when the model was created - /// - private readonly DateTime createTime; - - #endregion - - #region Constructor - /// - /// Initializes a new instance of the class. - /// - public StudentCouncilListModel() - { - this.createTime = DateTime.Now; - } - - #endregion - - #region Proberty - /// - /// Gets or sets the StudentCouncils - /// - [XmlArray("data")] - [XmlArrayItem("studentcouncil")] - public ObservableCollection StudentCouncils { get; set; } - - /// - /// Gets the creation time of the model - /// - public DateTime CreateTime - { - get - { - return this.createTime; - } - } - - #endregion - - #region Method - /// - /// Method group the StudentCouncilList by Faculty - /// - /// a Dictionary, where the Key is name of the Faculty und the value is a List of StudentCouncil - public Dictionary> GetStudentCouncilsGroupByFaculty() - { - List> tmpList = this.StudentCouncils.GroupBy(p => p.Faculty).ToList(); - Dictionary> itemMap = new Dictionary>(); - foreach (IGrouping group in tmpList) - { - Dictionary> tempDic = new Dictionary>(); - itemMap.Add(group.Key, group.ToList()); - } - - return itemMap; - } - #endregion - } -} diff --git a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs b/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs deleted file mode 100644 index abe773c8..00000000 --- a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs +++ /dev/null @@ -1,86 +0,0 @@ -//----------------------------------------------------------------------------- -// -// Company copyright tag. -// -// stubbfel -// 02.07.2013 -//----------------------------------------------------------------------------- - -namespace CampusAppWP8.Model.StudentCouncil -{ - using System.Xml.Serialization; - using CampusAppWP8.Resources; - - /// - /// Model for menu - /// - public class StudentCouncilModel - { - #region Member - - /// - /// name of the faculty. - /// - private string faculty; - - #endregion - - #region Constructor - - /// - /// Initializes a new instance of the class. - /// - public StudentCouncilModel() - { - } - - #endregion - - #region Property - - /// - /// Gets or sets the faculty of the StudentCouncil. - /// - [XmlAttribute("faculty")] - public string Faculty - { - get - { - return this.faculty; - } - - set - { - if (value != this.faculty) - { - this.faculty = value; - int num; - if (int.TryParse(this.faculty, out num)) - { - this.faculty = CampusAppWPortalLib8.Resources.AppResources.Faculty + " " + num; - } - } - } - } - - /// - /// Gets or sets the name of the StudentCouncil. - /// - [XmlAttribute("name")] - public string Name { get; set; } - - /// - /// Gets or sets the webpage-url of the StudentCouncil. - /// - [XmlAttribute("url")] - public string Url { get; set; } - - /// - /// Gets or sets the email-address of the StudentCouncil. - /// - [XmlAttribute("email")] - public string Email { get; set; } - - #endregion - } -} diff --git a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs index 06ab89bd..d57a1ffe 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StudentCouncil/StudentCouncilPage.xaml.cs @@ -60,7 +60,7 @@ namespace CampusAppWP8.Pages.StudentCouncil } this.ProgressBar.Visibility = System.Windows.Visibility.Visible; - this.feed.LoadData(Utilities.GetLoadModus()); + this.feed.LoadData(Utilities.GetLoadModus()); } ///