diff --git a/CampusAppWP8/CampusAppDLL/Model/Campusmap/MapModel.cs b/CampusAppWP8/CampusAppDLL/Model/Campusmap/MapModel.cs index 50edaf3c..c540c414 100644 --- a/CampusAppWP8/CampusAppDLL/Model/Campusmap/MapModel.cs +++ b/CampusAppWP8/CampusAppDLL/Model/Campusmap/MapModel.cs @@ -8,6 +8,7 @@ namespace CampusAppDLL.Model.Campusmap { using CampusAppDLL.Model.GeoDb; + using CampusAppDLL.Utility; using System; /// @@ -41,6 +42,8 @@ namespace CampusAppDLL.Model.Campusmap /// Stubbfel, 19.08.2013. protected virtual void LoadSpatials(string xmlFilePath) { + SpsModel model = XmlManager.DeserializationFileToModel(xmlFilePath); + this.Spatial = model; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs index e6b79166..8809c8a2 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs @@ -56,14 +56,14 @@ namespace CampusAppWP8.Api.GeoApi /// Method return the campus of the placeList /// /// actual campus - 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)) diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs index 958ea718..a35d987b 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PisApi.cs @@ -11,9 +11,9 @@ namespace CampusAppWP8.Api.GeoApi using System.Collections.Generic; using CampusAppWP8.Model; using CampusAppWP8.Model.GeoDb; - using CampusAppWP8.Model.Utility; using CampusAppWP8.Resources; - using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Model; + using CampusAppWPortalLib8.Model.Utility; /// Pis api. /// Stubbfel, 09.09.2013. diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs index 7ff2444c..77e91e24 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/PssApi.cs @@ -11,8 +11,8 @@ namespace CampusAppWP8.Api.GeoApi using System.Collections.Generic; using CampusAppWP8.Model; using CampusAppWP8.Model.GeoDb; - using CampusAppWP8.Model.Utility; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model; using CampusAppWPortalLib8.Model.Utility; /// Pss api. diff --git a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs index 2a0988ef..6c00b9ee 100644 --- a/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/GeoApi/SpsApi.cs @@ -7,13 +7,13 @@ //---------------------------------------------------------------------- namespace CampusAppWP8.Api.GeoApi { - using System.Collections.Generic; + using System.Collections.Generic; using CampusAppWP8.Model; using CampusAppWP8.Model.GeoDb; - using CampusAppWP8.Model.Utility; using CampusAppWP8.Resources; using CampusAppWP8.Utility; - using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Model; + using CampusAppWPortalLib8.Model.Utility; /// /// Class for SPSAPI diff --git a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs index bf49bb08..6ad81728 100644 --- a/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/Lecture/LectureApi.cs @@ -10,6 +10,7 @@ namespace CampusAppWP8.Api.Lecture using CampusAppWP8.Model; using CampusAppWP8.Model.Lecture; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model; /// /// Class for the feed of the Lecture @@ -17,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/Api/Person/PersonSearchApi.cs b/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs index 50ab4ef2..e44e2dbd 100644 --- a/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs +++ b/CampusAppWP8/CampusAppWP8/Api/Person/PersonSearchApi.cs @@ -11,10 +11,11 @@ namespace CampusAppWP8.Api.Person using CampusAppWP8.Model; using CampusAppWP8.Model.Person; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model; /// Person search api. /// Stubbfel, 05.09.2013. - public class PersonSearchApi : XmlModel + public class PersonSearchApi : XmlModel { #region Constructor diff --git a/CampusAppWP8/CampusAppWP8/App.xaml.cs b/CampusAppWP8/CampusAppWP8/App.xaml.cs index 23949af1..81f3a560 100644 --- a/CampusAppWP8/CampusAppWP8/App.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/App.xaml.cs @@ -147,7 +147,14 @@ namespace CampusAppWP8 } else { - Settings.AppSetting.DevMode = true; + Settings.AppSetting.DevMode = false; + } + + int appDeploy; + bool parseResult = int.TryParse(Constants.DeploymentNumber, out appDeploy); + if (!parseResult || Settings.AppSetting.DeploymentNumber != appDeploy) + { + Settings.AppSetting.InitApp = false; } this.UserSettingsLoaded(); diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/add_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/add_159.png index 056c5667..cbe25009 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/add_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/add_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/campus_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/campus_159.png index 08bd5f68..c951b0d4 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/campus_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/campus_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/carotte_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/carotte_159.png new file mode 100644 index 00000000..f0627ae4 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/carotte_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/chicken_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/chicken_159.png new file mode 100644 index 00000000..99648eb0 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/chicken_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/delete_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/delete_159.png index bbcb20e5..7cd2c9fb 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/delete_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/delete_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/edit.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/edit_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/edit.png rename to CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/edit_159.png diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/fish_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/fish_159.png new file mode 100644 index 00000000..f024b538 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/fish_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/frei_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/frei_159.png new file mode 100644 index 00000000..a91223bc Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/frei_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/homework_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/homework_159.png index 313bb5da..2e12c169 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/homework_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/homework_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/info_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/info_159.png index 94231862..c132ee8b 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/info_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/info_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lamb_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lamb_159.png new file mode 100644 index 00000000..1aa58f4d Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lamb_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lectures_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lectures_159.png index 8a68bdb3..8eedc657 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lectures_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lectures_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/link_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/link_159.png index cbb96cc9..272cb1e0 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/link_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/link_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/news_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/news_159.png index 1d68bde3..2d11f51b 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/news_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/news_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/openhours_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/openhours_159.png index 09933ea1..53847c45 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/openhours_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/openhours_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/phone_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/phone_159.png index f469f816..3f337cfc 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/phone_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/phone_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pork_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pork_159.png new file mode 100644 index 00000000..fa8e0dc3 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pork_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/schedule_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/schedule_159.png index 17fa2a85..79c4c08c 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/schedule_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/schedule_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/search_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/search_159.png index 3b859d6d..189d1de2 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/search_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/search_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/steak_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/steak_159.png new file mode 100644 index 00000000..d5a0b3b3 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/steak_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle.png rename to CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/student_council_159.png.png diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/webmail_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/webmail_159.png index 77f3af27..f7f0d37b 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/webmail_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/webmail_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/wild dish_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/wild dish_159.png new file mode 100644 index 00000000..db496c28 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/wild dish_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/add_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/add_159.png index 0fb90eb3..f1d27556 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/add_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/add_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/campus_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/campus_159.png index e7fa38b8..1d08c9a6 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/campus_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/campus_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/carotte_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/carotte_159.png new file mode 100644 index 00000000..65e38e19 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/carotte_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/chicken_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/chicken_159.png new file mode 100644 index 00000000..a55fb55f Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/chicken_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/delete_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/delete_159.png index dbd61253..786581b0 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/delete_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/delete_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/departments_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/departments_159.png index 61c8ad78..b2d3b3ca 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/departments_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/departments_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/fish_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/fish_159.png new file mode 100644 index 00000000..43efdae6 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/fish_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/frei_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/frei_159.png new file mode 100644 index 00000000..958246cf Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/frei_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/homework_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/homework_159.png index 708f6cba..471ec1ff 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/homework_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/homework_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png index f95a93ca..eb67e90f 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lamb_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lamb_159.png new file mode 100644 index 00000000..74098f3d Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lamb_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lectures_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lectures_159.png index 997dc2e1..6ac72ebd 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lectures_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lectures_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/link_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/link_159.png index c61292b9..fe7fa20e 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/link_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/link_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/news_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/news_159.png index ea0f843a..9d7650bd 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/news_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/news_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/openhours_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/openhours_159.png index caddfb56..afa467af 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/openhours_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/openhours_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/phone_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/phone_159.png index 731f36f8..48301ab8 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/phone_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/phone_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pork_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pork_159.png new file mode 100644 index 00000000..1eb5c3cd Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pork_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_159.png index 2b8797ca..10b07a49 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/search_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/steak_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/steak_159.png new file mode 100644 index 00000000..134e5c77 Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/steak_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/webmail_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/webmail_159.png index e7404836..6bda291e 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/webmail_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/webmail_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/wild dish_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/wild dish_159.png new file mode 100644 index 00000000..eaaea78b Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/wild dish_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/DarkTheme/update_159.png b/CampusAppWP8/CampusAppWP8/Assets/icons/DarkTheme/update_159.png index 03ca56a6..43acef1a 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/DarkTheme/update_159.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/DarkTheme/update_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/LightTheme/update_159.png b/CampusAppWP8/CampusAppWP8/Assets/icons/LightTheme/update_159.png index 24875146..dcd9a800 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/LightTheme/update_159.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/LightTheme/update_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj index 635ca627..79c3aa26 100644 --- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj +++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj @@ -97,6 +97,7 @@ + App.xaml @@ -119,23 +120,20 @@ - - + + - - - + + + - - - - + RoomListPage.xaml @@ -163,9 +161,6 @@ - - - NFC.xaml @@ -189,28 +184,16 @@ - - - - - - - - - + + - - - - - - + + CampusMapPage.xaml - DepartmentFavoritePage.xaml @@ -238,7 +221,6 @@ ModulWebPage.xaml - ResultDetailPage.xaml @@ -443,35 +425,48 @@ + + + + + + + + + + + + + @@ -486,6 +481,7 @@ + @@ -493,10 +489,12 @@ + + diff --git a/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs index 40733f3a..e3c749f7 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Departments/DepartmentFeed.cs @@ -10,9 +10,10 @@ namespace CampusAppWP8.Feed.Departments using System; using System.IO; using CampusAppWP8.Model; - using CampusAppWP8.Model.Departments; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; + using CampusAppWPortalLib8.Model.Departments; /// /// Feed class for the department information. diff --git a/CampusAppWP8/CampusAppWP8/Feed/Events/EventFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Events/EventFeed.cs index f132c4f2..4e98bba6 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Events/EventFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Events/EventFeed.cs @@ -13,6 +13,7 @@ namespace CampusAppWP8.Feed.Events using CampusAppWP8.Resources; using CampusAppWP8.Utility; using CampusAppWPortalLib8.Model.RSS; + using CampusAppWPortalLib8.Model; /// /// Event Feed. diff --git a/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs index 474b74f2..107d0804 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Exams/ExamFeed.cs @@ -12,10 +12,11 @@ namespace CampusAppWP8.Feed.Exams using CampusAppWP8.Model.Exams; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; /// Exam feed. /// Stubbfel, 02.09.2013. - public class ExamFeed : XmlModel + public class ExamFeed : XmlModel { #region Constructor @@ -38,7 +39,7 @@ namespace CampusAppWP8.Feed.Exams /// Stubbfel, 02.09.2013. /// The model. /// true if it succeeds, false if it fails. - private bool CheckIsModelUpToDate(ExamListModel model) + private bool CheckIsModelUpToDate(ExamListWp8Model model) { if (model == null) { @@ -53,7 +54,7 @@ namespace CampusAppWP8.Feed.Exams /// The model. /// Information describing the file. /// true if it succeeds, false if it fails. - private bool CheckIsFileUpToDate(ExamListModel model, FileInfo fileInfo) + private bool CheckIsFileUpToDate(ExamListWp8Model model, FileInfo fileInfo) { if (fileInfo == null || !fileInfo.Exists || fileInfo.Length < 1) { diff --git a/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs index 98d1c57c..5e8237e7 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Link/ClubLinkFeed.cs @@ -10,9 +10,10 @@ namespace CampusAppWP8.Feed.Link using System; using System.IO; using CampusAppWP8.Model; - using CampusAppWP8.Model.Link; + using CampusAppWPortalLib8.Model.Link; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; /// /// This Class is for ClubLinkFeeds diff --git a/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs index dbdc8e3d..4be0b0d5 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Link/CommonLinkFeed.cs @@ -10,9 +10,10 @@ namespace CampusAppWP8.Feed.Link using System; using System.IO; using CampusAppWP8.Model; - using CampusAppWP8.Model.Link; + using CampusAppWPortalLib8.Model.Link; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; /// /// This Class is for CommonLinkFeeds diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs index ff79851f..39755ba2 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs @@ -11,6 +11,7 @@ namespace CampusAppWP8.Feed.Mensa using System.IO; using CampusAppWP8.Model; using CampusAppWPortalLib8.Model.Mensa; + using CampusAppWPortalLib8.Model; /// /// This Class is for MensaFeeds @@ -51,17 +52,17 @@ namespace CampusAppWP8.Feed.Mensa /// /// camus parameter /// the correct mensaFeed - 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(); diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs index 98aeca33..e07ffd42 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBMain.cs @@ -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 diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs index 6334e3be..4c9d8d5b 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBNorth.cs @@ -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 diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs index ab2f80d3..941e5cb4 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedCBSouth.cs @@ -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 diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs index 39e34a80..3d562a3c 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeedSBFMain.cs @@ -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 diff --git a/CampusAppWP8/CampusAppWP8/Feed/News/NewsFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/News/NewsFeed.cs index 89a5ae4a..2c1edf66 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/News/NewsFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/News/NewsFeed.cs @@ -13,6 +13,7 @@ namespace CampusAppWP8.Feed.News using CampusAppWP8.Resources; using CampusAppWP8.Utility; using CampusAppWPortalLib8.Model.RSS; + using CampusAppWPortalLib8.Model; /// /// News Feed. diff --git a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs index b84ebc33..d77a8369 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/Openinghours/OpeninghoursFeed.cs @@ -13,11 +13,12 @@ namespace CampusAppWP8.Feed.Openinghours using CampusAppWP8.Model.Openinghours; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; /// /// This Class is for MesaFeeds /// - public class OpeninghoursFeed : XmlModel + public class OpeninghoursFeed : XmlModel { #region Constructor @@ -41,7 +42,7 @@ namespace CampusAppWP8.Feed.Openinghours /// /// reference of the FeedModel /// true, if model is up-to-date, otherwise false - private bool CheckIsModelUpToDate(OpeninghoursModel model) + private bool CheckIsModelUpToDate(OpeninghoursWp8Model model) { bool retValue = true; @@ -63,7 +64,7 @@ namespace CampusAppWP8.Feed.Openinghours /// reference of the FeedModel /// info about the file /// true, if file is up-to-date, otherwise false - private bool CheckIsFileUpToDateOnLoad(OpeninghoursModel model, FileInfo info) + private bool CheckIsFileUpToDateOnLoad(OpeninghoursWp8Model model, FileInfo info) { bool retValue = true; @@ -84,7 +85,7 @@ namespace CampusAppWP8.Feed.Openinghours /// reference of the FeedModel /// info about the file /// true, if file is up-to-date, otherwise false - private bool CheckIsFileUpToDateOnSave(OpeninghoursModel model, FileInfo info) + private bool CheckIsFileUpToDateOnSave(OpeninghoursWp8Model model, FileInfo info) { bool retValue = true; diff --git a/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs index 91d3fe4c..26c1e860 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/StudentCouncil/StudentCouncilFeed.cs @@ -10,9 +10,10 @@ 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; /// /// This Class is for StudentCouncilFeed diff --git a/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml b/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml index 54f09f09..9fdfdded 100644 --- a/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml +++ b/CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml @@ -506,50 +506,50 @@ Limitierter Zugang Erdgeschoss - MZG Eingang - Haupteingang + Haupteingang + MZG Eingang Zugangsbereich Kein Zugang Erdgeschoss - MZG Eingang - Nebeneingang + Nebeneingang + MZG Eingang Zugangsbereich Kein Zugang Erdgeschoss - MZG Eingang - Nebeneingang + Nebeneingang + MZG Eingang Zugangsbereich Kein Zugang Erdgeschoss - MZG Eingang - Nebeneingang + Nebeneingang + MZG Eingang Zugangsbereich Voller Zugang Erdgeschoss - MZG Aufzug - Aufzug + Aufzug + MZG Aufzug Zugangsbereich Kein Zugang Erdgeschoss - MZG Treppe - Treppe + Treppe + MZG Treppe Zugangsbereich Kein Zugang Erdgeschoss - MZG Treppe - Treppe + Treppe + MZG Treppe Zugangsbereich @@ -583,8 +583,8 @@ Voller Zugang Erdgeschoss - MZG R.105 - Sekretariat + Sekretariat + MZG R.105 Büro @@ -597,43 +597,43 @@ Voller Zugang Erdgeschoss - MZG R.107 - Labor SDB + Labor SDB + MZG R.107 Labor Voller Zugang Erdgeschoss - MZG R.108 - Labor SDB + Labor SDB + MZG R.108 Labor Voller Zugang Erdgeschoss - MZG R.109 - Labor SDB + Labor SDB + MZG R.109 Labor Voller Zugang Erdgeschoss - MZG R.110 - Labor SDB + Labor SDB + MZG R.110 Labor Voller Zugang Erdgeschoss - MZG R.111 - Labor SDB + Labor SDB + MZG R.111 Labor Voller Zugang Erdgeschoss - MZG R.112 - Labor SDB + Labor SDB + MZG R.112 Labor @@ -709,78 +709,78 @@ Voller Zugang Erdgeschoss - MZG R.125 - PC - Labor + PC - Labor + MZG R.125 Labor Voller Zugang Erdgeschoss - MZG R.126 - PC - Labor + PC - Labor + MZG R.126 Labor Voller Zugang Erdgeschoss - MZG R.128 - PC - Labor + PC - Labor + MZG R.128 Labor Voller Zugang Erdgeschoss - MZG R.130 - PC - Labor + PC - Labor + MZG R.130 Labor Voller Zugang Erdgeschoss - MZG R.133 - Herrentoilette + Herrentoilette + MZG R.133 WC Voller Zugang Erdgeschoss - MZG R.134 - CO2 - Labor + CO2 - Labor + MZG R.134 Labor Voller Zugang Erdgeschoss - MZG R.135 - Schulungsraum + Schulungsraum + MZG R.135 Büro Limitierter Zugang Erdgeschoss - MZG R.137 - Herrentoilette + Herrentoilette + MZG R.137 WC Voller Zugang Erdgeschoss - MZG R.138 - Aufenthaltsraum + Aufenthaltsraum + MZG R.138 Mehrzweck Limitierter Zugang Erdgeschoss - MZG R.139 - Damentoilette + Damentoilette + MZG R.139 WC Voller Zugang Erdgeschoss - MZG R.140 - PC - Labor + PC - Labor + MZG R.140 Labor @@ -793,22 +793,22 @@ Voller Zugang Obergeschoss - MZG Aufzug - Aufzug + Aufzug + MZG Aufzug Zugangsbereich Kein Zugang Obergeschoss - MZG Treppe - Treppe + Treppe + MZG Treppe Zugangsbereich Kein Zugang Obergeschoss - MZG Treppe - Treppe + Treppe + MZG Treppe Zugangsbereich @@ -947,8 +947,8 @@ Voller Zugang Obergeschoss - MZG R.222 - Seminarraum + Seminarraum + MZG R.222 Büro @@ -961,8 +961,8 @@ Voller Zugang Obergeschoss - MZG R.224 - Sekretariat + Sekretariat + MZG R.224 Büro @@ -982,82 +982,82 @@ Voller Zugang Obergeschoss - MZG R.227 - PC - Labor + PC - Labor + MZG R.227 Labor Voller Zugang Obergeschoss - MZG R.228 - PC - Labor + PC - Labor + MZG R.228 Labor Voller Zugang Obergeschoss - MZG R.231 - Archiv + Archiv + MZG R.231 Mehrzweck Voller Zugang Obergeschoss - MZG R.233 - Drohnenlabor + Drohnenlabor + MZG R.233 Labor Limitierter Zugang Obergeschoss - MZG R.235 - Herrentoilette + Herrentoilette + MZG R.235 WC Voller Zugang Obergeschoss - MZG R.236 - Aufenthaltsraum + Aufenthaltsraum + MZG R.236 Mehrzweck Voller Zugang Obergeschoss - MZG R.237 - Aufenthaltsraum + Aufenthaltsraum + MZG R.237 Mehrzweck Voller Zugang Obergeschoss - MZG R.238 + MZG R.238 Mehrzweck Voller Zugang Obergeschoss - MZG R.239 + MZG R.239 Mehrzweck Voller Zugang Obergeschoss - MZG R.240 + MZG R.240 Mehrzweck Limitierter Zugang Obergeschoss - MZG R.241 - Herrentoilette + Herrentoilette + MZG R.241 WC Limitierter Zugang Obergeschoss - MZG R.243 - Damentoilette + Damentoilette + MZG R.243 WC @@ -1631,97 +1631,6 @@ Treppe Treppe - - Voller Zugang - 6. Obergeschoss - Carrels - Carrels - Arbeitsplatz - - - Limitierter Zugang - 6. Obergeschoss - Mediathek - Mediathek - Regal - - - Limitierter Zugang - 6. Obergeschoss - Lehrbuchsammlung - Lehrbuchsammlung - Regal - - - Voller Zugang - 6. Obergeschoss - Medienarbeitsplatz, PC Fernsehaufzeichnungen - Medienarbeitsplatz, PC Fernsehaufzeichnungen - Arbeitsplatz - - - Voller Zugang - 6. Obergeschoss - Publikationsarbeitsplatz, sehbehindertengerechter Arbeitsplatz - Publikationsarbeitsplatz, sehbehindertengerechter Arbeitsplatz - Arbeitsplatz - - - Voller Zugang - 6. Obergeschoss - Carrels - Carrels - Arbeitsplatz - - - Limitierter Zugang - 6. Obergeschoss - Bücherregal - Informatik und Kybernetik - Regal - - - Limitierter Zugang - 6. Obergeschoss - Helpdesk - Helpdesk - Information - - - Limitierter Zugang - 6. Obergeschoss - Bücherregal - Optimierung und Stochastik - Regal - - - Limitierter Zugang - 6. Obergeschoss - Zeitschriftenregal - Zeitschriften - Regal - - - Voller Zugang - 6. Obergeschoss - Lesesaal - Lesesaal - Arbeitsplatz - - - Limitierter Zugang - 6. Obergeschoss - Bücherregal - Mathematik - Regal - - - Voller Zugang - 6. Obergeschoss - Fachreferenten - Fachreferenten - Arbeitsplatz - Voller Zugang Erdgeschoss @@ -1739,29 +1648,29 @@ Voller Zugang Erdgeschoss - MZG R.108a - Labor SDB + Labor SDB + MZG R.108a Labor Voller Zugang Erdgeschoss - MZG R.125a - PC - Labor + PC - Labor + MZG R.125a Labor Voller Zugang Erdgeschoss - MZG R.134a - CO2 - Labor + CO2 - Labor + MZG R.134a Labor Voller Zugang Erdgeschoss - MZG R.135a - Technik/ Lager + Technik/ Lager + MZG R.135a Mehrzweck @@ -1774,8 +1683,8 @@ Voller Zugang Obergeschoss - MZG R.242e - Aufenthaltsraum + Aufenthaltsraum + MZG R.242e Mehrzweck diff --git a/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs b/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs index 7d7e3861..fd5f4248 100644 --- a/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs +++ b/CampusAppWP8/CampusAppWP8/File/Departments/DepartmentFavoriteFile.cs @@ -9,8 +9,9 @@ namespace CampusAppWP8.File.Departments { using System.IO; using CampusAppWP8.Model; - using CampusAppWP8.Model.Departments; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model; + using CampusAppWPortalLib8.Model.Departments; /// /// Feed object to handle favorite department feeds. diff --git a/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs b/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs index a247b587..e4f71f58 100644 --- a/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs +++ b/CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs @@ -30,7 +30,7 @@ namespace CampusAppWP8.File.Exams /// Filename of the file. /// URL of the document. public ExamFile(string fileName, string url) - : base(ModelType.FileAndFeed, fileName, url) + : base(CampusAppWPortalLib8.Model.ModelType.FileAndFeed, fileName, url) { this.IsFileUpToDateOnLoad += new IsFileUpToDate(this.CheckIsFileUpToDate); this.IsModelUpToDateOnLoad += new IsModelUpToDate(this.CheckIsModelUpToDate); @@ -50,7 +50,7 @@ namespace CampusAppWP8.File.Exams { if (this.storageFile == null) { - this.storageFile = await this.file.AsStorageFile(); + this.storageFile = await this.File.AsStorageFile(); } if (this.storageFile != null) @@ -66,7 +66,7 @@ namespace CampusAppWP8.File.Exams /// Stubbfel, 03.09.2013. public void SaveAndLaunchFile() { - if (this.file.Exist()) + if (this.File.Exist()) { this.LaunchFile(); } diff --git a/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs b/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs index 58991d42..e6d2945a 100644 --- a/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs +++ b/CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs @@ -22,7 +22,7 @@ namespace CampusAppWP8.File.Places /// Initializes a new instance of the PlacesFile class. /// Stubbfel, 09.09.2013. public PlacesFile() - : base(ModelType.File, Constants.FilePlace_AllPlaces) + : base(CampusAppWPortalLib8.Model.ModelType.File, Constants.FilePlace_AllPlaces) { this.OnFailedFile += new OnFailed(this.FallBackLoad); this.IsFileUpToDateOnLoad += new IsFileUpToDate(this.CheckIsFileUpToDate); diff --git a/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs b/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs index a372e9d9..bcb8b39b 100644 --- a/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs @@ -8,6 +8,8 @@ namespace CampusAppWP8.Model { + using CampusAppWPortalLib8.Model; + /// Binary model. /// Stubbfel, 03.09.2013. public abstract class BinaryModel : MainModel diff --git a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs index ebb66894..9f3c79b5 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs @@ -21,7 +21,7 @@ namespace CampusAppWP8.Model.Campusmap #region Member /// Variable for the identify of the campus. - 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 diff --git a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListWp8Model.cs new file mode 100644 index 00000000..0e112c99 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListWp8Model.cs @@ -0,0 +1,18 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 02.09.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Exams +{ + using System.Xml.Serialization; + + /// Exam list model. + /// Stubbfel, 02.09.2013. + [XmlRoot("links")] + public class ExamListWp8Model : CampusAppWPortalLib8.Model.Exams.ExamListModel + { + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Exams/ExamWp8Model.cs new file mode 100644 index 00000000..f0d89d4e --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Exams/ExamWp8Model.cs @@ -0,0 +1,30 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 02.09.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Exams +{ + using CampusAppWP8.Utility; + + /// Exam model. + /// Stubbfel, 02.09.2013. + public class ExamWp8Model : CampusAppWPortalLib8.Model.Exams.ExamModel + { + #region Property + + /// Gets the caption. + /// The caption. + public string Caption + { + get + { + return Wp8StringManager.StripAndDecodeHTML(this.CourseText + " (" + this.Type + "/" + this.Version + ")"); + } + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs index a525053f..6afc7a82 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LecturePageModel.cs @@ -10,6 +10,7 @@ namespace CampusAppWP8.Model.Lecture using System.Runtime.Serialization; using CampusAppWP8.Model.Setting; using CampusAppWP8.Model.Utility; + using CampusAppWPortalLib8.Model.Utility; /// /// Model for the LecturePage @@ -55,7 +56,7 @@ namespace CampusAppWP8.Model.Lecture /// /// need to be extend to full list /// - private CourseListPickerItemListModel courseList; + private CourseListPickerItemListWp8Model courseList; /// /// List of the degrees @@ -265,8 +266,8 @@ namespace CampusAppWP8.Model.Lecture /// 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(); } diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs new file mode 100644 index 00000000..d68c2c0e --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs @@ -0,0 +1,79 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 13.06.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Lecture +{ + using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Lecture; + + /// + /// Model for a Activity + /// + public class LectureWp8Activity : LectureActivity + { + #region Members + + /// URL of the icon. + private string iconUrl; + + #endregion + + #region Proberty + + /// Gets URL of the icon. + /// The icon URL. + public string IconUrl + { + get + { + this.CreateIconUrl(); + return this.iconUrl; + } + } + #endregion + + #region Methods + + #region private + + /// Creates icon URL. + /// Stubbfel, 12.09.2013. + private void CreateIconUrl() + { + string typeStr = this.Type; + + if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeLecture)) + { + this.iconUrl = Icons.Lecture; + } + else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeExam)) + { + this.iconUrl = Icons.Exams; + } + else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypePract)) + { + this.iconUrl = Icons.Practise; + } + else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeSeminar)) + { + this.iconUrl = Icons.Seminar; + } + else if (typeStr.Contains(CampusAppWPortalLib8.Model.Lecture.LectureActivity.ActivityTypeLab)) + { + this.iconUrl = Icons.Lab; + } + else + { + this.iconUrl = Icons.Info; + } + } + + #endregion + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs new file mode 100644 index 00000000..a2ca637d --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs @@ -0,0 +1,34 @@ +//----------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 10.06.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Lecture +{ + using System.Linq; + using System.Xml.Serialization; + + /// + /// Model for a List of LectureActivity + /// + [XmlRoot("lsf_auszug")] + public class LectureWp8List : CampusAppWPortalLib8.Model.Lecture.LectureList + { + #region Methods + + /// + /// Method return a certain activity + /// + /// id of the activity + /// the activity (FirstOrDefault) + public new LectureWp8Activity GetActivity(int id) + { + LectureWp8Activity activity = this.Activities.Where(p => p.Id == id).FirstOrDefault(); + return base.GetActivity(id) as LectureWp8Activity; + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/MainModel.cs b/CampusAppWP8/CampusAppWP8/Model/MainModel.cs index fb55ccf4..74abbcac 100644 --- a/CampusAppWP8/CampusAppWP8/Model/MainModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/MainModel.cs @@ -5,60 +5,20 @@ // fiedlchr // 05.07.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8 +namespace CampusAppWP8.Model { - using CampusAppWP8.Utility; - using CampusAppWPortalLib8.Model.Utility; using System; - using System.Collections.Generic; using System.IO; using System.Net; - + using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model; + /// /// Base model io handling class. /// /// model type - public abstract class MainModel + public abstract class MainModel : AbstractMainModel { - #region Member - - /// - /// File object. - /// - protected CampusAppWP8.Utility.File file = null; - - /// - /// Model io type. - /// - private ModelType modelType; - - /// - /// Model object. - /// - private T model = default(T); - - /// - /// Web object. - /// - private HttpRequest api = null; - - /// - /// Filename of saved data. - /// - private string fileName = string.Empty; - - /// - /// Url of the feed data. - /// - private Uri httpApiUri = null; - - /// - /// Parameterized uri of the feed. - /// - private Uri paramizedUri = null; - - #endregion - #region Constructor /// @@ -68,8 +28,8 @@ namespace CampusAppWP8 /// name of the file /// url of the feed public MainModel(ModelType modelType, string fileName, string url) + : base(modelType, fileName, url) { - this.Init(modelType, fileName, url); } /// @@ -78,42 +38,14 @@ namespace CampusAppWP8 /// Model IO type /// name of the file or the url of the feed public MainModel(ModelType modelType, string sourceName) + : base(modelType, sourceName) { - if (modelType == ModelType.File) - { - this.Init(modelType, sourceName, string.Empty); - } - else if (modelType == ModelType.Feed) - { - this.Init(modelType, string.Empty, sourceName); - } - else - { - throw new NotSupportedException("Wrong constructor was called for Feed and File support."); - } } #endregion #region Events - /// - /// Delegate of the OnIO callback function. - /// - public delegate void OnIO(); - - /// - /// Delegate of the OnFailed(File/Web) callback function. - /// - public delegate void OnFailed(); - - /// - /// Delegate of the IsModelUpToDate callback function. - /// - /// data model - /// true, model is up to date - public delegate bool IsModelUpToDate(T model); - /// /// Delegate of the IsFileUpToDate callback function. /// @@ -122,47 +54,6 @@ namespace CampusAppWP8 /// true, is file is up to date public delegate bool IsFileUpToDate(T model, FileInfo fileInfo); - /// - /// Callback pointer, called before loading. - /// - public event OnIO OnLoading = null; - - /// - /// Callback pointer, called after loading. - /// - public event OnIO OnLoaded = null; - - /// - /// Callback pointer, called before saving. - /// - public event OnIO OnSaving = null; - - /// - /// Callback pointer, called after saving. - /// - public event OnIO OnSaved = null; - - /// - /// Callback pointer, called after failed file loading. - /// - public event OnFailed OnFailedFile = null; - - /// - /// Callback pointer, called after failed web loading. - /// - public event OnFailed OnFailedWeb = null; - - /// - /// Callback pointer, called after failed file or web loading, if there - /// is no specialized onFailed callback set. - /// - public event OnFailed OnFailedLoad = null; - - /// - /// Callback pointer, called after failed saving data to file. - /// - public event OnFailed OnFailedSave = null; - /// /// Callback pointer, for checking if file is up to date at loading. /// @@ -173,314 +64,123 @@ namespace CampusAppWP8 /// public event IsFileUpToDate IsFileUpToDateOnSave = null; - /// - /// Callback pointer, for checking if model is up to date at loading. - /// - public event IsModelUpToDate IsModelUpToDateOnLoad = null; - - /// - /// Callback pointer, for checking if model is up to date at saving. - /// (currently unused) - /// - public event IsModelUpToDate IsModelUpToDateOnSave = null; - #endregion - #region Enum + #region property /// - /// Specifies the I/O type of the model. + /// Gets or sets the file /// - public enum ModelType - { - /// - /// Invalid/unset state. - /// - INVALID = 0, - - /// - /// File only (01). - /// - File = 1, - - /// - /// Feed only (10). - /// - Feed = 2, - - /// - /// File and feed (11). - /// - FileAndFeed = 3 - } - - /// Values that represent ForceType for load function. - public enum ForceType - { - /// An enumeration constant representing the invalid/default/unset option. - INVALID = 0, - - /// An enumeration constant representing the force file option. - FORCE_FILE = 1, - - /// An enumeration constant representing the force web option. - FORCE_WEB = 2 - } - - #endregion - - #region Property - - /// - /// Gets or sets the Model. - /// - public T Model + public new CampusAppWP8.Utility.File File { get { - return this.model; + return (CampusAppWP8.Utility.File)base.File; } - set + protected set { - this.model = value; + base.File = value; } } + /// + /// Gets or sets the api + /// + public new HttpRequest Api + { + get + { + return (HttpRequest)base.Api; + } + + protected set + { + base.Api = value; + } + } #endregion #region Method - #region public - - /// - /// Forces a update from web. - /// - public void ForceWebUpdate() - { - this.LoadData(ForceType.FORCE_WEB); - } - - /// - /// Forces a update from file. - /// - public void ForceReadFile() - { - this.LoadData(ForceType.FORCE_FILE); - } - - /// - /// Load the data if necessary, from web or from file, regarding if - /// the file data is up to date. - /// - /// if set/not invalid/not default, force to load from web or file - public void LoadData(ForceType force = ForceType.INVALID) - { - this.RunOnIOCallback(this.OnLoading); - - // check which source is used for loading the data - if (force == ForceType.INVALID) - { - // if the model is not up to date - if (this.CheckIsNotUpToDate(this.IsModelUpToDateOnLoad) == true) - { - force = ForceType.FORCE_FILE; - - if (this.file != null) - { - // if the file does not exist or is size of 0 or is not - // up to date, then load from web - if ((this.file.Exist() == false) - || (this.file.GetFileInfo().Length == 0) - || (this.CheckIsNotUpToDate(this.IsFileUpToDateOnLoad) == true)) - { - force = ForceType.FORCE_WEB; - } - } - else - { - // if the file object does not exist, load from web - force = ForceType.FORCE_WEB; - } - - // if the web object does not exist, load from file - if (this.api == null) - { - force = ForceType.FORCE_FILE; - } - } - else - { - // if it is up to date, nothing has to be loaded - this.RunOnIOCallback(this.OnLoaded); - } - } - - // load from web - if (force == ForceType.FORCE_WEB) - { - if (this.api != null) - { - if (this.paramizedUri != null) - { - this.api.HttpGet(this.paramizedUri, this.OnLoadDataComplete); - } - else - { - this.api.HttpGet(this.httpApiUri, this.OnLoadDataComplete); - } - } - else - { - // if web object does not exist, call OnFailed callbacks - this.RunOnFailedCallback(this.OnFailedWeb, this.OnFailedLoad); - } - } - - // load from file - if (force == ForceType.FORCE_FILE) - { - if (this.file != null) - { - byte[] data = this.file.ReadFile(); - - if (data == null) - { - this.RunOnFailedCallback(this.OnFailedFile, this.OnFailedLoad); - } - else - { - if (data.Length > 0) - { - this.DeserializeModel(data); - } - - this.RunOnIOCallback(this.OnLoaded); - } - } - else - { - // if file object does not exist, call OnFailed callbacks - this.RunOnFailedCallback(this.OnFailedFile, this.OnFailedLoad); - } - } - } - - /// - /// Save the model data if necessary. - /// - /// force saving. DEFAULT: false - public void SaveData(bool force = false) - { - if ((this.file != null) - && ((this.CheckIsNotUpToDate(this.IsFileUpToDateOnSave) == true) || (force == true))) - { - this.RunOnIOCallback(this.OnSaving); - - byte[] data = this.SerializeModel(); - - if ((this.OnSaved != null) && (this.OnFailedSave != null)) - { - this.file.WriteFile(data, delegate { this.OnSaved(); }, delegate { this.OnFailedSave(); }); - } - else if (this.OnSaved != null) - { - this.file.WriteFile(data, delegate { this.OnSaved(); }, null); - } - else if (this.OnFailedSave != null) - { - this.file.WriteFile(data, null, delegate { this.OnFailedSave(); }); - } - else - { - this.file.WriteFile(data, null, null); - } - } - } - - /// - /// Return the model io type. - /// - /// model io type - public ModelType GetModelType() - { - return this.modelType; - } - - /// - /// Return the model. - /// - /// model object - public T GetModel() - { - return this.model; - } - - /// - /// Create the parameterized uri. - /// - /// uri parameter list - public void SetUriParams(List parameters) - { - if (this.api != null) - { - this.paramizedUri = this.api.CreateGetUrl(parameters); - } - } - - /// - /// Clear the parameterized uri. - /// - public void ClearUriParams() - { - this.paramizedUri = null; - } - - #endregion - #region protected /// - /// Abstract declaration of the model deserialize function. + /// Method overrides the base CheckLoadFileIsNotUpToDate Method /// - /// model data as byte array - /// true, is succeeded - protected abstract bool DeserializeModel(byte[] modelData); - - /// - /// Abstract declaration of the model serialize function. - /// - /// model data as byte array - protected abstract byte[] SerializeModel(); - - /// - /// Check if the model io type is file. - /// - /// true, if the model io type has file. - protected bool IsFile() + /// true if it is not up-to-date, otherwise false + protected override bool CheckLoadFileIsNotUpToDate() { - bool retValue = false; - - if ((this.modelType & ModelType.File) != 0) - { - retValue = true; - } - - return retValue; + return this.CheckIsNotUpToDate(this.IsFileUpToDateOnLoad); } /// - /// Check if the model io type is feed. + /// Method overrides the base CheckSaveFileIsNotUpToDate Method /// - /// true if the model io type has feed. - protected bool IsHttpApi() + /// true if it is not up-to-date, otherwise false + protected override bool CheckSaveFileIsNotUpToDate() + { + return this.CheckIsNotUpToDate(this.IsFileUpToDateOnSave); + } + + /// + /// Method overrides the base SendHttpGet Method + /// + /// the url + protected override void SendHttpGet(Uri url) + { + ((HttpRequest)this.Api).HttpGet(url, this.OnLoadDataComplete); + } + + /// + /// Initializes the file object. + /// + protected override void InitFile() + { + if ((this.IsFile() == true) + && (this.File == null)) + { + this.File = new CampusAppWP8.Utility.File(this.FileName); + } + } + + /// + /// Initializes the web object. + /// + protected override void InitHttpApi() + { + if ((this.IsHttpApi() == true) + && (this.Api == null)) + { + this.Api = new HttpRequest(this.HttpApiUri); + } + } + + /// Check if model or file is not up to date. + /// The check function. + /// true if model or file is not up to date, false if it is. + protected override bool CheckIsNotUpToDate(object checkFunc) { bool retValue = false; - if ((this.modelType & ModelType.Feed) != 0) + // if there is no check function, the model or file is not up to date + if (checkFunc == null) { retValue = true; } + else + { + Type funcType = checkFunc.GetType(); + + if (funcType.Equals(typeof(IsFileUpToDate))) + { + retValue = !(checkFunc as IsFileUpToDate)(this.Model, this.File.GetFileInfo()); + } + else if (funcType.Equals(typeof(IsModelUpToDate))) + { + retValue = !(checkFunc as IsModelUpToDate)(this.Model); + } + } return retValue; } @@ -489,60 +189,6 @@ namespace CampusAppWP8 #region private - /// - /// Initialize the class. Is called by the constructors. - /// - /// model IO type - /// name of the data file - /// url of the feed data - private void Init(ModelType modelType, string fileName, string url) - { - this.modelType = modelType; - - if ((url != null) && (url.Equals(string.Empty) == false)) - { - this.httpApiUri = new Uri(url, UriKind.Absolute); - } - - this.fileName = fileName; - - if ((this.IsFile() == true) - && (fileName.Equals(string.Empty) == false)) - { - this.InitFile(); - } - - if ((this.IsHttpApi() == true) - && (url.Equals(string.Empty) == false)) - { - this.InitHttpApi(); - } - } - - /// - /// Initializes the file object. - /// - private void InitFile() - { - if ((this.IsFile() == true) - && (this.file == null)) - { - this.file = new CampusAppWP8.Utility.File(this.fileName); - } - } - - /// - /// Initializes the web object. - /// - private void InitHttpApi() - { - if ((this.IsHttpApi() == true) - && (this.api == null)) - { - this.api = new HttpRequest(this.httpApiUri); - } - } - /// /// Is called after the loading from web is complete. /// @@ -553,7 +199,7 @@ namespace CampusAppWP8 Exception downloadError = e.Error; if (downloadError != null) { - this.RunOnFailedCallback(this.OnFailedWeb, this.OnFailedLoad); + this.FireLoadFailEvents(); } else { @@ -569,66 +215,10 @@ namespace CampusAppWP8 this.DeserializeModel(data); } - this.RunOnIOCallback(this.OnLoaded); + this.FireLoadCompletedEvents(); } } - /// - /// Executes the on i/o callback operation. - /// - /// The callback function. - private void RunOnIOCallback(OnIO callbackFunc) - { - if (callbackFunc != null) - { - callbackFunc(); - } - } - - /// Executes the on failed callback operation. - /// The special function. - /// The default function. - private void RunOnFailedCallback(OnFailed specialFunc, OnFailed defaultFunc) - { - if (specialFunc != null) - { - specialFunc(); - } - else if (defaultFunc != null) - { - defaultFunc(); - } - } - - /// Check if model or file is not up to date. - /// The check function. - /// true if model or file is not up to date, false if it is. - private bool CheckIsNotUpToDate(object checkFunc) - { - bool retValue = false; - - // if there is no check function, the model or file is not up to date - if (checkFunc == null) - { - retValue = true; - } - else - { - Type funcType = checkFunc.GetType(); - - if (funcType.Equals(typeof(IsFileUpToDate))) - { - retValue = !(checkFunc as IsFileUpToDate)(this.model, this.file.GetFileInfo()); - } - else if (funcType.Equals(typeof(IsModelUpToDate))) - { - retValue = !(checkFunc as IsModelUpToDate)(this.model); - } - } - - return retValue; - } - #endregion #endregion diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs new file mode 100644 index 00000000..077ee869 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs @@ -0,0 +1,156 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 24.06.2013 +//----------------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Openinghours +{ + using System.Globalization; + using System.Windows; + using System.Xml.Serialization; + + /// + /// Model for menu + /// + public class OpeninghoursInstitutionWp8Model : CampusAppWPortalLib8.Model.Openinghours.OpeninghoursInstitutionModel + { + #region Property + + /// + /// Gets the visibility state of the monday TextBlock. + /// + public Visibility VisibleMonday + { + get + { + return ((this.Monday == string.Empty) || (this.Monday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the tuesday TextBlock. + /// + public Visibility VisibleTuesday + { + get + { + return ((this.Tuesday == string.Empty) || (this.Tuesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the wednesday TextBlock. + /// + public Visibility VisibleWednesday + { + get + { + return ((this.Wednesday == string.Empty) || (this.Wednesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the thursday TextBlock. + /// + public Visibility VisibleThursday + { + get + { + return ((this.Thursday == string.Empty) || (this.Thursday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the friday TextBlock. + /// + public Visibility VisibleFriday + { + get + { + return ((this.Friday == string.Empty) || (this.Friday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the saturday TextBlock. + /// + public Visibility VisibleSaturday + { + get + { + return ((this.Saturday == string.Empty) || (this.Saturday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the sunday TextBlock. + /// + public Visibility VisibleSunday + { + get + { + return ((this.Sunday == string.Empty) || (this.Sunday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the comment. + /// + public Visibility VisibleComment + { + get + { + return ((this.Comment == string.Empty) || (this.Comment.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the email address. + /// + public Visibility VisibleEMail + { + get + { + return ((this.EMail == string.Empty) || (this.EMail.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the phone number. + /// + public Visibility VisiblePhone + { + get + { + return ((this.Phone == string.Empty) || (this.Phone.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the room. + /// + public Visibility VisibleRoom + { + get + { + return ((this.Room == string.Empty) || (this.Room.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + /// + /// Gets the visibility state of the building. + /// + public Visibility VisibleBuilding + { + get + { + return ((this.Building == string.Empty) || (this.Building.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; + } + } + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursWp8Model.cs new file mode 100644 index 00000000..88b480bd --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursWp8Model.cs @@ -0,0 +1,20 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 24.06.2013 +//----------------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Openinghours +{ + using System.Xml.Serialization; + + /// + /// Model for opening hours. + /// + [XmlRoot("root")] + public class OpeninghoursWp8Model : CampusAppWPortalLib8.Model.Openinghours.OpeninghoursModel + { + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs new file mode 100644 index 00000000..944cf9e1 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs @@ -0,0 +1,77 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 05.09.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWP8.Model.Person +{ + using System.Xml.Serialization; + using CampusAppWP8.Utility; + + /// Person function model. + /// Stubbfel, 05.09.2013. + public class PersonFunctionWp8Model : CampusAppWPortalLib8.Model.Person.PersonFunctionModel + { + #region Property + + /// Gets or sets the function. + /// The function. + [XmlAttribute("funktion")] + public new string Function + { + get + { + return base.Function; + } + + set + { + if (value != this.Function) + { + base.Function = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + + /// Gets or sets the appointment. + /// The appointment. + [XmlAttribute("einrichtung")] + public new string Appointment + { + get + { + return base.Appointment; + } + + set + { + if (value != this.Appointment) + { + base.Appointment = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + + /// Gets or sets the building. + /// The building. + [XmlAttribute("gebaeude")] + public new string Building + { + get + { + return base.Building; + } + + set + { + if (value != this.Building) + { + base.Building = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs new file mode 100644 index 00000000..474f3fea --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs @@ -0,0 +1,29 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 05.09.2013 +//----------------------------------------------------------------------------- + +namespace CampusAppWP8.Model.Person +{ + using System.Xml.Serialization; + using CampusAppWPortalLib8.Model.Person; + + /// Person list model. + /// Stubbfel, 05.09.2013. + [XmlRoot("Uebersicht")] + public class PersonListWp8Model : CampusAppWPortalLib8.Model.Person.PersonListModel + { + /// Gets a person. + /// Stubbfel, 05.09.2013. + /// The identifier. + /// The person. + public new PersonWp8Model GetPerson(string id) + { + IPersonModel tmpPerson = base.GetPerson(id); + return tmpPerson as PersonWp8Model; + } + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs new file mode 100644 index 00000000..ccceb929 --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs @@ -0,0 +1,77 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 05.09.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWP8.Model.Person +{ + using System.Xml.Serialization; + using CampusAppWP8.Utility; + + /// Person model. + /// Stubbfel, 05.09.2013. + public class PersonWp8Model : CampusAppWPortalLib8.Model.Person.PersonModel + { + #region property + + /// Gets or sets the akadgrad. + /// The akadgrad. + [XmlAttribute("akadgrad")] + public new string Akadgrad + { + get + { + return base.Akadgrad; + } + + set + { + if (value != this.Akadgrad) + { + base.Akadgrad = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + + /// Gets or sets the name of the sur. + /// The name of the sur. + [XmlAttribute("nachname")] + public new string SurName + { + get + { + return base.SurName; + } + + set + { + if (value != this.SurName) + { + base.SurName = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + + /// Gets or sets the person's first name. + /// The name of the first. + [XmlAttribute("vorname")] + public new string FirstName + { + get + { + return base.FirstName; + } + + set + { + if (value != this.FirstName) + { + base.FirstName = Wp8StringManager.StripAndDecodeHTML(value); + } + } + } + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs index d12e961a..235a0508 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs @@ -109,6 +109,21 @@ namespace CampusAppWP8.Model.Setting } } + /// + /// Gets or sets the DeploymentNumber of the app + /// + public int DeploymentNumber + { + get + { + return App.LoadFromAppState(Constants.AppSetting_DeploymentNumber); + } + set + { + App.SaveToAppState(Constants.AppSetting_DeploymentNumber,value); + } + } + #endregion } } \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs b/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs index eb957228..f61df5a4 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Setting/UserProfilModel.cs @@ -9,6 +9,7 @@ namespace CampusAppWP8.Model.Setting { using System.Xml.Serialization; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Settings; /// /// Model for the profile of an user @@ -35,72 +36,6 @@ namespace CampusAppWP8.Model.Setting #endregion - #region Enums - /// - /// Specifies the degrees. - /// - public enum DegreeType - { - /// - /// bachelor degree - /// - BACHELOR = 82, - - /// - /// master degree - /// - MASTER = 88, - - /// - /// diploma degree - /// - DIPLOM = 11 - } - - /// - /// Specifies the role of the user. - /// - public enum RoleType - { - /// - /// for students (01). - /// - STUDENT = 1, - - /// - /// for staffs (10). - /// - 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 /// diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListWp8Model.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListWp8Model.cs new file mode 100644 index 00000000..d520b49d --- /dev/null +++ b/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListWp8Model.cs @@ -0,0 +1,123 @@ +// +// Company copyright tag.List +// +// stubbfel +// 25.07.2013 +//---------------------------------------------------------------------- +namespace CampusAppWP8.Model.Utility +{ + using System.Collections.Generic; + using System.Linq; + using CampusAppWP8.Feed.Utility; + using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Model.Utility; + + /// + /// This is a class for the courseList + /// + public class CourseListPickerItemListWp8Model : CampusAppWPortalLib8.Model.Utility.CourseListPickerItemListModel + { + #region Member + + /// List of courses. + private CourseFeed courseList; + + #endregion + + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + public CourseListPickerItemListWp8Model() + { + } + + #endregion + + #region Events + + /// + /// Delegate of the OnIO callback function. + /// + public delegate void OnIO(); + + /// + /// Callback pointer, called after loading. + /// + public event OnIO OnLoaded = null; + + #endregion + + #region Method + + #region public + + /// + /// Overrides the LoadList-Method + /// + 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 + + /// Feed is fail. + /// Stubbfel, 10.09.2013. + private void FeedIsFail() + { + this.FallBackList(); + this.CallOnLoaded(); + } + + /// Feed is ready. + /// Stubbfel, 10.09.2013. + private void FeedIsReady() + { + this.ConvertToListPickerItemModel(this.courseList.Model.CreateCourseList()); + this.CallOnLoaded(); + } + + /// Converts a courseList to a list picker item model. + /// Stubbfel, 10.09.2013. + /// List of courses. + private void ConvertToListPickerItemModel(List 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(); + } + + /// Call on loaded. + /// Stubbfel, 10.09.2013. + private void CallOnLoaded() + { + if (this.OnLoaded != null) + { + this.OnLoaded(); + } + } + + #endregion + + #endregion + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs b/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs index 27d6108a..c0a24f9d 100644 --- a/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/XmlModel.cs @@ -9,12 +9,14 @@ namespace CampusAppWP8.Model { using System.Text; using CampusAppWPortalLib8.Utility; + using CampusAppWPortalLib8.Model; + using CampusAppWPortalLib8.Resources; /// /// Xml model io handler class. /// /// model type - public abstract class XmlModel : MainModel + public abstract class XmlModel : MainModel, IXmlModel { #region Constructor @@ -27,7 +29,7 @@ namespace CampusAppWP8.Model public XmlModel(ModelType modelType, string fileName, string url) : base(modelType, fileName, url) { - this.ValidRootName = CampusAppWPortalLib8.Resources.Constants.XMLRootElementName; + this.ValidRootName = Constants.XMLRootElementName; } /// @@ -39,17 +41,21 @@ namespace CampusAppWP8.Model public XmlModel(ModelType modelType, string sourceName) : base(modelType, sourceName) { - this.ValidRootName = CampusAppWPortalLib8.Resources.Constants.XMLRootElementName; + this.ValidRootName = Constants.XMLRootElementName; } #endregion - #region Method + #region Property /// /// Gets or sets for the name of the root-tag /// - protected string ValidRootName { get; set; } + public string ValidRootName { get; set; } + + #endregion + + #region Method /// /// Create the model from a xml byte array. diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs index 0dd73ecd..f45eb0cb 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentFavoritePage.xaml.cs @@ -11,9 +11,9 @@ namespace CampusAppWP8.Pages.Departments using System.Windows; using System.Windows.Controls; using System.Windows.Navigation; - using CampusAppWP8.File.Departments; - using CampusAppWP8.Model.Departments; + using CampusAppWP8.File.Departments; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Departments; using Microsoft.Phone.Controls; /// @@ -70,7 +70,7 @@ namespace CampusAppWP8.Pages.Departments if (this.isNewInstance) { - if ((DepartmentIndexPage.FavoriteFile == null) || (DepartmentIndexPage.FavoriteFile.GetModel() == null)) + if ((DepartmentIndexPage.FavoriteFile == null) || (DepartmentIndexPage.FavoriteFile.Model == null)) { DepartmentModel tempModel = null; @@ -91,7 +91,7 @@ namespace CampusAppWP8.Pages.Departments if (this.isSourceSet == false) { - this.ContentPanel.ItemsSource = DepartmentIndexPage.GetFavoriteFile().GetModel().Faculties[0].Chairs; + this.ContentPanel.ItemsSource = DepartmentIndexPage.GetFavoriteFile().Model.Faculties[0].Chairs; this.isSourceSet = true; } @@ -108,7 +108,7 @@ namespace CampusAppWP8.Pages.Departments if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_DepartmentFavoriteModel, DepartmentIndexPage.FavoriteFile.GetModel()); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_DepartmentFavoriteModel, DepartmentIndexPage.FavoriteFile.Model); } } @@ -159,7 +159,7 @@ namespace CampusAppWP8.Pages.Departments Button btn = this.lastClickedBtn as Button; TextBlock btnText = btn.Content as TextBlock; - if (DepartmentIndexPage.GetFavoriteFile().GetModel().Faculties[0].RemoveChair(btnText.Text) == true) + if (DepartmentIndexPage.GetFavoriteFile().Model.Faculties[0].RemoveChair(btnText.Text) == true) { MessageBox.Show(AppResources.DeleteSucceeded); } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs index d161e280..cfdf92f8 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentIndexPage.xaml.cs @@ -51,13 +51,13 @@ namespace CampusAppWP8.Pages.Departments { DepartmentIndexPage.feed = new DepartmentFeed(false); } - + DepartmentIndexPage.feed.OnLoaded += new DepartmentFeed.OnIO(this.SetupFacultyList); DepartmentIndexPage.feed.OnFailedWeb += new DepartmentFeed.OnFailed(this.FeedIsFailedWeb); DepartmentIndexPage.feed.OnFailedFile += new DepartmentFeed.OnFailed(this.FeedIsFailedFile); - DepartmentIndexPage.feed.LoadData(Utilities.GetLoadModus()); - + DepartmentIndexPage.feed.LoadData(Utilities.GetLoadModus()); + if (DepartmentIndexPage.favorite == null) { DepartmentIndexPage.favorite = new DepartmentFavoriteFile(false); @@ -160,7 +160,7 @@ namespace CampusAppWP8.Pages.Departments { if (NavigationMode.Back == e.NavigationMode) { - DepartmentIndexPage.favorite.SaveData(); + DepartmentIndexPage.favorite.SaveData(); } base.OnNavigatedFrom(e); @@ -184,7 +184,7 @@ namespace CampusAppWP8.Pages.Departments /// private void SetupFacultyList() { - this.FacultyList.ItemsSource = DepartmentIndexPage.feed.GetModel().Faculties; + this.FacultyList.ItemsSource = DepartmentIndexPage.feed.Model.Faculties; this.progressBar.Visibility = Visibility.Collapsed; } @@ -193,14 +193,14 @@ namespace CampusAppWP8.Pages.Departments /// private void CheckFavoriteFeed() { - if (DepartmentIndexPage.favorite.GetModel() == null) + if (DepartmentIndexPage.favorite.Model == null) { - DepartmentIndexPage.favorite.Model = new Model.Departments.DepartmentModel(); + DepartmentIndexPage.favorite.Model = new CampusAppWPortalLib8.Model.Departments.DepartmentModel(); } - if (DepartmentIndexPage.favorite.GetModel().Faculties.Count == 0) + if (DepartmentIndexPage.favorite.Model.Faculties.Count == 0) { - DepartmentIndexPage.favorite.Model.Faculties.Add(new Model.Departments.FacultyModel("favorites")); + DepartmentIndexPage.favorite.Model.Faculties.Add(new CampusAppWPortalLib8.Model.Departments.FacultyModel("favorites")); } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml index 62fd0e93..5e6f7462 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml @@ -17,10 +17,6 @@ - - - - diff --git a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs index d03b97db..1dd9291d 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml.cs @@ -12,8 +12,8 @@ namespace CampusAppWP8.Pages.Departments using System.Windows; using System.Windows.Controls; using System.Windows.Navigation; - using CampusAppWP8.Model.Departments; using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Model.Departments; using Microsoft.Phone.Controls; /// @@ -70,7 +70,7 @@ namespace CampusAppWP8.Pages.Departments if (this.isNewInstance) { - if ((DepartmentIndexPage.Feed == null) || (DepartmentIndexPage.Feed.GetModel() == null)) + if ((DepartmentIndexPage.Feed == null) || (DepartmentIndexPage.Feed.Model == null)) { DepartmentModel tempModel = null; @@ -91,7 +91,7 @@ namespace CampusAppWP8.Pages.Departments if (this.isSourceSet == false) { - this.DepartmentPivot.ItemsSource = DepartmentIndexPage.GetFeed().GetModel().Faculties; + this.DepartmentPivot.ItemsSource = DepartmentIndexPage.GetFeed().Model.Faculties; this.isSourceSet = true; } @@ -103,7 +103,7 @@ namespace CampusAppWP8.Pages.Departments int pivotIndexInt = int.Parse(pivotIndex) - 1; // if the index is in the range of the array - if ((pivotIndexInt >= 0) && (pivotIndexInt < DepartmentIndexPage.GetFeed().GetModel().Faculties.Count())) + if ((pivotIndexInt >= 0) && (pivotIndexInt < DepartmentIndexPage.GetFeed().Model.Faculties.Count())) { DepartmentPivot.SelectedIndex = pivotIndexInt; } @@ -126,7 +126,7 @@ namespace CampusAppWP8.Pages.Departments if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_DepartmentModel, DepartmentIndexPage.Feed.GetModel()); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_DepartmentModel, DepartmentIndexPage.Feed.Model); } } @@ -186,11 +186,11 @@ namespace CampusAppWP8.Pages.Departments Button btn = this.lastClickedBtn as Button; TextBlock btnText = btn.Content as TextBlock; - Model.Departments.ChairModel tempModel = DepartmentIndexPage.GetFeed().GetModel().Faculties[this.DepartmentPivot.SelectedIndex].GetChairModel(btnText.Text); + CampusAppWPortalLib8.Model.Departments.ChairModel tempModel = DepartmentIndexPage.GetFeed().Model.Faculties[this.DepartmentPivot.SelectedIndex].GetChairModel(btnText.Text); if (tempModel != null) { - DepartmentIndexPage.GetFavoriteFile().GetModel().Faculties[0].AddChair(tempModel); + DepartmentIndexPage.GetFavoriteFile().Model.Faculties[0].AddChair(tempModel); } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs index 023cde77..9126ab91 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Dev/QRScanner.xaml.cs @@ -83,7 +83,7 @@ namespace CampusAppWP8.Pages.Dev { this.resultAppStoreKey = NavigationContext.QueryString[Constants.ParamQRResultKey]; } - + this.isInAutofocus = true; this.cam = new PhotoCamera(CameraType.Primary); this.cam.Initialized += new EventHandler(this.Cam_Initialized); this.cam.AutoFocusCompleted += new EventHandler(this.Cam_AutoFocusCompl); @@ -176,7 +176,7 @@ namespace CampusAppWP8.Pages.Dev /// Camera operation completed event information. private void Cam_AutoFocusCompl(object sender, CameraOperationCompletedEventArgs e) { - this.isInAutofocus = false; + //this.isInAutofocus = false; } /// @@ -195,8 +195,6 @@ namespace CampusAppWP8.Pages.Dev this.cam.FocusAtPoint( pos.Y / this.camView.ActualHeight, 1.0 - (pos.X / this.camView.ActualWidth)); - - this.isInAutofocus = true; } else if (this.cam.IsFocusSupported == true) { @@ -243,6 +241,10 @@ namespace CampusAppWP8.Pages.Dev } }); } + else + { + this.cam.Focus(); + } } /// @@ -255,12 +257,13 @@ namespace CampusAppWP8.Pages.Dev while (!this.captureThreadExit) { - if (this.isInAutofocus == false) - { + //if (this.isInAutofocus == false) + //{ this.cam.GetPreviewBufferArgb32(buffer); this.OnCaptureImage(buffer, (int)resolution.Width, (int)resolution.Height); - } + this.isInAutofocus = true; + //} System.Threading.Thread.Sleep(1000); } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs index 685568fa..c2b20c99 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Events/EventPage.xaml.cs @@ -96,7 +96,7 @@ namespace CampusAppWP8.Pages.Events if (this.isNewInstance) { - if ((EventIndexPage.GetEventFeed() == null) || (EventIndexPage.GetEventFeed().GetModel() == null)) + if ((EventIndexPage.GetEventFeed() == null) || (EventIndexPage.GetEventFeed().Model == null)) { RSSViewModel tempModel = null; @@ -160,7 +160,7 @@ namespace CampusAppWP8.Pages.Events if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_EventRSSModel, EventIndexPage.GetEventFeed().GetModel()); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_EventRSSModel, EventIndexPage.GetEventFeed().Model); } if (this.synth != null) @@ -222,7 +222,7 @@ namespace CampusAppWP8.Pages.Events { string ssmlPrompt = ""; - ssmlPrompt += EventIndexPage.GetEventFeed().GetModel().Channel[0].Item[this.EventPivot.SelectedIndex].Text; + ssmlPrompt += EventIndexPage.GetEventFeed().Model.Channel[0].Item[this.EventPivot.SelectedIndex].Text; ssmlPrompt += ""; this.isInSpeech = true; diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs index bce8f255..d530836b 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml.cs @@ -59,7 +59,7 @@ namespace CampusAppWP8.Pages.Exams } this.ProgressBar.Visibility = System.Windows.Visibility.Visible; - this.feed.LoadData(Utilities.GetLoadModus()); + this.feed.LoadData(Utilities.GetLoadModus()); } /// @@ -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(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: 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/Pages/Links/LinkPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs index 779eef46..5aaeedc8 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml.cs @@ -67,8 +67,8 @@ namespace CampusAppWP8.Pages.Links this.InitializeFeeds(); this.ProgressBar.Visibility = System.Windows.Visibility.Visible; this.loadingFeeds = 2; - this.commonLinkFeed.LoadData(Utilities.GetLoadModus()); - this.clubLinkFeed.LoadData(Utilities.GetLoadModus()); + this.commonLinkFeed.LoadData(Utilities.GetLoadModus()); + this.clubLinkFeed.LoadData(Utilities.GetLoadModus()); } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index 013edcb0..d13c3525 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -16,9 +16,9 @@ namespace CampusAppWP8.Pages.Mensa using CampusAppWP8.Resources; using CampusAppWP8.Utility; using CampusAppWP8.Utility.Lui.MessageBoxes; + using CampusAppWPortalLib8.Model.Mensa; using Microsoft.Phone.Controls; using Microsoft.Phone.Shell; - using CampusAppWPortalLib8.Model.Mensa; /// /// Class for the MensaPage @@ -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; } } @@ -163,7 +163,7 @@ namespace CampusAppWP8.Pages.Mensa /// Method initialize the Feed depends of a campus /// /// campus parameter - 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); @@ -231,10 +231,57 @@ namespace CampusAppWP8.Pages.Mensa private void SetupMensaPivot() { this.MensaPivot.Title = AppResources.MensaApp_Title + " (" + this.feed.Title + ")"; + this.CreatesMealIcons(); this.MensaPivot.ItemsSource = this.feed.Model.Menus; this.MensaPivot.SelectedIndex = this.selectedIndex; } + /// + /// Method create the IconsUrl for the meals + /// + private void CreatesMealIcons() + { + foreach (MenuModel menus in this.feed.Model.Menus) + { + foreach (MealModel meal in menus.Meals) + { + switch (meal.IconName) + { + case MealModel.MealIconNameCow: + meal.IconUrl = Icons.Cow; + break; + case MealModel.MealIconNameCowPig: + meal.IconUrl = Icons.CowPig; + break; + case MealModel.MealIconNameFish: + meal.IconUrl = Icons.Fish; + break; + case MealModel.MealIconNameFowl: + meal.IconUrl = Icons.Fowl; + break; + case MealModel.MealIconNameFree: + meal.IconUrl = Icons.Free; + break; + case MealModel.MealIconNameLamb: + meal.IconUrl = Icons.Lamb; + break; + case MealModel.MealIconNamePig: + meal.IconUrl = Icons.Pig; + break; + case MealModel.MealIconNameVegetarian: + meal.IconUrl = Icons.Vegetarian; + break; + case MealModel.MealIconNameWild: + meal.IconUrl = Icons.Wild; + break; + default: + meal.IconUrl = string.Empty; + break; + } + } + } + } + /// /// Method calculate which pivot has to be selected /// @@ -288,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); } /// Event handler. Called by ApplicationBarMenuItem2 for click events. @@ -298,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); } /// Event handler. Called by ApplicationBarMenuItem3 for click events. @@ -308,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 diff --git a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs index d6ab0753..1c5556d2 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/News/NewsPage.xaml.cs @@ -84,7 +84,7 @@ namespace CampusAppWP8.Pages.News if (this.isNewInstance) { - if ((NewsIndexPage.Feed == null) || (NewsIndexPage.Feed.GetModel() == null)) + if ((NewsIndexPage.Feed == null) || (NewsIndexPage.Feed.Model == null)) { RSSViewModel tempModel = null; @@ -141,7 +141,7 @@ namespace CampusAppWP8.Pages.News if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_NewsRSSModel, NewsIndexPage.GetNewsFeed().GetModel()); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_NewsRSSModel, NewsIndexPage.GetNewsFeed().Model); } if (this.synth != null) @@ -199,7 +199,7 @@ namespace CampusAppWP8.Pages.News { string ssmlPrompt = ""; - ssmlPrompt += NewsIndexPage.GetNewsFeed().GetModel().Channel[0].Item[this.NewsPivot.SelectedIndex].Text; + ssmlPrompt += NewsIndexPage.GetNewsFeed().Model.Channel[0].Item[this.NewsPivot.SelectedIndex].Text; ssmlPrompt += ""; this.isInSpeech = true; diff --git a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs index 725f7d2f..44694ae9 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Openinghours/OpeninghoursPage.xaml.cs @@ -52,7 +52,7 @@ namespace CampusAppWP8.Pages.Openinghours this.feed.OnLoaded += new OpeninghoursFeed.OnIO(this.FeedIsReady); this.feed.OnFailedWeb += new OpeninghoursFeed.OnFailed(this.FeedIsFailedWeb); this.feed.OnFailedFile += new OpeninghoursFeed.OnFailed(this.FeedIsFailedFile); - this.feed.LoadData(Utilities.GetLoadModus()); + this.feed.LoadData(Utilities.GetLoadModus()); } this.isNewInstance = true; @@ -79,11 +79,11 @@ namespace CampusAppWP8.Pages.Openinghours */ if (this.isNewInstance) { - if ((this.feed == null) || (this.feed.GetModel() == null)) + if ((this.feed == null) || (this.feed.Model == null)) { - OpeninghoursModel tempModel = null; + OpeninghoursWp8Model tempModel = null; - if ((tempModel = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_OpeninghoursModel)) != null) + if ((tempModel = App.LoadFromIsolatedStorage(Constants.IsolatedStorage_OpeninghoursModel)) != null) { this.feed.Model = tempModel; this.FeedIsReady(); @@ -104,7 +104,7 @@ namespace CampusAppWP8.Pages.Openinghours if (e.NavigationMode != System.Windows.Navigation.NavigationMode.Back) { - App.SaveToIsolatedStorage(Constants.IsolatedStorage_OpeninghoursModel, this.feed.GetModel()); + App.SaveToIsolatedStorage(Constants.IsolatedStorage_OpeninghoursModel, this.feed.Model); } } diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs index 289d4ad4..ac47c1e4 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml.cs @@ -12,13 +12,12 @@ namespace CampusAppWP8.Pages.Person using System.Windows; using CampusAppWP8.Api.Person; using CampusAppWP8.Model.Person; - using CampusAppWP8.Model.Utility; using CampusAppWP8.Resources; using CampusAppWP8.Utility.Lui.Button; using CampusAppWP8.Utility.Lui.MessageBoxes; + using CampusAppWPortalLib8.Model.Utility; using Microsoft.Phone.Controls; using Microsoft.Phone.Tasks; - using CampusAppWPortalLib8.Model.Utility; /// Person page. /// Stubbfel, 09.09.2013. @@ -115,7 +114,7 @@ namespace CampusAppWP8.Pages.Person string personID = btn.PersonId as string; int functionIndex = (int)btn.FunctionIndex; - PersonModel person = this.api.Model.GetPerson(personID); + PersonWp8Model person = this.api.Model.GetPerson(personID); if (person == null) { return; diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs index a868f4c1..6455d003 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml.cs @@ -14,6 +14,7 @@ namespace CampusAppWP8.Pages.Setting using CampusAppWP8.Model.Utility; using CampusAppWPortalLib8.Utility; using Microsoft.Phone.Controls; + using CampusAppWPortalLib8.Model.Utility; /// /// Class for the UserProfilePage @@ -28,7 +29,7 @@ namespace CampusAppWP8.Pages.Setting private UserProfilModel userProfil; /// List of courses. - private CourseListPickerItemListModel courseList; + private CourseListPickerItemListWp8Model courseList; #endregion @@ -71,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(); } @@ -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) { diff --git a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs index 9f58635d..fb4dfb53 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/StartPage.xaml.cs @@ -83,6 +83,13 @@ namespace CampusAppWP8.Pages this.initCourseList.LoadData(); this.ShowOptIns(); Settings.AppSetting.InitApp = true; + + int appDeploy; + bool parseResult = int.TryParse(Constants.DeploymentNumber, out appDeploy); + if (parseResult) + { + Settings.AppSetting.DeploymentNumber = appDeploy; + } } } 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()); } /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs index 0d621fb5..3a118d49 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs @@ -105,42 +105,6 @@ 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 Gebäudeinfos ausblenden ähnelt. /// @@ -195,33 +159,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Bachelor ähnelt. - /// - public static string Degree_Bachelor { - get { - return ResourceManager.GetString("Degree_Bachelor", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Diplom ähnelt. - /// - public static string Degree_Diploma { - get { - return ResourceManager.GetString("Degree_Diploma", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Master ähnelt. - /// - public static string Degree_Master { - get { - return ResourceManager.GetString("Degree_Master", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Löschen ähnelt. /// @@ -285,15 +222,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Fakultät ähnelt. - /// - public static string Faculty { - get { - return ResourceManager.GetString("Faculty", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Favoriten ähnelt. /// @@ -924,24 +852,6 @@ namespace CampusAppWP8.Resources { } } - /// - /// Sucht eine lokalisierte Zeichenfolge, die Mitarbeiter ähnelt. - /// - public static string Setting_RoleStaff { - get { - return ResourceManager.GetString("Setting_RoleStaff", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Student ähnelt. - /// - public static string Setting_RoleStudent { - get { - return ResourceManager.GetString("Setting_RoleStudent", resourceCulture); - } - } - /// /// Sucht eine lokalisierte Zeichenfolge, die Profileinstellungen ähnelt. /// diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx index 9528d551..bdac3a8f 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx @@ -230,24 +230,12 @@ Veranstaltungsart - - Fakultät - Lehrstühle Link - - Bachelor - - - Diplom - - - Master - Gebäude @@ -314,12 +302,6 @@ Semester - - Mitarbeiter - - - Student - Studiengangsauswahl @@ -338,18 +320,6 @@ Dürfen Positionsdaten enhoben und verwendet werden? - - Cottbus Hauptcampus - - - Cottbus Nordcampus - - - Cottbus Südcampus - - - Senftenberg Hauptcampus - Campusauswahl diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index da484cb4..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 @@ -552,4 +549,10 @@ SearchPin + + DeploymentNumber + + + 3 + \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs index 2ed1f9a6..e07539c5 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants1.Designer.cs @@ -105,6 +105,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die DeploymentNumber ähnelt. + /// + public static string AppSetting_DeploymentNumber { + get { + return ResourceManager.GetString("AppSetting_DeploymentNumber", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die DevMode ähnelt. /// @@ -186,6 +195,15 @@ namespace CampusAppWP8.Resources { } } + /// + /// Sucht eine lokalisierte Zeichenfolge, die 3 ähnelt. + /// + public static string DeploymentNumber { + get { + return ResourceManager.GetString("DeploymentNumber", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die +49 ähnelt. /// @@ -1203,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/CampusAppWP8/Resources/Icons.cs b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs index eea1a597..ede5416b 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs @@ -62,7 +62,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("steak_159.png"); } } @@ -73,7 +73,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("pork_159.png"); } } @@ -139,7 +139,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("fish_159.png"); } } @@ -150,7 +150,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("chicken_159.png"); } } @@ -161,7 +161,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("frei_159.png"); } } @@ -205,7 +205,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("lamb_159.png"); } } @@ -304,7 +304,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("pork_159.png"); } } @@ -414,7 +414,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("carotte_159.png"); } } @@ -436,7 +436,7 @@ namespace CampusAppWP8.Resources { get { - return Themerize("info_159.png"); + return Themerize("wilddish_159.png"); } } diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx index 360bc657..509cad32 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx @@ -127,10 +127,10 @@ campus_159.png - info_159.png + steak_159.png - info_159.png + pork_159.png current_position_159.png @@ -148,13 +148,13 @@ favorite_159.png - info_159.png + fish_159.png - info_159.png + chicken_159.png - info_159.png + frei_159.png homework_159.png @@ -166,7 +166,7 @@ lab_159.png - info_159.png + lamb_159.png lecture_159.png @@ -193,7 +193,7 @@ phone_159.png - info_159.png + pork_159.png placeinfo_159.png @@ -223,12 +223,12 @@ update_159.png - info_159.png + carotte_159.png webmail_159.png - info_159.png + wild dish_159.png \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs b/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs index 76acf9d1..753d7939 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/BackgroundTasks.cs @@ -74,52 +74,21 @@ namespace CampusAppWP8.Utility } /// - /// Method start MensaBackgroundTask + /// Method start BTUCampusAppBackgroundTask /// - public static void StartMensaTask() + public static void StartBTUCampusAppTask() { int campusId = (int)Settings.UserProfil.DefaultCampus; - BackgroundTasks.StartPerodicTask(Constants.BackgroundTask_Mensa, AppResources.BackGroundTaskDesc_Mensa + " - Feed " + campusId); + BackgroundTasks.StartPerodicTask(Constants.BackgroundTask_BTUCampusApp, AppResources.BackGroundTaskDesc_BTUCampusApp + " - Feed " + campusId); } /// - /// Method stop MensaBackgroundTask + /// Method stop BTUCampusAppBackgroundTask /// - public static void StopMensaTask() + public static void StopBTUCampusAppTask() { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_Mensa); + BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_BTUCampusApp); } - /// - /// Method start EventBackgroundTask - /// - public static void StartEventTask() - { - BackgroundTasks.StartPerodicTask(Constants.BackgroundTask_Event, AppResources.BackGroundTaskDesc_Event); - } - - /// - /// Method stop EventBackgroundTask - /// - public static void StopEventTask() - { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_Event); - } - - /// - /// Method start NewsBackgroundTask - /// - public static void StartNewsTask() - { - BackgroundTasks.StartPerodicTask(Constants.BackgroundTask_News, AppResources.BackGroundTaskDesc_News); - } - - /// - /// Method stop NewsBackgroundTask - /// - public static void StopNewsTask() - { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_News); - } } } diff --git a/CampusAppWP8/CampusAppWP8/Utility/File.cs b/CampusAppWP8/CampusAppWP8/Utility/File.cs index d49ee632..b247c0e7 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/File.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/File.cs @@ -17,7 +17,7 @@ namespace CampusAppWP8.Utility /// /// File class. /// - public class File + public class File : AbstractFile { #region Member @@ -45,15 +45,6 @@ namespace CampusAppWP8.Utility #endregion - #region Events - - /// - /// Delegation of the write callback function prototype. - /// - public delegate void WriteCallbackFunc(); - - #endregion - #region Method #region public @@ -61,7 +52,7 @@ namespace CampusAppWP8.Utility /// Read data from file to a string. /// Stubbfel, 03.09.2013. /// data string. - public byte[] ReadFile() + public override byte[] ReadFile() { byte[] retValue = null; @@ -78,7 +69,7 @@ namespace CampusAppWP8.Utility /// data byte array. /// callback function, called after writing is done. /// callback function, called when writing failed. - public void WriteFile(byte[] data, WriteCallbackFunc onSavedCallback, WriteCallbackFunc onFailedCallback) + public override void WriteFile(byte[] data, WriteCallbackFunc onSavedCallback, WriteCallbackFunc onFailedCallback) { Thread th = new Thread(delegate() { this.WriteAsync(data, onSavedCallback, onFailedCallback); }); th.Start(); @@ -98,9 +89,17 @@ namespace CampusAppWP8.Utility /// Check if a file is existing. /// /// true, if file exists, otherwise false - public bool Exist() + public override bool Exist() { - return this.GetFileInfo().Exists; + FileInfo info = this.GetFileInfo(); + if (info.Exists && info.Length > 0) + { + return true; + } + else + { + return false; + } } /// Converts this object to a storage file. diff --git a/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs b/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs index 2d3b73c1..3d1b2ae5 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/HttpRequest.cs @@ -12,20 +12,13 @@ namespace CampusAppWP8.Utility using System.Net; using CampusAppWP8.Model.Utility; using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Utility; /// /// Class realize the access of restful HttpRequest /// - public class HttpRequest + public class HttpRequest : AbstractHttpRequest { - #region Member - - /// - /// BaseAddress of the webClient - /// - private string baseAddress; - #endregion - #region Constructor /// @@ -41,7 +34,7 @@ namespace CampusAppWP8.Utility /// the url of the HttpRequest base address public HttpRequest(Uri apiBaseAddress) { - this.baseAddress = apiBaseAddress.AbsoluteUri; + this.BaseAddress = apiBaseAddress.AbsoluteUri; } #endregion @@ -72,29 +65,6 @@ namespace CampusAppWP8.Utility client.OpenReadAsync(url); } - /// - /// Method create the Url for the http-get-method - /// - /// list of parameters - /// absolute API-Url include GetParameter - public Uri CreateGetUrl(List parameters) - { - string paramterStr = string.Empty; - string seperator = string.Empty; - foreach (UrlParamModel parameter in parameters) - { - if (string.Empty.Equals(seperator)) - { - seperator = parameter.ParamToken; - } - - paramterStr += parameter.ToString(); - } - - string getUrlStr = this.baseAddress + seperator + paramterStr; - return new Uri(getUrlStr, UriKind.Absolute); - } - /// /// Method realize the http-delete-method /// diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs index f393a002..9bc7c76a 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Tiles/TileCreator.cs @@ -58,7 +58,7 @@ namespace CampusAppWP8.Utility.Lui.Tiles TileCreator.CreateIconicTile(AppResources.MensaApp_Title, Constants.PathMensa_MensaPage, Icons.Mensa, Icons.Mensa); // create a new task - BackgroundTasks.StartMensaTask(); + BackgroundTasks.StartBTUCampusAppTask(); } /// @@ -77,7 +77,7 @@ namespace CampusAppWP8.Utility.Lui.Tiles TileCreator.CreateIconicTile(AppResources.NewsApp_Title, Constants.PathNews_NewsIndexPage, Icons.News, Icons.News); // create a new Task - BackgroundTasks.StartNewsTask(); + BackgroundTasks.StartBTUCampusAppTask(); } /// @@ -96,7 +96,7 @@ namespace CampusAppWP8.Utility.Lui.Tiles TileCreator.CreateIconicTile(AppResources.EventApp_Title, Constants.PathEvents_EventsIndexPage, Icons.News, Icons.News); // create a new taskk - BackgroundTasks.StartEventTask(); + BackgroundTasks.StartBTUCampusAppTask(); } /// diff --git a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs index 7d86ac7a..d786d7a8 100644 --- a/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs +++ b/CampusAppWP8/CampusAppWP8/Utility/Utilities.cs @@ -18,6 +18,7 @@ namespace CampusAppWP8.Utility using CampusAppWP8.Resources; using Microsoft.Phone.Net.NetworkInformation; using CampusAppWPortalLib8.Utility; + using CampusAppWPortalLib8.Model; /// /// Collection of utility functions. @@ -347,15 +348,15 @@ namespace CampusAppWP8.Utility /// Stubbfel, 27.08.2013. /// Generic type parameter. /// The load modus< t> - public static MainModel.ForceType GetLoadModus() + public static ForceType GetLoadModus() { if (Settings.AppSetting.OnlyWifi && !Settings.AppSetting.WifiEnable) { - return MainModel.ForceType.FORCE_FILE; + return ForceType.FORCE_FILE; } else { - return MainModel.ForceType.INVALID; + return ForceType.INVALID; } } diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs index e4e6fcca..80a45cb2 100644 --- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.Designer.cs @@ -61,29 +61,11 @@ namespace CampusAppWP8ScheduledTaskAgent.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die Hintergrunddienst für die BTU-Event-Feed ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die Hintergrunddienst für die BTU-CampusApp ähnelt. /// - public static string BackGroundTaskDesc_Event { + public static string BackGroundTaskDesc_BTUCampusApp { get { - return ResourceManager.GetString("BackGroundTaskDesc_Event", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Hintergrunddienst für die BTU-Mensa ähnelt. - /// - public static string BackGroundTaskDesc_Mensa { - get { - return ResourceManager.GetString("BackGroundTaskDesc_Mensa", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die Hintergrunddienst für die BTU-News-Feed ähnelt. - /// - public static string BackGroundTaskDesc_News { - get { - return ResourceManager.GetString("BackGroundTaskDesc_News", resourceCulture); + return ResourceManager.GetString("BackGroundTaskDesc_BTUCampusApp", resourceCulture); } } diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx index eeaa3432..2a55cf88 100644 --- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/AppResources.resx @@ -117,14 +117,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Hintergrunddienst für die BTU-Mensa - - - Hintergrunddienst für die BTU-Event-Feed - - - Hintergrunddienst für die BTU-News-Feed + + Hintergrunddienst für die BTU-CampusApp Die Mensa ist heute geschlossen diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants.resx index e71129ca..e360d985 100644 --- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants.resx @@ -117,13 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MensaTask - - - EventTask - - - NewsTask + + BTUCampusAppTask \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants1.Designer.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants1.Designer.cs index e475252a..5935bc3a 100644 --- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants1.Designer.cs +++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/Resources/Constants1.Designer.cs @@ -61,29 +61,11 @@ namespace CampusAppWP8ScheduledTaskAgent.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die EventTask ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die BTUCampusAppTask ähnelt. /// - public static string BackgroundTask_Event { + public static string BackgroundTask_BTUCampusApp { get { - return ResourceManager.GetString("BackgroundTask_Event", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die MensaTask ähnelt. - /// - public static string BackgroundTask_Mensa { - get { - return ResourceManager.GetString("BackgroundTask_Mensa", resourceCulture); - } - } - - /// - /// Sucht eine lokalisierte Zeichenfolge, die NewsTask ähnelt. - /// - public static string BackgroundTask_News { - get { - return ResourceManager.GetString("BackgroundTask_News", resourceCulture); + return ResourceManager.GetString("BackgroundTask_BTUCampusApp", resourceCulture); } } } diff --git a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs index 597e72cb..08d3aecd 100644 --- a/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs +++ b/CampusAppWP8/CampusAppWP8ScheduledTaskAgent/ScheduledAgent.cs @@ -43,6 +43,11 @@ namespace CampusAppWP8ScheduledTaskAgent /// private RSSViewModel newsModel; + /// + /// Variable for the runnig feeds + /// + private int runningFeeds; + #endregion #region Constructor @@ -70,19 +75,44 @@ namespace CampusAppWP8ScheduledTaskAgent /// the background Task protected override void OnInvoke(ScheduledTask task) { - switch (task.Name) + int notRunningFeeds = 0; + this.runningFeeds = 0; + ShellTile tileToFind = ShellTile.ActiveTiles.FirstOrDefault(x => x.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathNews_NewsIndexPage)); + if (tileToFind != null && tileToFind.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathNews_NewsIndexPage)) { - case "MensaTask": - this.HandleMensaTask(task); - break; + this.runningFeeds++; + this.HandleNewsTask(task); + } + else + { + notRunningFeeds++; + } - case "EventTask": - this.HandleEventTask(task); - break; + tileToFind = ShellTile.ActiveTiles.FirstOrDefault(x => x.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathMensa_MensaPage)); + if (tileToFind != null && tileToFind.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathMensa_MensaPage)) + { + this.runningFeeds++; + this.HandleMensaTask(task); + } + else + { + notRunningFeeds++; + } - case "NewsTask": - this.HandleNewsTask(task); - break; + tileToFind = ShellTile.ActiveTiles.FirstOrDefault(x => x.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathEvents_EventsIndexPage)); + if (tileToFind != null && tileToFind.NavigationUri.ToString().Contains(CampusAppWPortalLib8.Resources.Constants.PathEvents_EventsIndexPage)) + { + this.runningFeeds++; + this.HandleEventTask(task); + } + else + { + notRunningFeeds++; + } + + if (notRunningFeeds == 3) + { + BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_BTUCampusApp); } } @@ -183,15 +213,15 @@ namespace CampusAppWP8ScheduledTaskAgent data.WideContent1 = item.Date; data.WideContent2 = DefaultStringManager.ToShortString(item.Title, 40, "..."); data.WideContent3 = DefaultStringManager.ToShortString(item.Text, 40, "..."); - data.Count = this.newsModel.Channel[0].Item.Count; + //data.Count = this.newsModel.Channel[0].Item.Count; tileToFind.Update(data); - } - else - { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_News); + this.runningFeeds--; } - this.NotifyComplete(); + if (this.runningFeeds == 0) + { + this.NotifyComplete(); + } } /// @@ -210,15 +240,15 @@ namespace CampusAppWP8ScheduledTaskAgent data.WideContent1 = item.Date; data.WideContent2 = DefaultStringManager.ToShortString(item.Title, 40, "..."); data.WideContent3 = DefaultStringManager.ToShortString(item.Text, 40, "..."); - data.Count = this.eventModel.Channel[0].Item.Count; + //data.Count = this.eventModel.Channel[0].Item.Count; tileToFind.Update(data); - } - else - { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_Event); + this.runningFeeds--; } - this.NotifyComplete(); + if (this.runningFeeds == 0) + { + this.NotifyComplete(); + } } /// @@ -318,18 +348,18 @@ namespace CampusAppWP8ScheduledTaskAgent int randomNumber = random.Next(0, mealCount); MealModel meal = this.mensaModel.Menus[dayIndex].Meals[randomNumber]; data.WideContent3 = meal.MealName + ": " + DefaultStringManager.ToShortString(meal.MealDesc, 30, "..."); - data.Count = this.mensaModel.Menus[dayIndex].Meals.Count; + // data.Count = this.mensaModel.Menus[dayIndex].Meals.Count; } } tileToFind.Update(data); - } - else - { - BackgroundTasks.StopPerodicTask(Constants.BackgroundTask_Mensa); + this.runningFeeds--; } - this.NotifyComplete(); + if (this.runningFeeds == 0) + { + this.NotifyComplete(); + } } /// diff --git a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj index 409d1953..f7e93044 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj +++ b/CampusAppWP8/CampusAppWPortalLib8/CampusAppWPortalLib8.csproj @@ -33,14 +33,51 @@ 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AppResources.resx @@ -54,6 +91,7 @@ + diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/AbstractMainModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/AbstractMainModel.cs new file mode 100644 index 00000000..d43496b5 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/AbstractMainModel.cs @@ -0,0 +1,577 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 05.07.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Model +{ + using System; + using System.Collections.Generic; + using CampusAppWPortalLib8.Model.Utility; + using CampusAppWPortalLib8.Utility; + + /// + /// abstract Base model io handling class. + /// + /// model type + public abstract class AbstractMainModel + { + #region Member + + /// + /// File object. + /// + private AbstractFile file = null; + + /// + /// Model io type. + /// + private ModelType modelType; + + /// + /// Model object. + /// + private T model = default(T); + + /// + /// Web object. + /// + private AbstractHttpRequest api = null; + + /// + /// Filename of saved data. + /// + private string fileName = string.Empty; + + /// + /// Url of the feed data. + /// + private Uri httpApiUri = null; + + /// + /// Parameterized uri of the feed. + /// + private Uri paramizedUri = null; + + #endregion + + #region Constructor + + /// + /// Initializes a new instance of the class. + /// + /// Model IO type + /// name of the file + /// url of the feed + public AbstractMainModel(ModelType modelType, string fileName, string url) + { + this.Init(modelType, fileName, url); + } + + /// + /// Initializes a new instance of the class. + /// + /// Model IO type + /// name of the file or the url of the feed + public AbstractMainModel(ModelType modelType, string sourceName) + { + if (modelType == ModelType.File) + { + this.Init(modelType, sourceName, string.Empty); + } + else if (modelType == ModelType.Feed) + { + this.Init(modelType, string.Empty, sourceName); + } + else + { + throw new NotSupportedException("Wrong constructor was called for Feed and File support."); + } + } + + #endregion + + #region Events + + /// + /// Delegate of the OnIO callback function. + /// + public delegate void OnIO(); + + /// + /// Delegate of the OnFailed(File/Web) callback function. + /// + public delegate void OnFailed(); + + /// + /// Delegate of the IsModelUpToDate callback function. + /// + /// data model + /// true, model is up to date + public delegate bool IsModelUpToDate(T model); + + /// + /// Callback pointer, called before loading. + /// + public event OnIO OnLoading = null; + + /// + /// Callback pointer, called after loading. + /// + public event OnIO OnLoaded = null; + + /// + /// Callback pointer, called before saving. + /// + public event OnIO OnSaving = null; + + /// + /// Callback pointer, called after saving. + /// + public event OnIO OnSaved = null; + + /// + /// Callback pointer, called after failed file loading. + /// + public event OnFailed OnFailedFile = null; + + /// + /// Callback pointer, called after failed web loading. + /// + public event OnFailed OnFailedWeb = null; + + /// + /// Callback pointer, called after failed file or web loading, if there + /// is no specialized onFailed callback set. + /// + public event OnFailed OnFailedLoad = null; + + /// + /// Callback pointer, called after failed saving data to file. + /// + public event OnFailed OnFailedSave = null; + + /// + /// Callback pointer, for checking if model is up to date at loading. + /// + public event IsModelUpToDate IsModelUpToDateOnLoad = null; + + /// + /// Callback pointer, for checking if model is up to date at saving. + /// (currently unused) + /// +#pragma warning disable 0067 + public event IsModelUpToDate IsModelUpToDateOnSave = null; + + #endregion + + #region Property + + /// + /// Gets or sets the Model. + /// + public T Model + { + get + { + return this.model; + } + + set + { + this.model = value; + } + } + + /// + /// Gets or sets the File. + /// + public AbstractFile File + { + get { return this.file; } + protected set { this.file = value; } + } + + /// + /// Gets or sets the ModelType. + /// + public ModelType ModelType + { + get { return this.modelType; } + protected set { this.modelType = value; } + } + + /// + /// Gets or sets the Api. + /// + public AbstractHttpRequest Api + { + get { return this.api; } + protected set { this.api = value; } + } + + /// + /// Gets or sets the ApiUrl. + /// + public Uri HttpApiUri + { + get { return this.httpApiUri; } + protected set { this.httpApiUri = value; } + } + + /// + /// Gets or sets the FileName. + /// + public string FileName + { + get { return this.fileName; } + protected set { this.fileName = value; } + } + + #endregion + + #region Method + + #region public + + /// + /// Method Fire all Events for fail load + /// + public void FireLoadFailEvents() + { + this.RunOnFailedCallback(this.OnFailedWeb, this.OnFailedLoad); + } + + /// + /// Method Fire all Events for load is complete + /// + public void FireLoadCompletedEvents() + { + this.RunOnIOCallback(this.OnLoaded); + } + + /// + /// Forces a update from web. + /// + public void ForceWebUpdate() + { + this.LoadData(ForceType.FORCE_WEB); + } + + /// + /// Forces a update from file. + /// + public void ForceReadFile() + { + this.LoadData(ForceType.FORCE_FILE); + } + + /// + /// Load the data if necessary, from web or from file, regarding if + /// the file data is up to date. + /// + /// if set/not invalid/not default, force to load from web or file + public void LoadData(ForceType force = ForceType.INVALID) + { + this.RunOnIOCallback(this.OnLoading); + + // check which source is used for loading the data + if (force == ForceType.INVALID) + { + // if the model is not up to date + if (this.CheckIsNotUpToDate(this.IsModelUpToDateOnLoad) == true) + { + force = ForceType.FORCE_FILE; + + if (this.file != null) + { + // if the file does not exist or is size of 0 or is not + // up to date, then load from web + if ((this.file.Exist() == false) + || (this.CheckLoadFileIsNotUpToDate() == true)) + { + force = ForceType.FORCE_WEB; + } + } + else + { + // if the file object does not exist, load from web + force = ForceType.FORCE_WEB; + } + + // if the web object does not exist, load from file + if (this.api == null) + { + force = ForceType.FORCE_FILE; + } + } + else + { + // if it is up to date, nothing has to be loaded + this.RunOnIOCallback(this.OnLoaded); + } + } + + // load from web + if (force == ForceType.FORCE_WEB) + { + if (this.api != null) + { + if (this.paramizedUri != null) + { + this.SendHttpGet(this.paramizedUri); + } + else + { + this.SendHttpGet(this.httpApiUri); + } + } + else + { + // if web object does not exist, call OnFailed callbacks + this.RunOnFailedCallback(this.OnFailedWeb, this.OnFailedLoad); + } + } + + // load from file + if (force == ForceType.FORCE_FILE) + { + if (this.file != null) + { + byte[] data = this.file.ReadFile(); + + if (data == null) + { + this.RunOnFailedCallback(this.OnFailedFile, this.OnFailedLoad); + } + else + { + if (data.Length > 0) + { + this.DeserializeModel(data); + } + + this.RunOnIOCallback(this.OnLoaded); + } + } + else + { + // if file object does not exist, call OnFailed callbacks + this.RunOnFailedCallback(this.OnFailedFile, this.OnFailedLoad); + } + } + } + + /// + /// Save the model data if necessary. + /// + /// force saving. DEFAULT: false + public void SaveData(bool force = false) + { + if ((this.file != null) + && ((this.CheckSaveFileIsNotUpToDate() == true) || (force == true))) + { + this.RunOnIOCallback(this.OnSaving); + + byte[] data = this.SerializeModel(); + + if ((this.OnSaved != null) && (this.OnFailedSave != null)) + { + this.file.WriteFile(data, delegate { this.OnSaved(); }, delegate { this.OnFailedSave(); }); + } + else if (this.OnSaved != null) + { + this.file.WriteFile(data, delegate { this.OnSaved(); }, null); + } + else if (this.OnFailedSave != null) + { + this.file.WriteFile(data, null, delegate { this.OnFailedSave(); }); + } + else + { + this.file.WriteFile(data, null, null); + } + } + } + + /// + /// Return the model io type. + /// + /// model io type + public ModelType GetModelType() + { + return this.modelType; + } + + /// + /// Create the parameterized uri. + /// + /// uri parameter list + public void SetUriParams(List parameters) + { + if (this.api != null) + { + this.paramizedUri = this.api.CreateGetUrl(parameters); + } + } + + /// + /// Clear the parameterized uri. + /// + public void ClearUriParams() + { + this.paramizedUri = null; + } + + #endregion + + #region protected + + /// + /// Abstract declaration of the model deserialize function. + /// + /// model data as byte array + /// true, is succeeded + protected abstract bool DeserializeModel(byte[] modelData); + + /// + /// Abstract declaration of the model serialize function. + /// + /// model data as byte array + protected abstract byte[] SerializeModel(); + + /// + /// Method send a HttpGet + /// + /// the url + protected abstract void SendHttpGet(Uri url); + + /// + /// Method check if model or file is Not up-to-date + /// + /// the check function + /// true if it is not up-to-date, otherwise false + protected abstract bool CheckIsNotUpToDate(object checkFunc); + + /// + /// Method check if file is Not up-to-date for load process + /// + /// true if it is not up-to-date, otherwise false + protected abstract bool CheckLoadFileIsNotUpToDate(); + + /// + /// Method check if file is Not up-to-date for load process + /// + /// true if it is not up-to-date, otherwise false + protected abstract bool CheckSaveFileIsNotUpToDate(); + + /// + /// Initializes the file object. + /// + protected abstract void InitFile(); + + /// + /// Initializes the web object. + /// + protected abstract void InitHttpApi(); + + /// + /// Check if the model io type is file. + /// + /// true, if the model io type has file. + protected bool IsFile() + { + bool retValue = false; + + if ((this.modelType & ModelType.File) != 0) + { + retValue = true; + } + + return retValue; + } + + /// + /// Check if the model io type is feed. + /// + /// true if the model io type has feed. + protected bool IsHttpApi() + { + bool retValue = false; + + if ((this.modelType & ModelType.Feed) != 0) + { + retValue = true; + } + + return retValue; + } + + #endregion + + #region private + + /// + /// Initialize the class. Is called by the constructors. + /// + /// model IO type + /// name of the data file + /// url of the feed data + private void Init(ModelType modelType, string fileName, string url) + { + this.modelType = modelType; + + if ((url != null) && (url.Equals(string.Empty) == false)) + { + this.httpApiUri = new Uri(url, UriKind.Absolute); + } + + this.fileName = fileName; + + if ((this.IsFile() == true) + && (fileName.Equals(string.Empty) == false)) + { + this.InitFile(); + } + + if ((this.IsHttpApi() == true) + && (url.Equals(string.Empty) == false)) + { + this.InitHttpApi(); + } + } + + /// + /// Executes the on i/o callback operation. + /// + /// The callback function. + private void RunOnIOCallback(OnIO callbackFunc) + { + if (callbackFunc != null) + { + callbackFunc(); + } + } + + /// Executes the on failed callback operation. + /// The special function. + /// The default function. + private void RunOnFailedCallback(OnFailed specialFunc, OnFailed defaultFunc) + { + if (specialFunc != null) + { + specialFunc(); + } + else if (defaultFunc != null) + { + defaultFunc(); + } + } + + #endregion + + #endregion + } +} \ No newline at end of file diff --git a/CampusAppWP8/CampusAppWP8/Model/Departments/ChairModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/ChairModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Departments/ChairModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Departments/ChairModel.cs index 968f91ab..704796e6 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Departments/ChairModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/ChairModel.cs @@ -5,7 +5,7 @@ // fiedlchr // 24.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Departments +namespace CampusAppWPortalLib8.Model.Departments { using System.Globalization; using System.Xml.Serialization; diff --git a/CampusAppWP8/CampusAppWP8/Model/Departments/DepartmentModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/DepartmentModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Departments/DepartmentModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Departments/DepartmentModel.cs index 202bc929..37ca6719 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Departments/DepartmentModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/DepartmentModel.cs @@ -5,7 +5,7 @@ // fiedlchr // 24.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Departments +namespace CampusAppWPortalLib8.Model.Departments { using System; using System.Collections.ObjectModel; diff --git a/CampusAppWP8/CampusAppWP8/Model/Departments/FacultyModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/FacultyModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Departments/FacultyModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Departments/FacultyModel.cs index 3014dcf2..802fe20e 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Departments/FacultyModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Departments/FacultyModel.cs @@ -5,11 +5,11 @@ // fiedlchr // 24.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Departments +namespace CampusAppWPortalLib8.Model.Departments { using System.Collections.ObjectModel; using System.Xml.Serialization; - using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Resources; /// /// Model for holding the faculty information. diff --git a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs similarity index 84% rename from CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs index 407c65ab..551d5b7c 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamListModel.cs @@ -5,24 +5,25 @@ // stubbfel // 02.09.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Exams +namespace CampusAppWPortalLib8.Model.Exams { using System.Collections.Generic; using System.Collections.ObjectModel; using System.Xml.Serialization; - using CampusAppWP8.Model.Utility; + + using CampusAppWPortalLib8.Model.Utility; /// Exam list model. /// Stubbfel, 02.09.2013. [XmlRoot("links")] - public class ExamListModel + public class ExamListModel where T : ExamModel { #region Property /// Gets or sets the exams. /// The exams. [XmlElement("link")] - public ObservableCollection Exams { get; set; } + public ObservableCollection Exams { get; set; } #endregion @@ -34,7 +35,7 @@ namespace CampusAppWP8.Model.Exams public List CreateCourseList() { List result = new List(); - foreach (ExamModel exam in this.Exams) + foreach (T exam in this.Exams) { CourseModel tmpModel = new CourseModel(exam.CourseNumber, exam.CourseText); diff --git a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamModel.cs similarity index 83% rename from CampusAppWP8/CampusAppWP8/Model/Exams/ExamModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamModel.cs index e668fe35..31246ac3 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Exams/ExamModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Exams/ExamModel.cs @@ -5,10 +5,10 @@ // stubbfel // 02.09.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Exams +namespace CampusAppWPortalLib8.Model.Exams { using System.Xml.Serialization; - using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Utility; /// Exam model. /// Stubbfel, 02.09.2013. @@ -56,16 +56,6 @@ namespace CampusAppWP8.Model.Exams [XmlAttribute("link")] public string Link { get; set; } - /// Gets the caption. - /// The caption. - public string Caption - { - get - { - return Wp8StringManager.StripAndDecodeHTML(this.CourseText + " (" + this.Type + "/" + this.Version + ")"); - } - } - #endregion } } diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/ForcesTypes.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/ForcesTypes.cs new file mode 100644 index 00000000..5bfd2377 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/ForcesTypes.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CampusAppWPortalLib8.Model +{ + /// Values that represent ForceType for load function. + public enum ForceType + { + /// An enumeration constant representing the invalid/default/unset option. + INVALID = 0, + + /// An enumeration constant representing the force file option. + FORCE_FILE = 1, + + /// An enumeration constant representing the force web option. + FORCE_WEB = 2 + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/IXmlModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/IXmlModel.cs new file mode 100644 index 00000000..2543b356 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/IXmlModel.cs @@ -0,0 +1,27 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 05.07.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Model +{ + using CampusAppWPortalLib8.Utility; + + /// + /// Xml model io handler class. + /// + /// model type + public interface IXmlModel + { + #region Property + + /// + /// Gets or sets for the name of the root-tag + /// + string ValidRootName { get; set; } + + #endregion + } +} \ No newline at end of file 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 db0feb15..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.Info; - } - 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/CampusAppWP8/Model/Link/LinkListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkListModel.cs similarity index 97% rename from CampusAppWP8/CampusAppWP8/Model/Link/LinkListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkListModel.cs index c512e9ea..6895ca07 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Link/LinkListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkListModel.cs @@ -6,7 +6,7 @@ // 02.07.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Link +namespace CampusAppWPortalLib8.Model.Link { using System; using System.Collections.ObjectModel; diff --git a/CampusAppWP8/CampusAppWP8/Model/Link/LinkModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Link/LinkModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkModel.cs index d25e347d..9e2a67cb 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Link/LinkModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Link/LinkModel.cs @@ -6,7 +6,7 @@ // 02.07.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Link +namespace CampusAppWPortalLib8.Model.Link { using System.Globalization; using System.Xml.Serialization; diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs index bb76fcf7..51d6c551 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs @@ -9,8 +9,8 @@ namespace CampusAppWPortalLib8.Model.Mensa { using System.Xml.Serialization; using CampusAppWPortalLib8.Resources; - using CampusAppWPortalLib8.Utility; - + using CampusAppWPortalLib8.Utility; + /// /// Model for a meal /// @@ -21,47 +21,47 @@ namespace CampusAppWPortalLib8.Model.Mensa /// /// Constant for the vegetarian icon /// - private const string MealIconNameVegetarian = "CARROTTE"; + public const string MealIconNameVegetarian = "CARROTTE"; /// /// Constant for the free icon /// - private const string MealIconNameFree = "FREI"; + public const string MealIconNameFree = "FREI"; /// /// Constant for the pig icon /// - private const string MealIconNamePig = "SCHWEIN"; + public const string MealIconNamePig = "SCHWEIN"; /// /// Constant for the cow icon /// - private const string MealIconNameCow = "RIND"; + public const string MealIconNameCow = "RIND"; /// /// Constant for the fowl icon /// - private const string MealIconNameFowl = "GEFL"; + public const string MealIconNameFowl = "GEFL"; /// /// Constant for the cow-pig icon /// - private const string MealIconNameCowPig = "RINDSCHWEIN"; + public const string MealIconNameCowPig = "RINDSCHWEIN"; /// /// Constant for the fish icon /// - private const string MealIconNameFish = "FISCH"; + public const string MealIconNameFish = "FISCH"; /// /// Constant for the wild icon /// - private const string MealIconNameWild = "WILD"; + public const string MealIconNameWild = "WILD"; /// /// Constant for the lamb icon /// - private const string MealIconNameLamb = "LAMM"; + public const string MealIconNameLamb = "LAMM"; /// /// Variable for the id of the meal @@ -140,6 +140,17 @@ namespace CampusAppWPortalLib8.Model.Mensa } } + /// + /// Gets or sets the icon url + /// + public string IconUrl { get; set; } + + /// + /// Gets or sets the icon name + /// + [XmlAttribute("icon")] + public string IconName { get; set; } + #endregion #region Methods diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/ModelTypes.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/ModelTypes.cs new file mode 100644 index 00000000..9964b4e3 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/ModelTypes.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CampusAppWPortalLib8.Model +{ + /// + /// Specifies the I/O type of the model. + /// + public enum ModelType + { + /// + /// Invalid/unset state. + /// + INVALID = 0, + + /// + /// File only (01). + /// + File = 1, + + /// + /// Feed only (10). + /// + Feed = 2, + + /// + /// File and feed (11). + /// + FileAndFeed = 3 + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursInstitutionModel.cs similarity index 71% rename from CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursInstitutionModel.cs index 8acc2b0a..33d038f5 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursInstitutionModel.cs @@ -6,7 +6,7 @@ // 24.06.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Openinghours +namespace CampusAppWPortalLib8.Model.Openinghours { using System.Globalization; using System.Windows; @@ -426,138 +426,6 @@ namespace CampusAppWP8.Model.Openinghours } } - /// - /// Gets the visibility state of the monday TextBlock. - /// - public Visibility VisibleMonday - { - get - { - return ((this.dayMonday == string.Empty) || (this.dayMonday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the tuesday TextBlock. - /// - public Visibility VisibleTuesday - { - get - { - return ((this.dayTuesday == string.Empty) || (this.dayTuesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the wednesday TextBlock. - /// - public Visibility VisibleWednesday - { - get - { - return ((this.dayWednesday == string.Empty) || (this.dayWednesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the thursday TextBlock. - /// - public Visibility VisibleThursday - { - get - { - return ((this.dayThursday == string.Empty) || (this.dayThursday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the friday TextBlock. - /// - public Visibility VisibleFriday - { - get - { - return ((this.dayFriday == string.Empty) || (this.dayFriday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the saturday TextBlock. - /// - public Visibility VisibleSaturday - { - get - { - return ((this.daySaturday == string.Empty) || (this.daySaturday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the sunday TextBlock. - /// - public Visibility VisibleSunday - { - get - { - return ((this.daySunday == string.Empty) || (this.daySunday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the comment. - /// - public Visibility VisibleComment - { - get - { - return ((this.Comment == string.Empty) || (this.Comment.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the email address. - /// - public Visibility VisibleEMail - { - get - { - return ((this.infoEmail == string.Empty) || (this.infoEmail.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the phone number. - /// - public Visibility VisiblePhone - { - get - { - return ((this.infoPhone == string.Empty) || (this.infoPhone.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the room. - /// - public Visibility VisibleRoom - { - get - { - return ((this.infoRoom == string.Empty) || (this.infoRoom.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - - /// - /// Gets the visibility state of the building. - /// - public Visibility VisibleBuilding - { - get - { - return ((this.infoBuilding == string.Empty) || (this.infoBuilding.Length == 0)) ? Visibility.Collapsed : Visibility.Visible; - } - } - #endregion #region Method diff --git a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursModel.cs similarity index 84% rename from CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursModel.cs index 59b7caa7..edb61de4 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Openinghours/OpeninghoursModel.cs @@ -6,7 +6,7 @@ // 24.06.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Openinghours +namespace CampusAppWPortalLib8.Model.Openinghours { using System; using System.Collections.ObjectModel; @@ -16,7 +16,7 @@ namespace CampusAppWP8.Model.Openinghours /// Model for opening hours. /// [XmlRoot("root")] - public class OpeninghoursModel + public class OpeninghoursModel where T: OpeninghoursInstitutionModel { #region Member @@ -28,7 +28,7 @@ namespace CampusAppWP8.Model.Openinghours /// /// Gets or sets feed information item list. /// - private ObservableCollection institutions; + private ObservableCollection institutions; #endregion @@ -39,7 +39,7 @@ namespace CampusAppWP8.Model.Openinghours /// public OpeninghoursModel() { - this.institutions = new ObservableCollection(); + this.institutions = new ObservableCollection(); this.createTime = DateTime.Now; } @@ -63,7 +63,7 @@ namespace CampusAppWP8.Model.Openinghours /// [XmlArray("data")] [XmlArrayItem("institution")] - public ObservableCollection Institutions + public ObservableCollection Institutions { get { diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonFunctionModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonFunctionModel.cs new file mode 100644 index 00000000..6bc47b1b --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonFunctionModel.cs @@ -0,0 +1,23 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 01.10.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Model.Person +{ + /// + /// Interface for PersonFunctionModel classes + /// + public interface IPersonFunctionModel + { + /// Gets or sets the identifier of the person. + /// The identifier of the person. + string PersonID { get; set; } + + /// Gets or sets zero-based index of the function. + /// The function index. + int FunctionIndex { get; set; } + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs new file mode 100644 index 00000000..fcb2db88 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/IPersonModel.cs @@ -0,0 +1,30 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// stubbfel +// 01.10.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Model.Person +{ + using System.Collections.ObjectModel; + + /// + /// Interface for PersonModel classes + /// + /// PersonFunctionModel template + public interface IPersonModel where T : IPersonFunctionModel + { + /// Gets or sets the functions of a person. + /// The functions. + ObservableCollection Functions { get; set; } + + /// Gets or sets the identifier. + /// The identifier. + string ID { get; set; } + + /// Sets person identifier to function. + /// Stubbfel, 05.09.2013. + void SetPersonIdToFunction(); + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonFunctionModel.cs similarity index 86% rename from CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonFunctionModel.cs index 0a0ddc9f..017e51df 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonFunctionModel.cs @@ -5,14 +5,14 @@ // stubbfel // 05.09.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Person +namespace CampusAppWPortalLib8.Model.Person { using System.Xml.Serialization; - using CampusAppWP8.Utility; + using CampusAppWPortalLib8.Utility; /// Person function model. /// Stubbfel, 05.09.2013. - public class PersonFunctionModel + public class PersonFunctionModel : IPersonFunctionModel { #region Member @@ -55,7 +55,7 @@ namespace CampusAppWP8.Model.Person { if (value != null && value != string.Empty && value != this.tel1) { - this.tel1 = Wp8StringManager.CreateUniTelefonNumber(value); + this.tel1 = DefaultStringManager.CreateUniTelefonNumber(value); } } } @@ -74,7 +74,7 @@ namespace CampusAppWP8.Model.Person { if (value != null && value != string.Empty && value != this.tel2) { - this.tel2 = Wp8StringManager.CreateUniTelefonNumber(value); + this.tel2 = DefaultStringManager.CreateUniTelefonNumber(value); } } } @@ -93,7 +93,7 @@ namespace CampusAppWP8.Model.Person { if (value != null && value != string.Empty && value != this.fax) { - this.fax = Wp8StringManager.CreateUniTelefonNumber(value); + this.fax = DefaultStringManager.CreateUniTelefonNumber(value); } } } @@ -112,7 +112,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.function) { - this.function = Wp8StringManager.StripAndDecodeHTML(value); + this.function = value; } } } @@ -131,7 +131,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.appointment) { - this.appointment = Wp8StringManager.StripAndDecodeHTML(value); + this.appointment = value; } } } @@ -150,7 +150,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.building) { - this.building = Wp8StringManager.StripAndDecodeHTML(value); + this.building = value; } } } @@ -167,7 +167,7 @@ namespace CampusAppWP8.Model.Person set { - if (value != null && value != this.mail && Wp8StringManager.IsValidEmail(value)) + if (value != null && value != this.mail && DefaultStringManager.IsValidEmail(value)) { this.mail = value; } diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs similarity index 61% rename from CampusAppWP8/CampusAppWP8/Model/Person/PersonListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs index 8af959d0..d79729a8 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonListModel.cs @@ -6,7 +6,7 @@ // 05.09.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Person +namespace CampusAppWPortalLib8.Model.Person { using System.Collections.Generic; using System.Collections.ObjectModel; @@ -14,15 +14,16 @@ namespace CampusAppWP8.Model.Person /// Person list model. /// Stubbfel, 05.09.2013. + /// personModel template [XmlRoot("Uebersicht")] - public class PersonListModel + public class PersonListModel { #region Property /// Gets or sets the persons. /// The persons. [XmlElement("person")] - public ObservableCollection Persons { get; set; } + public ObservableCollection Persons { get; set; } #endregion @@ -32,9 +33,13 @@ namespace CampusAppWP8.Model.Person /// Stubbfel, 05.09.2013. public void SetPersonIdToFunction() { - foreach (PersonModel person in this.Persons) + foreach (T item in this.Persons) { - person.SetPersonIdToFunction(); + IPersonModel person = item as IPersonModel; + if (person != null) + { + person.SetPersonIdToFunction(); + } } } @@ -42,17 +47,23 @@ namespace CampusAppWP8.Model.Person /// Stubbfel, 05.09.2013. /// The identifier. /// The person. - public PersonModel GetPerson(string id) + public IPersonModel GetPerson(string id) { - foreach (PersonModel tmpPerson in this.Persons) + foreach (T item in this.Persons) { + IPersonModel tmpPerson = item as IPersonModel; + if (tmpPerson == null) + { + continue; + } + if (tmpPerson.ID.Equals(id)) { return tmpPerson; } } - return null; + return default(IPersonModel); } /// Removes the non function and set identifiers person. @@ -67,16 +78,22 @@ namespace CampusAppWP8.Model.Person /// Stubbfel, 05.09.2013. public void RemoveNonFunctionPerson() { - List removeList = new List(); - foreach (PersonModel tmpPerson in this.Persons) + List removeList = new List(); + foreach (T item in this.Persons) { + IPersonModel tmpPerson = item as IPersonModel; + if (tmpPerson == null) + { + continue; + } + if (tmpPerson.Functions.Count < 1) { - removeList.Add(tmpPerson); + removeList.Add(item); } } - foreach (PersonModel removePerson in removeList) + foreach (T removePerson in removeList) { this.Persons.Remove(removePerson); } diff --git a/CampusAppWP8/CampusAppWP8/Model/Person/PersonModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs similarity index 83% rename from CampusAppWP8/CampusAppWP8/Model/Person/PersonModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs index d4acbbcd..931104d3 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Person/PersonModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Person/PersonModel.cs @@ -5,15 +5,15 @@ // stubbfel // 05.09.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.Person +namespace CampusAppWPortalLib8.Model.Person { using System.Collections.ObjectModel; using System.Xml.Serialization; - using CampusAppWP8.Utility; /// Person model. /// Stubbfel, 05.09.2013. - public class PersonModel + /// template for the PersonFunction-Class + public class PersonModel : IPersonModel where T : IPersonFunctionModel { #region Member @@ -30,7 +30,7 @@ namespace CampusAppWP8.Model.Person private string id; /// The functions. - private ObservableCollection functions; + private ObservableCollection functions; #endregion @@ -70,7 +70,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.akadgrad) { - this.akadgrad = Wp8StringManager.StripAndDecodeHTML(value); + this.akadgrad = value; } } } @@ -89,7 +89,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.surName) { - this.surName = Wp8StringManager.StripAndDecodeHTML(value); + this.surName = value; } } } @@ -108,7 +108,7 @@ namespace CampusAppWP8.Model.Person { if (value != this.firstName) { - this.firstName = Wp8StringManager.StripAndDecodeHTML(value); + this.firstName = value; } } } @@ -116,7 +116,7 @@ namespace CampusAppWP8.Model.Person /// Gets or sets the functions of a person. /// The functions. [XmlElement("funktion")] - public ObservableCollection Functions + public ObservableCollection Functions { get { @@ -157,10 +157,14 @@ namespace CampusAppWP8.Model.Person } int index = 0; - foreach (PersonFunctionModel function in this.functions) + foreach (T item in this.functions) { - function.PersonID = this.ID; - function.FunctionIndex = index++; + IPersonFunctionModel function = item as IPersonFunctionModel; + if (function != null) + { + function.PersonID = this.ID; + function.FunctionIndex = index++; + } } } diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/CampusTypes.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/CampusTypes.cs new file mode 100644 index 00000000..950f2490 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/CampusTypes.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CampusAppWPortalLib8.Model.Settings +{ + /// + /// 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 + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/DegreeTypes.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/DegreeTypes.cs new file mode 100644 index 00000000..f1cbbb79 --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/DegreeTypes.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CampusAppWPortalLib8.Model.Settings +{ + /// + /// Specifies the degrees. + /// + public enum DegreeType + { + /// + /// bachelor degree + /// + BACHELOR = 82, + + /// + /// master degree + /// + MASTER = 88, + + /// + /// diploma degree + /// + DIPLOM = 11 + } +} diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/RolesTypes.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/RolesTypes.cs new file mode 100644 index 00000000..cda9ee5c --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Settings/RolesTypes.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CampusAppWPortalLib8.Model.Settings +{ + /// + /// Specifies the role of the user. + /// + public enum RoleType + { + /// + /// for students (01). + /// + STUDENT = 1, + + /// + /// for staffs (10). + /// + STAFF = 2, + } +} diff --git a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilListModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilListModel.cs index 914798d1..5f17053a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilListModel.cs @@ -5,7 +5,7 @@ // stubbfel // 02.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.StudentCouncil +namespace CampusAppWPortalLib8.Model.StudentCouncil { using System; using System.Collections.Generic; diff --git a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilModel.cs similarity index 95% rename from CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilModel.cs index 1009645e..9b28289b 100644 --- a/CampusAppWP8/CampusAppWP8/Model/StudentCouncil/StudentCouncilModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/StudentCouncil/StudentCouncilModel.cs @@ -6,10 +6,10 @@ // 02.07.2013 //----------------------------------------------------------------------------- -namespace CampusAppWP8.Model.StudentCouncil +namespace CampusAppWPortalLib8.Model.StudentCouncil { + using CampusAppWPortalLib8.Resources; using System.Xml.Serialization; - using CampusAppWP8.Resources; /// /// Model for menu diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs similarity index 71% rename from CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs index 60469c7f..aa60217e 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/CampusListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CampusListPickerItemListModel.cs @@ -4,9 +4,10 @@ // stubbfel // 08.08.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { - using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Resources; + using CampusAppWPortalLib8.Model.Utility; /// /// This Class creates a list of degrees @@ -33,10 +34,10 @@ namespace CampusAppWP8.Model.Utility /// 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 diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseListPickerItemListModel.cs similarity index 56% rename from CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseListPickerItemListModel.cs index fb606444..884df21a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseListPickerItemListModel.cs @@ -4,80 +4,20 @@ // stubbfel // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { - using System.Collections.Generic; using System.Linq; - using CampusAppWP8.Feed.Utility; - using CampusAppWP8.Utility; /// /// This is a class for the courseList /// - public class CourseListPickerItemListModel : ListPickerItemListModel + public abstract class CourseListPickerItemListModel : ListPickerItemListModel { - #region Member - - /// List of courses. - private CourseFeed courseList; - - #endregion - - #region Constructor - - /// - /// Initializes a new instance of the class. - /// - public CourseListPickerItemListModel() - { - } - - #endregion - - #region Events - - /// - /// Delegate of the OnIO callback function. - /// - public delegate void OnIO(); - - /// - /// Callback pointer, called after loading. - /// - public event OnIO OnLoaded = null; - - #endregion - - #region Method - - #region public - - /// - /// Overrides the LoadList-Method - /// - 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 /// Fall back list. /// Stubbfel, 10.09.2013. - private void FallBackList() + protected void FallBackList() { this.AddItem(new ListPickerItemModel("017", "Bauingenieurwesen")); this.AddItem(new ListPickerItemModel("021", "Betriebswirtschaftslehre")); @@ -123,48 +63,6 @@ namespace CampusAppWP8.Model.Utility this.List = this.List.OrderBy(o => o.Text).ToList(); } - /// Feed is fail. - /// Stubbfel, 10.09.2013. - private void FeedIsFail() - { - this.FallBackList(); - this.CallOnLoaded(); - } - - /// Feed is ready. - /// Stubbfel, 10.09.2013. - private void FeedIsReady() - { - this.ConvertToListPickerItemModel(this.courseList.Model.CreateCourseList()); - this.CallOnLoaded(); - } - - /// Converts a courseList to a list picker item model. - /// Stubbfel, 10.09.2013. - /// List of courses. - private void ConvertToListPickerItemModel(List 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(); - } - - /// Call on loaded. - /// Stubbfel, 10.09.2013. - private void CallOnLoaded() - { - if (this.OnLoaded != null) - { - this.OnLoaded(); - } - } - - #endregion - #endregion } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseModel.cs similarity index 97% rename from CampusAppWP8/CampusAppWP8/Model/Utility/CourseModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseModel.cs index bba93443..0921c76c 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/CourseModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/CourseModel.cs @@ -5,7 +5,7 @@ // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { using System; diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/DegreeListPickerItemListModel.cs similarity index 74% rename from CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/DegreeListPickerItemListModel.cs index 515eda2a..8ae21a53 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/DegreeListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/DegreeListPickerItemListModel.cs @@ -4,9 +4,10 @@ // stubbfel // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { - using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Resources; + using CampusAppWPortalLib8.Model.Utility; /// /// This Class creates a list of degrees @@ -33,9 +34,9 @@ namespace CampusAppWP8.Model.Utility /// 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 diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemListModel.cs similarity index 98% rename from CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemListModel.cs index f9985ff4..bbcd1a64 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemListModel.cs @@ -5,7 +5,7 @@ // stubbfel // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { using System.Collections.Generic; diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemModel.cs similarity index 96% rename from CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemModel.cs index d20163bc..0a394f3a 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/ListPickerItemModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/ListPickerItemModel.cs @@ -5,7 +5,7 @@ // stubbfel // 13.06.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { /// /// Model for the ListPickerItems diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/RoleListPickerItemListModel.cs similarity index 68% rename from CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/RoleListPickerItemListModel.cs index e185f875..24ceb6b3 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/RoleListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/RoleListPickerItemListModel.cs @@ -4,9 +4,10 @@ // stubbfel // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { - using CampusAppWP8.Resources; + using CampusAppWPortalLib8.Resources; + using CampusAppWPortalLib8.Model.Utility; /// /// Class for the RoleList @@ -33,8 +34,8 @@ namespace CampusAppWP8.Model.Utility /// 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 diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/SemesterListPickerItemListModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/SemesterListPickerItemListModel.cs similarity index 88% rename from CampusAppWP8/CampusAppWP8/Model/Utility/SemesterListPickerItemListModel.cs rename to CampusAppWP8/CampusAppWPortalLib8/Model/Utility/SemesterListPickerItemListModel.cs index 44e206d1..07e254b0 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Utility/SemesterListPickerItemListModel.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Utility/SemesterListPickerItemListModel.cs @@ -4,10 +4,8 @@ // stubbfel // 25.07.2013 //---------------------------------------------------------------------- -namespace CampusAppWP8.Model.Utility +namespace CampusAppWPortalLib8.Model.Utility { - using CampusAppWP8.Resources; - /// /// Class for the SemesterList /// @@ -33,9 +31,9 @@ namespace CampusAppWP8.Model.Utility /// 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 diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs index 4ff4a10f..fe2e04e7 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs @@ -61,6 +61,78 @@ namespace CampusAppWPortalLib8.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 Bachelor ähnelt. + /// + public static string Degree_Bachelor { + get { + return ResourceManager.GetString("Degree_Bachelor", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Diplom ähnelt. + /// + public static string Degree_Diploma { + get { + return ResourceManager.GetString("Degree_Diploma", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Master ähnelt. + /// + public static string Degree_Master { + get { + return ResourceManager.GetString("Degree_Master", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Fakultät ähnelt. + /// + public static string Faculty { + get { + return ResourceManager.GetString("Faculty", resourceCulture); + } + } + /// /// Sucht eine lokalisierte Zeichenfolge, die Aktion ähnelt. /// @@ -132,5 +204,23 @@ namespace CampusAppWPortalLib8.Resources { return ResourceManager.GetString("MensaApp_Soup", resourceCulture); } } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Mitarbeiter ähnelt. + /// + public static string Setting_RoleStaff { + get { + return ResourceManager.GetString("Setting_RoleStaff", resourceCulture); + } + } + + /// + /// Sucht eine lokalisierte Zeichenfolge, die Student ähnelt. + /// + public static string Setting_RoleStudent { + get { + return ResourceManager.GetString("Setting_RoleStudent", resourceCulture); + } + } } } diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx index 1fe86252..51ef3544 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx +++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx @@ -117,6 +117,30 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Cottbus Hauptcampus + + + Cottbus Nordcampus + + + Cottbus Südcampus + + + Senftenberg Hauptcampus + + + Bachelor + + + Diplom + + + Master + + + Fakultät + Aktion @@ -141,4 +165,10 @@ Suppe + + Mitarbeiter + + + Student + \ No newline at end of file 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. /// diff --git a/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop b/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop index 54487d17..4bc40550 100644 --- a/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop +++ b/CampusAppWP8/CampusAppWPortalLib8/Settings.StyleCop @@ -1,6 +1,8 @@ + akadgrad + api nfc param qr diff --git a/CampusAppWP8/CampusAppWPortalLib8/Utility/AbstractFile.cs b/CampusAppWP8/CampusAppWPortalLib8/Utility/AbstractFile.cs new file mode 100644 index 00000000..0724f50e --- /dev/null +++ b/CampusAppWP8/CampusAppWPortalLib8/Utility/AbstractFile.cs @@ -0,0 +1,52 @@ +//----------------------------------------------------------------------------- +// +// Company copyright tag. +// +// fiedlchr +// 03.05.2013 +//----------------------------------------------------------------------------- +namespace CampusAppWPortalLib8.Utility +{ + /// + /// File class. + /// + public abstract class AbstractFile + { + #region Events + + /// + /// Delegation of the write callback function prototype. + /// + public delegate void WriteCallbackFunc(); + + #endregion + + #region Method + + #region public + + /// Read data from file to a string. + /// Stubbfel, 03.09.2013. + /// data string. + public abstract byte[] ReadFile(); + + /// Write bytes to the file. + /// Stubbfel, 03.09.2013. + /// data byte array. + /// callback function, called after writing is done. + /// callback function, called when writing failed. + public abstract void WriteFile(byte[] data, WriteCallbackFunc onSavedCallback, WriteCallbackFunc onFailedCallback); + + /// + /// Check if a file is existing. + /// + /// true, if file exists, otherwise false + public abstract bool Exist(); + + + #endregion + + + #endregion + } +} \ No newline at end of file diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/attention_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/attention_159.png new file mode 100644 index 00000000..8a744ee0 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/attention_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/happy_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/happy_159.png new file mode 100644 index 00000000..1a434f91 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/happy_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/question_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/question_159.png new file mode 100644 index 00000000..ebd3d365 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/question_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/sad_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/sad_159.png new file mode 100644 index 00000000..8ac05aac Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/sad_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/carotte_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/carotte_159.png new file mode 100644 index 00000000..f0627ae4 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/carotte_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/chicken_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/chicken_159.png new file mode 100644 index 00000000..99648eb0 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/chicken_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/fish_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/fish_159.png new file mode 100644 index 00000000..f024b538 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/fish_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/frei_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/frei_159.png new file mode 100644 index 00000000..a91223bc Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/frei_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/lamb_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/lamb_159.png new file mode 100644 index 00000000..1aa58f4d Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/lamb_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/pork_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/pork_159.png new file mode 100644 index 00000000..fa8e0dc3 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/pork_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/steak_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/steak_159.png new file mode 100644 index 00000000..d5a0b3b3 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/steak_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/wild dish_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/wild dish_159.png new file mode 100644 index 00000000..db496c28 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/food/wild dish_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/btu_account.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/btu_account_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/btu_account.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/btu_account_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/call.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/call_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/call.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/call_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/campusplan.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/campusplan_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/campusplan.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/campusplan_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/delete.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/delete_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/delete.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/delete_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/down.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/down_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/down.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/down_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/edit.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/edit_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/edit.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/edit_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/hausaufgaben.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/hausaufgaben_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/hausaufgaben.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/hausaufgaben_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/info.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/info_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/info.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/info_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/infopoint.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/infopoint_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/infopoint.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/infopoint_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle_159.png new file mode 100644 index 00000000..02d15bff Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/lehrstuehle_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/links.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/links_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/links.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/links_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/mail.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/mail_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/mail.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/mail_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/notenspiegel.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/notenspiegel_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/notenspiegel.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/notenspiegel_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/openinghours.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/openinghours_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/openinghours.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/openinghours_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/personen.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/personen_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/personen.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/personen_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/reload.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/reload_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/reload.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/reload_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/save.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/save_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/save.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/save_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/search.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/search_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/search.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/search_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/stundenplan.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/stundenplan_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/stundenplan.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/stundenplan_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/stundenplan_add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/stundenplan_add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/stundenplan_add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/stundenplan_add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/survey.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/survey_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/survey.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/survey_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/termine.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/termine_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/termine.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/termine_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/termine_add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/termine_add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/termine_add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/termine_add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/up.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/up_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/up.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/up_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/vereine.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/vereine_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/vereine.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/vereine_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/vorlesungsverzeichnis.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/vorlesungsverzeichnis_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/vorlesungsverzeichnis.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/functions/vorlesungsverzeichnis_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/exams.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/exams_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/exams.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/exams_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/info.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/info_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/info.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/info_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lab.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lab_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lab.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lab_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lecture.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lecture_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lecture.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lecture_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/practise.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/practise_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/practise.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/practise_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/seminar.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/seminar_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/seminar.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/seminar_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_contact.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_contact_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_contact.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_contact_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_small.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_small_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_small.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_small_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/delete.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/delete_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/delete.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/delete_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/edit_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/edit_159.png new file mode 100644 index 00000000..9a6d716d Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/edit_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/prefs.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/prefs_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/prefs.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/prefs_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/save.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/save_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/save.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/save_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/search.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/search_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/search.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/search_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/carotte_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/carotte_159.png new file mode 100644 index 00000000..65e38e19 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/carotte_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/chicken_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/chicken_159.png new file mode 100644 index 00000000..a55fb55f Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/chicken_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/fish_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/fish_159.png new file mode 100644 index 00000000..43efdae6 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/fish_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/frei_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/frei_159.png new file mode 100644 index 00000000..958246cf Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/frei_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/lamb_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/lamb_159.png new file mode 100644 index 00000000..74098f3d Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/lamb_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/pork_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/pork_159.png new file mode 100644 index 00000000..1eb5c3cd Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/pork_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/steak_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/steak_159.png new file mode 100644 index 00000000..134e5c77 Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/steak_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/wild dish_159.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/wild dish_159.png new file mode 100644 index 00000000..eaaea78b Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/food/wild dish_159.png differ diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search_159.png diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair_159.png similarity index 100% rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair.png rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair_159.png diff --git a/CampusAppWP8/IconCreator/scripts/IconCreator.pyc b/CampusAppWP8/IconCreator/scripts/IconCreator.pyc index 4517557c..0a2c3608 100644 Binary files a/CampusAppWP8/IconCreator/scripts/IconCreator.pyc and b/CampusAppWP8/IconCreator/scripts/IconCreator.pyc differ diff --git a/CampusAppWP8/IconCreator/scripts/createspng.py b/CampusAppWP8/IconCreator/scripts/createspng.py index 756f8668..92fa299f 100644 --- a/CampusAppWP8/IconCreator/scripts/createspng.py +++ b/CampusAppWP8/IconCreator/scripts/createspng.py @@ -5,40 +5,48 @@ os.chdir("srcImages/functions") for files in os.listdir("."): if files.endswith(".svg"): fileName, fileExtension = os.path.splitext(files) - IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/functions/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") - IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/functions/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") + IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/functions/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") + IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/functions/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") os.chdir("../../") os.chdir("srcImages/emotions") for files in os.listdir("."): if files.endswith(".svg"): fileName, fileExtension = os.path.splitext(files) - IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/emotions/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Emotion Speechbubble") - IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/emotions/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Emotion Speechbubble") + IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/emotions/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Emotion Speechbubble") + IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/emotions/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Emotion Speechbubble") os.chdir("../../") os.chdir("srcImages/listicons") for files in os.listdir("."): if files.endswith(".svg"): fileName, fileExtension = os.path.splitext(files) - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/listicons/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/listicons/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/listicons/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/listicons/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") os.chdir("../../") os.chdir("srcImages/optionbuttons") for files in os.listdir("."): if files.endswith(".svg"): fileName, fileExtension = os.path.splitext(files) - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/optionbuttons/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/optionbuttons/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/optionbuttons/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/optionbuttons/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") os.chdir("../../") os.chdir("srcImages/others") for files in os.listdir("."): if files.endswith(".svg"): fileName, fileExtension = os.path.splitext(files) - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/others/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") - IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/others/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/others/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/others/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") +os.chdir("../../") + +os.chdir("srcImages/food") +for files in os.listdir("."): + if files.endswith(".svg"): + fileName, fileExtension = os.path.splitext(files) + IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/food/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon") + IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/food/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon") os.chdir("../../") diff --git a/CampusAppWP8/IconCreator/srcImages/food/carotte.svg b/CampusAppWP8/IconCreator/srcImages/food/carotte.svg new file mode 100644 index 00000000..ae2d87ce --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/carotte.svg @@ -0,0 +1,172 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/chicken.svg b/CampusAppWP8/IconCreator/srcImages/food/chicken.svg new file mode 100644 index 00000000..d11621f7 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/chicken.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/fish.svg b/CampusAppWP8/IconCreator/srcImages/food/fish.svg new file mode 100644 index 00000000..88d93253 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/fish.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/frei.svg b/CampusAppWP8/IconCreator/srcImages/food/frei.svg new file mode 100644 index 00000000..49f0ebd5 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/frei.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/lamb.svg b/CampusAppWP8/IconCreator/srcImages/food/lamb.svg new file mode 100644 index 00000000..24678b61 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/lamb.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/pork.svg b/CampusAppWP8/IconCreator/srcImages/food/pork.svg new file mode 100644 index 00000000..3ae39ccf --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/pork.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/steak.svg b/CampusAppWP8/IconCreator/srcImages/food/steak.svg new file mode 100644 index 00000000..52c59ba9 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/steak.svg @@ -0,0 +1,83 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/CampusAppWP8/IconCreator/srcImages/food/wild dish.svg b/CampusAppWP8/IconCreator/srcImages/food/wild dish.svg new file mode 100644 index 00000000..1be0be02 --- /dev/null +++ b/CampusAppWP8/IconCreator/srcImages/food/wild dish.svg @@ -0,0 +1,64 @@ + + + + + + image/svg+xml + + + + + + + + + + +