From ca3bd2381f75a8369c5312b7987ca2122d8f32f2 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Wed, 2 Oct 2013 12:48:35 +0200 Subject: [PATCH] mv lecture --- .../CampusAppWP8/Api/Lecture/LectureApi.cs | 2 +- CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj | 10 +-- .../Pages/Lecture/LecturePage.xaml.cs | 8 +- .../Pages/Lecture/ModulWebPage.xaml.cs | 2 +- .../Pages/Lecture/ResultDetailPage.xaml.cs | 5 +- .../Pages/Lecture/ResultPage.xaml.cs | 2 +- .../CampusAppWP8/Resources/Constants.resx | 3 - .../Resources/Constants1.Designer.cs | 9 --- .../CampusAppWPortalLib8.csproj | 6 ++ .../Model/Lecture/LectureActivity.cs | 76 ++++--------------- .../Model/Lecture/LectureCourse.cs | 2 +- .../Model/Lecture/LectureDate.cs | 2 +- .../Model/Lecture/LectureLecturer.cs | 2 +- .../Model/Lecture/LectureList.cs | 19 ++--- .../Model/Lecture/LectureModule.cs | 4 +- .../Resources/Constants.resx | 3 + .../Resources/Constants1.Designer.cs | 9 +++ 17 files changed, 58 insertions(+), 106 deletions(-) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureActivity.cs (71%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureCourse.cs (94%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureDate.cs (97%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureLecturer.cs (98%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureList.cs (75%) rename CampusAppWP8/{CampusAppWP8 => CampusAppWPortalLib8}/Model/Lecture/LectureModule.cs (96%) diff --git a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs index 3a13bb3d..6ad81728 100644 --- a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs @@ -18,7 +18,7 @@ namespace CampusAppWP8.Api.Lecture /// /// need the XmlAPI /// - public class LectureApi : XmlModel + public class LectureApi : XmlModel { #region Constructor diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 636dcfc6..79c3aa26 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -97,6 +97,7 @@ + App.xaml @@ -183,12 +184,8 @@ - - - - - - + + @@ -197,7 +194,6 @@ CampusMapPage.xaml - DepartmentFavoritePage.xaml diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs index 37f79f70..76fa444d 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs @@ -13,11 +13,11 @@ namespace CampusAppWP8.Pages.Lecture using System.Windows.Navigation; using CampusAppWP8.Api.Lecture; using CampusAppWP8.Model.Lecture; - using CampusAppWP8.Model.Utility; using CampusAppWP8.Resources; using CampusAppWP8.Utility.Lui.MessageBoxes; - using Microsoft.Phone.Controls; using CampusAppWPortalLib8.Model.Utility; + using Microsoft.Phone.Controls; + /// /// Class for the LecturePage @@ -73,7 +73,7 @@ namespace CampusAppWP8.Pages.Lecture { // delete all models App.SaveToIsolatedStorage(Constants.IsolatedStorage_LecturePageModel, null); - App.SaveToIsolatedStorage(Constants.IsolatedStorage_LectureModel, null); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_LectureModel, null); } else { @@ -207,7 +207,7 @@ namespace CampusAppWP8.Pages.Lecture this.api.Model.FilterByCourseTitle(query); } - App.SaveToIsolatedStorage(Constants.IsolatedStorage_LectureModel, this.api.Model); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_LectureModel, this.api.Model); this.ProgressBar.Visibility = System.Windows.Visibility.Collapsed; Uri url = new Uri(Constants.PathLecture_ResultPage, UriKind.Relative); NavigationService.Navigate(url); diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs index 95e3e8d0..b7a08572 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ModulWebPage.xaml.cs @@ -40,7 +40,7 @@ namespace CampusAppWP8.Pages.Lecture if (NavigationContext.QueryString.ContainsKey(Constants.ParamModelLecture_ModulNumber)) { string number = NavigationContext.QueryString[Constants.ParamModelLecture_ModulNumber]; - this.WebmailBrowser.Navigate(new Uri(Constants.UrlLecture_ModulBaseAddr + number, UriKind.Absolute)); + this.WebmailBrowser.Navigate(new Uri(CampusAppWPortalLib8.Resources.Constants.UrlLecture_ModulBaseAddr + number, UriKind.Absolute)); } base.OnNavigatedTo(e); diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml.cs index 87a5c88e..30de8370 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml.cs @@ -57,10 +57,10 @@ namespace CampusAppWP8.Pages.Lecture /// id of the activity private void LoadActivity(int activityId) { - LectureList list = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_LectureModel); + LectureWp8List list = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_LectureModel); if (list != null) { - LectureActivity activity = list.GetActivity(activityId); + LectureWp8Activity activity = list.GetActivity(activityId); activity.CreateLectureString(); activity.CreateCourseString(); this.ContentPanel.DataContext = activity; @@ -70,6 +70,5 @@ namespace CampusAppWP8.Pages.Lecture #endregion #endregion - } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs index aefe127f..296593b0 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultPage.xaml.cs @@ -42,7 +42,7 @@ namespace CampusAppWP8.Pages.Lecture protected override void OnNavigatedTo(NavigationEventArgs e) { base.OnNavigatedTo(e); - LectureList list = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_LectureModel); + LectureWp8List list = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_LectureModel); if (list == null) { Uri url = new Uri(Constants.PathLecture_LecturePage, UriKind.Relative); diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index bf923fb5..241f3e53 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -135,9 +135,6 @@ /Pages/Lecture/ResultDetailPage.xaml - - https://www.tu-cottbus.de/modul/ - https://webmail.tu-cottbus.de diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index 8c29d5cb..e07539c5 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -1221,15 +1221,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die https://www.tu-cottbus.de/modul/ ähnelt. - /// - public static string UrlLecture_ModulBaseAddr { - get { - return ResourceManager.GetString("UrlLecture_ModulBaseAddr", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/getdata.php?db=clubs&app=2&appversion=1 ähnelt. /// diff --git a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj index 22081c6b..f7e93044 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj +++ b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj @@ -39,6 +39,12 @@ + + + + + + diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureActivity.cs similarity index 71% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureActivity.cs index 8e8d84ae..8f1a478e 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureActivity.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureActivity.cs @@ -5,12 +5,12 @@ // stubbfel // 13.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System.Collections.ObjectModel; using System.Xml.Serialization; - using CampusAppWP8.Resources; - using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Resources; + using CampusAppWPortalLib8.Utility; /// /// Model for a Activity @@ -20,19 +20,19 @@ namespace CampusAppWP8.Model.Lecture #region Members /// The activity icon name lecture. - private const string ActivityIconNameLecture = "Vorlesung"; + public const string ActivityTypeLecture = "Vorlesung"; /// The activity icon name seminar. - private const string ActivityIconNameSeminar = "Seminar"; + public const string ActivityTypeSeminar = "Seminar"; /// The activity icon name practice. - private const string ActivityIconNamePract = "Übung"; + public const string ActivityTypePract = "Übung"; /// The activity icon name lab. - private const string ActivityIconNameLab = "Labor"; + public const string ActivityTypeLab = "Labor"; /// The activity icon name exam. - private const string ActivityIconNameExam = "Prüfung"; + public const string ActivityTypeExam = "Prüfung"; /// /// List of lecturer @@ -54,9 +54,6 @@ namespace CampusAppWP8.Model.Lecture /// private string topic; - /// URL of the icon. - private string iconUrl; - #endregion #region Constructor @@ -199,21 +196,10 @@ namespace CampusAppWP8.Model.Lecture { if (value != this.topic) { - this.topic = Wp8StringManager.StripAndDecodeHTML(value); + this.topic = value; } } } - - /// Gets URL of the icon. - /// The icon URL. - public string IconUrl - { - get - { - this.CreateIconUrl(); - return this.iconUrl; - } - } #endregion #region Methods @@ -228,10 +214,10 @@ namespace CampusAppWP8.Model.Lecture string result = string.Empty; foreach (LectureLecturer tmpLecturer in this.Lecturer) { - result += Wp8StringManager.AddNewLine(tmpLecturer.ToString()); + result += DefaultStringManager.AddNewLine(tmpLecturer.ToString()); } - this.LecturerString = Wp8StringManager.RemoveNewLine(result); + this.LecturerString = DefaultStringManager.RemoveNewLine(result); } /// @@ -242,46 +228,10 @@ namespace CampusAppWP8.Model.Lecture string result = string.Empty; foreach (LectureCourse course in this.Course) { - result += Wp8StringManager.AddNewLine(course.Title); + result += DefaultStringManager.AddNewLine(course.Title); } - this.CourseString = Wp8StringManager.RemoveNewLine(result); - } - - #endregion - - #region private - - /// 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.Seminar; - } - else if (typeStr.Contains(LectureActivity.ActivityIconNameLab)) - { - this.iconUrl = Icons.Lab; - } - else - { - this.iconUrl = Icons.Info; - } + this.CourseString = DefaultStringManager.RemoveNewLine(result); } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureCourse.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureCourse.cs similarity index 94% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureCourse.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureCourse.cs index b418f12e..1faedc53 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureCourse.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureCourse.cs @@ -4,7 +4,7 @@ // stubbfel // 10.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System.Xml.Serialization; diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureDate.cs similarity index 97% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureDate.cs index a6fab88a..e14aac6f 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureDate.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureDate.cs @@ -5,7 +5,7 @@ // stubbfel // 10.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System.Xml.Serialization; diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureLecturer.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureLecturer.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureLecturer.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureLecturer.cs index 7d9102b2..2c69ab67 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureLecturer.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureLecturer.cs @@ -5,7 +5,7 @@ // stubbfel // 10.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System.Xml.Serialization; diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureList.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureList.cs similarity index 75% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureList.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureList.cs index 3229b8d0..5891f1e8 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureList.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureList.cs @@ -5,7 +5,7 @@ // stubbfel // 10.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System.Collections.ObjectModel; using System.Linq; @@ -14,13 +14,14 @@ namespace CampusAppWP8.Model.Lecture /// /// Model for a List of LectureActivity /// + /// T : LectureActivity [XmlRoot("lsf_auszug")] - public class LectureList + public class LectureList where T : LectureActivity { #region Constructor /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// public LectureList() { @@ -35,7 +36,7 @@ namespace CampusAppWP8.Model.Lecture /// [XmlArray("veranstaltungsliste")] [XmlArrayItem("veranstaltung")] - public ObservableCollection Activities { get; set; } + public ObservableCollection Activities { get; set; } #endregion @@ -46,9 +47,9 @@ namespace CampusAppWP8.Model.Lecture /// /// id of the activity /// the activity (FirstOrDefault) - public LectureActivity GetActivity(int id) + public T GetActivity(int id) { - LectureActivity activity = this.Activities.Where(p => p.Id == id).FirstOrDefault(); + T activity = this.Activities.Where(p => p.Id == id).FirstOrDefault(); return activity; } @@ -57,12 +58,12 @@ namespace CampusAppWP8.Model.Lecture /// Specifies the filter. public void FilterByCourseTitle(string filter) { - ObservableCollection filteredCollection = new ObservableCollection(); + ObservableCollection filteredCollection = new ObservableCollection(); filter = filter.Trim().ToLower(); - foreach (LectureActivity activity in this.Activities) + foreach (T activity in this.Activities) { activity.CreateCourseString(); - if (activity.Title.ToLower().Contains(filter)) + if (activity.Title.ToLower().Contains(filter)) { filteredCollection.Add(activity); } diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureModule.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureModule.cs similarity index 96% rename from CampusAppWP8/CampusAppWP8/Model/Lecture/LectureModule.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureModule.cs index 1a190438..0b20bf00 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureModule.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Lecture/LectureModule.cs @@ -5,11 +5,11 @@ // stubbfel // 10.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Lecture +namespace CampusAppWPortalLib8.Model.Lecture { using System; using System.Xml.Serialization; - using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Resources; /// /// Model for the module of an lecture diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants.resx b/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants.resx index 5680b6f2..80453741 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants.resx @@ -135,6 +135,9 @@ http://www.tu-cottbus.de/oracle-gateway/php/rss2feed_veranstaltungen.php + + https://www.tu-cottbus.de/modul/ + http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=CottbusBTU&v=1 diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants1.Designer.cs index 5420fda2..f9f35440 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/Constants1.Designer.cs @@ -115,6 +115,15 @@ namespace CampusAppWPortalLib8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die https://www.tu-cottbus.de/modul/ ähnelt. + /// + public static string UrlLecture_ModulBaseAddr { + get { + return ResourceManager.GetString("UrlLecture_ModulBaseAddr", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/index.php?mensa=CottbusBTU&v=1 ähnelt. ///