Merge branch 'release/r#211' into develmaster

CampusAppWP8/CampusAppDLL/Model/Campusmap/MapModel.cs

@@ -8,6 +8,7 @@
 namespace CampusAppDLL.Model.Campusmap
 {
     using CampusAppDLL.Model.GeoDb;
+    using CampusAppDLL.Utility;
     using System;
 
     /// <summary>
@@ -41,6 +42,8 @@ namespace CampusAppDLL.Model.Campusmap
         /// <remarks>Stubbfel, 19.08.2013.</remarks>
         protected virtual void LoadSpatials(string xmlFilePath)
         {
+            SpsModel model = XmlManager.DeserializationFileToModel<SpsModel>(xmlFilePath);
+            this.Spatial = model;
         }
 
         #endregion

CampusAppWP8/CampusAppWP8/Api/GeoApi/CampusSpsApi.cs

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

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;
 
     /// <summary>Pis api.</summary>
     /// <remarks>Stubbfel, 09.09.2013.</remarks>

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;
 
     /// <summary>Pss api.</summary>

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;     
 
     /// <summary>
     /// Class for SPSAPI

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;
     
     /// <summary>
     /// Class for the feed of the Lecture
@@ -17,7 +18,7 @@ namespace CampusAppWP8.Api.Lecture
     /// <remarks>
     /// need the XmlAPI
     /// </remarks>
-    public class LectureApi : XmlModel<LectureList>
+    public class LectureApi : XmlModel<LectureWp8List>
     {
         #region Constructor
 

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;
 
     /// <summary>Person search api.</summary>
     /// <remarks>Stubbfel, 05.09.2013.</remarks>
-    public class PersonSearchApi : XmlModel<PersonListModel>
+    public class PersonSearchApi : XmlModel<PersonListWp8Model>
     {
         #region Constructor
 

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();

CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj

@@ -97,6 +97,7 @@
     <Compile Include="Api\GeoApi\PisApi.cs" />
     <Compile Include="Api\GeoApi\PssApi.cs" />
     <Compile Include="Api\GeoApi\SpsApi.cs" />
+    <Compile Include="Api\Lecture\LectureApi.cs" />
     <Compile Include="Api\Person\PersonSearchApi.cs" />
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
@@ -119,23 +120,20 @@
     <Compile Include="Model\Campusmap\HiddenPinPlaceModel.cs" />
     <Compile Include="Model\Campusmap\InfoPlacePinModel.cs" />
     <Compile Include="Model\Campusmap\SearchPlacePinModel.cs" />
-    <Compile Include="Model\Exams\ExamListModel.cs" />
-    <Compile Include="Model\Exams\ExamModel.cs" />
+    <Compile Include="Model\Exams\ExamListWp8Model.cs" />
+    <Compile Include="Model\Exams\ExamWp8Model.cs" />
     <Compile Include="Model\GeoDb\CampusBuildingLayerModel.cs" />
     <Compile Include="Model\GeoDb\CampusBuildingModel.cs" />
     <Compile Include="Model\GeoDb\PlaceInformation.cs" />
     <Compile Include="Model\GeoDb\PlaceModel.cs" />
     <Compile Include="Model\GeoDb\PlaceService.cs" />
     <Compile Include="Model\GeoDb\SpsModel.cs" />
-    <Compile Include="Model\Person\PersonFunctionModel.cs" />
-    <Compile Include="Model\Person\PersonListModel.cs" />
-    <Compile Include="Model\Person\PersonModel.cs" />
+    <Compile Include="Model\Person\PersonFunctionWp8Model.cs" />
+    <Compile Include="Model\Person\PersonListWp8Model.cs" />
+    <Compile Include="Model\Person\PersonWp8Model.cs" />
     <Compile Include="Model\Setting\AppSettings.cs" />
     <Compile Include="Model\Setting\UserProfilModel.cs" />
-    <Compile Include="Model\Utility\CourseListPickerItemListModel.cs" />
-    <Compile Include="Model\Utility\CourseModel.cs" />
-    <Compile Include="Model\Utility\DegreeListPickerItemListModel.cs" />
-    <Compile Include="Model\Utility\CampusListPickerItemListModel.cs" />
+    <Compile Include="Model\Utility\CourseListPickerItemListWp8Model.cs" />
     <Compile Include="Pages\Campusmap\RoomListPage.xaml.cs">
       <DependentUpon>RoomListPage.xaml</DependentUpon>
     </Compile>
@@ -163,9 +161,6 @@
     <Compile Include="Utility\NDEF\NDEFMessage.cs" />
     <Compile Include="Utility\NDEF\NDEFRecord.cs" />
     <Compile Include="Utility\NDEF\NDEFShortRecord.cs" />
-    <Compile Include="Model\Utility\RoleListPickerItemListModel.cs" />
-    <Compile Include="Model\Utility\SemesterListPickerItemListModel.cs" />
-    <Compile Include="Model\Utility\ListPickerItemListModel.cs" />
     <Compile Include="Pages\Dev\NFC.xaml.cs">
       <DependentUpon>NFC.xaml</DependentUpon>
     </Compile>
@@ -189,28 +184,16 @@
     <Compile Include="LocalizedStrings.cs" />
     <Compile Include="Model\Campusmap\MapModel.cs" />
     <Compile Include="Model\Campusmap\MapPinModel.cs" />
-    <Compile Include="Model\Departments\ChairModel.cs" />
-    <Compile Include="Model\Departments\DepartmentModel.cs" />
-    <Compile Include="Model\Departments\FacultyModel.cs" />
-    <Compile Include="Model\Lecture\LectureActivity.cs" />
-    <Compile Include="Model\Lecture\LectureCourse.cs" />
-    <Compile Include="Model\Lecture\LectureDate.cs" />
-    <Compile Include="Model\Lecture\LectureLecturer.cs" />
-    <Compile Include="Model\Lecture\LectureList.cs" />
-    <Compile Include="Model\Lecture\LectureModule.cs" />
+    <Compile Include="Model\Lecture\LectureWp8Activity.cs" />
+    <Compile Include="Model\Lecture\LectureWp8List.cs" />
     <Compile Include="Model\Lecture\LecturePageModel.cs" />
     <Compile Include="Model\MainModel.cs" />
-    <Compile Include="Model\Link\LinkModel.cs" />
-    <Compile Include="Model\Link\LinkListModel.cs" />
-    <Compile Include="Model\Openinghours\OpeninghoursInstitutionModel.cs" />
-    <Compile Include="Model\Openinghours\OpeninghoursModel.cs" />
-    <Compile Include="Model\StudentCouncil\StudentCouncilListModel.cs" />
-    <Compile Include="Model\StudentCouncil\StudentCouncilModel.cs" />
+    <Compile Include="Model\Openinghours\OpeninghoursInstitutionWp8Model.cs" />
+    <Compile Include="Model\Openinghours\OpeninghoursWp8Model.cs" />
     <Compile Include="Model\XmlModel.cs" />
     <Compile Include="Pages\Campusmap\CampusMapPage.xaml.cs">
       <DependentUpon>CampusMapPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Api\Lecture\LectureApi.cs" />
     <Compile Include="Feed\Departments\DepartmentFeed.cs" />
     <Compile Include="Pages\Departments\DepartmentFavoritePage.xaml.cs">
       <DependentUpon>DepartmentFavoritePage.xaml</DependentUpon>
@@ -238,7 +221,6 @@
     <Compile Include="Pages\Lecture\ModulWebPage.xaml.cs">
       <DependentUpon>ModulWebPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Model\Utility\ListPickerItemModel.cs" />
     <Compile Include="Pages\Lecture\ResultDetailPage.xaml.cs">
       <DependentUpon>ResultDetailPage.xaml</DependentUpon>
     </Compile>
@@ -443,35 +425,48 @@
     <Content Include="Assets\Icons\DarkTheme\add_contact_159.png" />
     <Content Include="Assets\Icons\DarkTheme\btulogo_159.png" />
     <Content Include="Assets\Icons\DarkTheme\campus_159.png" />
+    <Content Include="Assets\Icons\DarkTheme\carotte_159.png" />
+    <Content Include="Assets\Icons\DarkTheme\chicken_159.png" />
     <Content Include="Assets\Icons\DarkTheme\current_position_159.png" />
     <Content Include="Assets\Icons\DarkTheme\delete_159.png" />
     <Content Include="Assets\Icons\DarkTheme\exams_159.png" />
     <Content Include="Assets\Icons\DarkTheme\favorite_159.png" />
+    <Content Include="Assets\Icons\DarkTheme\fish_159.png" />
+    <Content Include="Assets\Icons\DarkTheme\frei_159.png" />
     <Content Include="Assets\Icons\DarkTheme\info_159.png" />
     <Content Include="Assets\Icons\DarkTheme\lab_159.png" />
+    <Content Include="Assets\Icons\DarkTheme\lamb_159.png" />
     <Content Include="Assets\Icons\DarkTheme\lecture_159.png" />
     <Content Include="Assets\Icons\DarkTheme\person_159.png" />
     <Content Include="Assets\Icons\DarkTheme\phone_159.png" />
     <Content Include="Assets\Icons\DarkTheme\placeinfo_159.png" />
+    <Content Include="Assets\Icons\DarkTheme\pork_159.png" />
     <Content Include="Assets\Icons\DarkTheme\practise_159.png" />
     <Content Include="Assets\Icons\DarkTheme\search_place_159.png" />
     <Content Include="Assets\Icons\DarkTheme\seminar_159.png" />
+    <Content Include="Assets\Icons\DarkTheme\steak_159.png" />
     <Content Include="Assets\Icons\DarkTheme\update_159.png" />
+    <Content Include="Assets\Icons\DarkTheme\wild dish_159.png" />
     <Content Include="Assets\Icons\LightTheme\add_159.png" />
     <Content Include="Assets\Icons\LightTheme\add_contact_159.png" />
     <Content Include="Assets\Icons\LightTheme\btulogo_159.png" />
     <Content Include="Assets\Icons\LightTheme\campus_159.png" />
     <Content Include="Assets\Icons\DarkTheme\departments_159.png" />
+    <Content Include="Assets\Icons\LightTheme\carotte_159.png" />
+    <Content Include="Assets\Icons\LightTheme\chicken_159.png" />
     <Content Include="Assets\Icons\LightTheme\current_position_159.png" />
     <Content Include="Assets\Icons\LightTheme\delete_159.png" />
     <Content Include="Assets\Icons\LightTheme\departments_159.png" />
     <Content Include="Assets\Icons\DarkTheme\homework_159.png" />
     <Content Include="Assets\Icons\LightTheme\exams_159.png" />
     <Content Include="Assets\Icons\LightTheme\favorite_159.png" />
+    <Content Include="Assets\Icons\LightTheme\fish_159.png" />
+    <Content Include="Assets\Icons\LightTheme\frei_159.png" />
     <Content Include="Assets\Icons\LightTheme\homework_159.png" />
     <Content Include="Assets\Icons\DarkTheme\link_159.png" />
     <Content Include="Assets\Icons\LightTheme\info_159.png" />
     <Content Include="Assets\Icons\LightTheme\lab_159.png" />
+    <Content Include="Assets\Icons\LightTheme\lamb_159.png" />
     <Content Include="Assets\Icons\LightTheme\lecture_159.png" />
     <Content Include="Assets\Icons\LightTheme\link_159.png" />
     <Content Include="Assets\Icons\DarkTheme\lectures_159.png" />
@@ -486,6 +481,7 @@
     <Content Include="Assets\Icons\LightTheme\person_159.png" />
     <Content Include="Assets\Icons\LightTheme\phone_159.png" />
     <Content Include="Assets\Icons\LightTheme\placeinfo_159.png" />
+    <Content Include="Assets\Icons\LightTheme\pork_159.png" />
     <Content Include="Assets\Icons\LightTheme\practise_159.png" />
     <Content Include="Assets\Icons\LightTheme\schedule_159.png" />
     <Content Include="Assets\Icons\DarkTheme\search_159.png" />
@@ -493,10 +489,12 @@
     <Content Include="Assets\Icons\DarkTheme\student_council_159.png" />
     <Content Include="Assets\Icons\LightTheme\search_place_159.png" />
     <Content Include="Assets\Icons\LightTheme\seminar_159.png" />
+    <Content Include="Assets\Icons\LightTheme\steak_159.png" />
     <Content Include="Assets\Icons\LightTheme\student_council_159.png" />
     <Content Include="Assets\Icons\DarkTheme\webmail_159.png" />
     <Content Include="Assets\Icons\LightTheme\update_159.png" />
     <Content Include="Assets\Icons\LightTheme\webmail_159.png" />
+    <Content Include="Assets\Icons\LightTheme\wild dish_159.png" />
     <Content Include="Assets\Lens.Screen-720p.png" />
     <Content Include="Assets\Lens.Screen-WVGA.png" />
     <Content Include="Assets\Lens.Screen-WXGA.png" />

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;
     
     /// <summary>
     /// Feed class for the department information.

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;
 
     /// <summary>
     /// Event Feed.

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;
 
      /// <summary>Exam feed.</summary>
      /// <remarks>Stubbfel, 02.09.2013.</remarks>
-     public class ExamFeed : XmlModel<ExamListModel>
+     public class ExamFeed : XmlModel<ExamListWp8Model>
      {
          #region Constructor
 
@@ -38,7 +39,7 @@ namespace CampusAppWP8.Feed.Exams
          /// <remarks>Stubbfel, 02.09.2013.</remarks>
          /// <param name="model">The model.</param>
          /// <returns>true if it succeeds, false if it fails.</returns>
-         private bool CheckIsModelUpToDate(ExamListModel model)
+         private bool CheckIsModelUpToDate(ExamListWp8Model model)
          {
              if (model == null)
              {
@@ -53,7 +54,7 @@ namespace CampusAppWP8.Feed.Exams
          /// <param name="model">   The model.</param>
          /// <param name="fileInfo">Information describing the file.</param>
          /// <returns>true if it succeeds, false if it fails.</returns>
-         private bool CheckIsFileUpToDate(ExamListModel model, FileInfo fileInfo)
+         private bool CheckIsFileUpToDate(ExamListWp8Model model, FileInfo fileInfo)
          {
              if (fileInfo == null || !fileInfo.Exists || fileInfo.Length < 1)
              {

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;
 
     /// <summary>
     /// This Class is for ClubLinkFeeds

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;
 
     /// <summary>
     /// This Class is for CommonLinkFeeds

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

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

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

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

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

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;
 
     /// <summary>
     /// News Feed.

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;
     
     /// <summary>
     /// This Class is for MesaFeeds
     /// </summary>
-    public class OpeninghoursFeed : XmlModel<OpeninghoursModel>
+    public class OpeninghoursFeed : XmlModel<OpeninghoursWp8Model>
     {
         #region Constructor
 
@@ -41,7 +42,7 @@ namespace CampusAppWP8.Feed.Openinghours
         /// </summary>
         /// <param name="model">reference of the FeedModel</param>
         /// <returns>true, if model is up-to-date, otherwise false</returns>
-        private bool CheckIsModelUpToDate(OpeninghoursModel model)
+        private bool CheckIsModelUpToDate(OpeninghoursWp8Model model)
         {
             bool retValue = true;
 
@@ -63,7 +64,7 @@ namespace CampusAppWP8.Feed.Openinghours
         /// <param name="model">reference of the FeedModel</param>
         /// <param name="info">info about the file</param>
         /// <returns>true, if file is up-to-date, otherwise false</returns>
-        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
         /// <param name="model">reference of the FeedModel</param>
         /// <param name="info">info about the file</param>
         /// <returns>true, if file is up-to-date, otherwise false</returns>
-        private bool CheckIsFileUpToDateOnSave(OpeninghoursModel model, FileInfo info)
+        private bool CheckIsFileUpToDateOnSave(OpeninghoursWp8Model model, FileInfo info)
         {
             bool retValue = true;
 

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;
 
     /// <summary>
     /// This Class is for  StudentCouncilFeed

CampusAppWP8/CampusAppWP8/File/Campusmap/Offlinemap.xml

@@ -506,50 +506,50 @@
   <place id="12201001" parentId="122" refpoint="POINT(14.321819584737424 51.766205632061464)">
     <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG Eingang</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Haupteingang</placeInformation>
+    <placeInformation placeInformationName="Name">Haupteingang</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG Eingang</placeInformation>
     <placeInformation placeInformationName="Typ">Zugangsbereich</placeInformation>
   </place>
   <place id="12201002" parentId="122" refpoint="POINT(14.321372454534156 51.766214390733424)">
     <placeInformation placeInformationName="Barrierefreiheit">Kein Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG Eingang</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Nebeneingang</placeInformation>
+    <placeInformation placeInformationName="Name">Nebeneingang</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG Eingang</placeInformation>
     <placeInformation placeInformationName="Typ">Zugangsbereich</placeInformation>
   </place>
   <place id="12201003" parentId="122" refpoint="POINT(14.321388220143675 51.76597019895933)">
     <placeInformation placeInformationName="Barrierefreiheit">Kein Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG Eingang</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Nebeneingang</placeInformation>
+    <placeInformation placeInformationName="Name">Nebeneingang</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG Eingang</placeInformation>
     <placeInformation placeInformationName="Typ">Zugangsbereich</placeInformation>
   </place>
   <place id="12201004" parentId="122" refpoint="POINT(14.321939315783041 51.76599157011889)">
     <placeInformation placeInformationName="Barrierefreiheit">Kein Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG Eingang</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Nebeneingang</placeInformation>
+    <placeInformation placeInformationName="Name">Nebeneingang</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG Eingang</placeInformation>
     <placeInformation placeInformationName="Typ">Zugangsbereich</placeInformation>
   </place>
   <place id="12201005" parentId="122" refpoint="POINT(14.321800052898967 51.76602853171455)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG Aufzug</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Aufzug</placeInformation>
+    <placeInformation placeInformationName="Name">Aufzug</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG Aufzug</placeInformation>
     <placeInformation placeInformationName="Typ">Zugangsbereich</placeInformation>
   </place>
   <place id="12201006" parentId="122" refpoint="POINT(14.321842620044665 51.766109461843406)">
     <placeInformation placeInformationName="Barrierefreiheit">Kein Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG Treppe</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Treppe</placeInformation>
+    <placeInformation placeInformationName="Name">Treppe</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG Treppe</placeInformation>
     <placeInformation placeInformationName="Typ">Zugangsbereich</placeInformation>
   </place>
   <place id="12201007" parentId="122" refpoint="POINT(14.321473004088197 51.766229192888986)">
     <placeInformation placeInformationName="Barrierefreiheit">Kein Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG Treppe</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Treppe</placeInformation>
+    <placeInformation placeInformationName="Name">Treppe</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG Treppe</placeInformation>
     <placeInformation placeInformationName="Typ">Zugangsbereich</placeInformation>
   </place>
   <place id="12201101" parentId="122" refpoint="POINT(14.321731384910802 51.76617751672447)">
@@ -583,8 +583,8 @@
   <place id="12201105" parentId="122" refpoint="POINT(14.321409661372636 51.766160717591674)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.105</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Sekretariat</placeInformation>
+    <placeInformation placeInformationName="Name">Sekretariat</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.105</placeInformation>
     <placeInformation placeInformationName="Typ">Büro</placeInformation>
   </place>
   <place id="12201106" parentId="122" refpoint="POINT(14.321404160926654 51.76611813292864)">
@@ -597,43 +597,43 @@
   <place id="12201107" parentId="122" refpoint="POINT(14.321393168793357 51.76607906925173)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.107</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Name">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.107</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201108" parentId="122" refpoint="POINT(14.32140144573835 51.76605445738353)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.108</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Name">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.108</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201109" parentId="122" refpoint="POINT(14.321369914519321 51.76605038460108)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.109</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Name">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.109</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201110" parentId="122" refpoint="POINT(14.321363082755193 51.766009683052516)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.110</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Name">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.110</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201111" parentId="122" refpoint="POINT(14.321418787908812 51.766007335728425)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.111</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Name">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.111</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201112" parentId="122" refpoint="POINT(14.321430787289371 51.76603422485134)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.112</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Name">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.112</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201113" parentId="122" refpoint="POINT(14.32147142752725 51.76600864952922)">
@@ -709,78 +709,78 @@
   <place id="12201125" parentId="122" refpoint="POINT(14.321913740460934 51.766043071109976)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.125</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Name">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.125</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201126" parentId="122" refpoint="POINT(14.321881975677314 51.76606198984141)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.126</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Name">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.126</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201128" parentId="122" refpoint="POINT(14.321920747398497 51.76609877626362)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.128</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Name">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.128</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201130" parentId="122" refpoint="POINT(14.321882559588778 51.76615413107038)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.130</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Name">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.130</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201133" parentId="122" refpoint="POINT(14.32171392011893 51.766119131417234)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.133</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Herrentoilette</placeInformation>
+    <placeInformation placeInformationName="Name">Herrentoilette</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.133</placeInformation>
     <placeInformation placeInformationName="Typ">WC</placeInformation>
   </place>
   <place id="12201134" parentId="122" refpoint="POINT(14.32166017690783 51.76612736456887)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.134</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">CO2 - Labor</placeInformation>
+    <placeInformation placeInformationName="Name">CO2 - Labor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.134</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201135" parentId="122" refpoint="POINT(14.321497966303266 51.7661215488107)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.135</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Schulungsraum</placeInformation>
+    <placeInformation placeInformationName="Name">Schulungsraum</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.135</placeInformation>
     <placeInformation placeInformationName="Typ">Büro</placeInformation>
   </place>
   <place id="12201137" parentId="122" refpoint="POINT(14.321512021834275 51.766064472796224)">
     <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.137</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Herrentoilette</placeInformation>
+    <placeInformation placeInformationName="Name">Herrentoilette</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.137</placeInformation>
     <placeInformation placeInformationName="Typ">WC</placeInformation>
   </place>
   <place id="12201138" parentId="122" refpoint="POINT(14.321617434588697 51.766043158696725)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.138</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Aufenthaltsraum</placeInformation>
+    <placeInformation placeInformationName="Name">Aufenthaltsraum</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.138</placeInformation>
     <placeInformation placeInformationName="Typ">Mehrzweck</placeInformation>
   </place>
   <place id="12201139" parentId="122" refpoint="POINT(14.321691848265607 51.766031684836456)">
     <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.139</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Damentoilette</placeInformation>
+    <placeInformation placeInformationName="Name">Damentoilette</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.139</placeInformation>
     <placeInformation placeInformationName="Typ">WC</placeInformation>
   </place>
   <place id="12201140" parentId="122" refpoint="POINT(14.321811439172507 51.7660700478196)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.140</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Name">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.140</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12201149" parentId="122" refpoint="POINT(14.321892544474805 51.76598386248757)">
@@ -793,22 +793,22 @@
   <place id="12202001" parentId="122" refpoint="POINT(14.32178498045603 51.76603289576545)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG Aufzug</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Aufzug</placeInformation>
+    <placeInformation placeInformationName="Name">Aufzug</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG Aufzug</placeInformation>
     <placeInformation placeInformationName="Typ">Zugangsbereich</placeInformation>
   </place>
   <place id="12202002" parentId="122" refpoint="POINT(14.321830781758962 51.76611231270356)">
     <placeInformation placeInformationName="Barrierefreiheit">Kein Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG Treppe</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Treppe</placeInformation>
+    <placeInformation placeInformationName="Name">Treppe</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG Treppe</placeInformation>
     <placeInformation placeInformationName="Typ">Zugangsbereich</placeInformation>
   </place>
   <place id="12202003" parentId="122" refpoint="POINT(14.321472915309439 51.76622912703583)">
     <placeInformation placeInformationName="Barrierefreiheit">Kein Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG Treppe</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Treppe</placeInformation>
+    <placeInformation placeInformationName="Name">Treppe</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG Treppe</placeInformation>
     <placeInformation placeInformationName="Typ">Zugangsbereich</placeInformation>
   </place>
   <place id="12202201" parentId="122" refpoint="POINT(14.321948576547241 51.766157973941354)">
@@ -947,8 +947,8 @@
   <place id="12202222" parentId="122" refpoint="POINT(14.321635951140061 51.765987374592804)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.222</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Seminarraum</placeInformation>
+    <placeInformation placeInformationName="Name">Seminarraum</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.222</placeInformation>
     <placeInformation placeInformationName="Typ">Büro</placeInformation>
   </place>
   <place id="12202223" parentId="122" refpoint="POINT(14.32171550814332 51.76597813029314)">
@@ -961,8 +961,8 @@
   <place id="12202224" parentId="122" refpoint="POINT(14.32176817263844 51.765971407166106)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.224</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Sekretariat</placeInformation>
+    <placeInformation placeInformationName="Name">Sekretariat</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.224</placeInformation>
     <placeInformation placeInformationName="Typ">Büro</placeInformation>
   </place>
   <place id="12202225" parentId="122" refpoint="POINT(14.321821957654727 51.76596468403906)">
@@ -982,82 +982,82 @@
   <place id="12202227" parentId="122" refpoint="POINT(14.321875182410432 51.766048723127014)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.227</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Name">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.227</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12202228" parentId="122" refpoint="POINT(14.321791983713357 51.766061469055344)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.228</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Name">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.228</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12202231" parentId="122" refpoint="POINT(14.321798986970688 51.766089482084666)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.231</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Archiv</placeInformation>
+    <placeInformation placeInformationName="Name">Archiv</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.231</placeInformation>
     <placeInformation placeInformationName="Typ">Mehrzweck</placeInformation>
   </place>
   <place id="12202233" parentId="122" refpoint="POINT(14.321917061889259 51.766100127035806)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.233</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Drohnenlabor</placeInformation>
+    <placeInformation placeInformationName="Name">Drohnenlabor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.233</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="12202235" parentId="122" refpoint="POINT(14.321693657980457 51.766117214983694)">
     <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.235</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Herrentoilette</placeInformation>
+    <placeInformation placeInformationName="Name">Herrentoilette</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.235</placeInformation>
     <placeInformation placeInformationName="Typ">WC</placeInformation>
   </place>
   <place id="12202236" parentId="122" refpoint="POINT(14.321614521172638 51.76612687947881)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.236</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Aufenthaltsraum</placeInformation>
+    <placeInformation placeInformationName="Name">Aufenthaltsraum</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.236</placeInformation>
     <placeInformation placeInformationName="Typ">Mehrzweck</placeInformation>
   </place>
   <place id="12202237" parentId="122" refpoint="POINT(14.321545188925075 51.7661355635179)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.237</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Aufenthaltsraum</placeInformation>
+    <placeInformation placeInformationName="Name">Aufenthaltsraum</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.237</placeInformation>
     <placeInformation placeInformationName="Typ">Mehrzweck</placeInformation>
   </place>
   <place id="12202238" parentId="122" refpoint="POINT(14.321502889250807 51.766141726384355)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.238</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.238</placeInformation>
     <placeInformation placeInformationName="Typ">Mehrzweck</placeInformation>
   </place>
   <place id="12202239" parentId="122" refpoint="POINT(14.321492804560254 51.7661027882736)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.239</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.239</placeInformation>
     <placeInformation placeInformationName="Typ">Mehrzweck</placeInformation>
   </place>
   <place id="12202240" parentId="122" refpoint="POINT(14.321468433224748 51.76606497068403)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.240</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.240</placeInformation>
     <placeInformation placeInformationName="Typ">Mehrzweck</placeInformation>
   </place>
   <place id="12202241" parentId="122" refpoint="POINT(14.321511656370866 51.766058844659796)">
     <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.241</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Herrentoilette</placeInformation>
+    <placeInformation placeInformationName="Name">Herrentoilette</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.241</placeInformation>
     <placeInformation placeInformationName="Typ">WC</placeInformation>
   </place>
   <place id="12202243" parentId="122" refpoint="POINT(14.321674048859936 51.76603989902278)">
     <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.243</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Damentoilette</placeInformation>
+    <placeInformation placeInformationName="Name">Damentoilette</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.243</placeInformation>
     <placeInformation placeInformationName="Typ">WC</placeInformation>
   </place>
   <place id="15700001" parentId="157" refpoint="POINT(14.329315418318455 51.76714537418786)">
@@ -1631,97 +1631,6 @@
     <placeInformation placeInformationName="Name">Treppe</placeInformation>
     <placeInformation placeInformationName="Typ">Treppe</placeInformation>
   </place>
-  <place id="15706004" parentId="157" refpoint="POINT(14.329308768150003 51.7674103103678)">
-    <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Carrels</placeInformation>
-    <placeInformation placeInformationName="Thema">Carrels</placeInformation>
-    <placeInformation placeInformationName="Typ">Arbeitsplatz</placeInformation>
-  </place>
-  <place id="15706005" parentId="157" refpoint="POINT(14.329274385592601 51.76736481780034)">
-    <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Mediathek</placeInformation>
-    <placeInformation placeInformationName="Thema">Mediathek</placeInformation>
-    <placeInformation placeInformationName="Typ">Regal</placeInformation>
-  </place>
-  <place id="15706006" parentId="157" refpoint="POINT(14.32935028450333 51.767341896095424)">
-    <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Lehrbuchsammlung</placeInformation>
-    <placeInformation placeInformationName="Thema">Lehrbuchsammlung</placeInformation>
-    <placeInformation placeInformationName="Typ">Regal</placeInformation>
-  </place>
-  <place id="15706007" parentId="157" refpoint="POINT(14.329421388567619 51.767387154767924)">
-    <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Medienarbeitsplatz, PC Fernsehaufzeichnungen</placeInformation>
-    <placeInformation placeInformationName="Thema">Medienarbeitsplatz, PC Fernsehaufzeichnungen</placeInformation>
-    <placeInformation placeInformationName="Typ">Arbeitsplatz</placeInformation>
-  </place>
-  <place id="15706008" parentId="157" refpoint="POINT(14.329454250807856 51.767385016299826)">
-    <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Publikationsarbeitsplatz, sehbehindertengerechter Arbeitsplatz</placeInformation>
-    <placeInformation placeInformationName="Thema">Publikationsarbeitsplatz, sehbehindertengerechter Arbeitsplatz</placeInformation>
-    <placeInformation placeInformationName="Typ">Arbeitsplatz</placeInformation>
-  </place>
-  <place id="15706009" parentId="157" refpoint="POINT(14.329577981235516 51.76736563643267)">
-    <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Carrels</placeInformation>
-    <placeInformation placeInformationName="Thema">Carrels</placeInformation>
-    <placeInformation placeInformationName="Typ">Arbeitsplatz</placeInformation>
-  </place>
-  <place id="15706010" parentId="157" refpoint="POINT(14.329570454070817 51.76727813845883)">
-    <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Bücherregal</placeInformation>
-    <placeInformation placeInformationName="Thema">Informatik und Kybernetik</placeInformation>
-    <placeInformation placeInformationName="Typ">Regal</placeInformation>
-  </place>
-  <place id="15706011" parentId="157" refpoint="POINT(14.329369814731512 51.76724213989996)">
-    <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Helpdesk</placeInformation>
-    <placeInformation placeInformationName="Thema">Helpdesk</placeInformation>
-    <placeInformation placeInformationName="Typ">Information</placeInformation>
-  </place>
-  <place id="15706012" parentId="157" refpoint="POINT(14.329404431183866 51.76725979896855)">
-    <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Bücherregal</placeInformation>
-    <placeInformation placeInformationName="Thema">Optimierung und Stochastik</placeInformation>
-    <placeInformation placeInformationName="Typ">Regal</placeInformation>
-  </place>
-  <place id="15706013" parentId="157" refpoint="POINT(14.329318696155221 51.76711678891444)">
-    <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Zeitschriftenregal</placeInformation>
-    <placeInformation placeInformationName="Thema">Zeitschriften</placeInformation>
-    <placeInformation placeInformationName="Typ">Regal</placeInformation>
-  </place>
-  <place id="15706014" parentId="157" refpoint="POINT(14.329249393385792 51.76698651398463)">
-    <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Lesesaal</placeInformation>
-    <placeInformation placeInformationName="Thema">Lesesaal</placeInformation>
-    <placeInformation placeInformationName="Typ">Arbeitsplatz</placeInformation>
-  </place>
-  <place id="15706015" parentId="157" refpoint="POINT(14.329534276293742 51.76710714074783)">
-    <placeInformation placeInformationName="Barrierefreiheit">Limitierter Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Bücherregal</placeInformation>
-    <placeInformation placeInformationName="Thema">Mathematik</placeInformation>
-    <placeInformation placeInformationName="Typ">Regal</placeInformation>
-  </place>
-  <place id="15706016" parentId="157" refpoint="POINT(14.32969830556799 51.76710498974964)">
-    <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
-    <placeInformation placeInformationName="Ebene">6. Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">Fachreferenten</placeInformation>
-    <placeInformation placeInformationName="Thema">Fachreferenten</placeInformation>
-    <placeInformation placeInformationName="Typ">Arbeitsplatz</placeInformation>
-  </place>
   <place id="122011031" parentId="122" refpoint="POINT(14.321571276387507 51.766199588577784)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
@@ -1739,29 +1648,29 @@
   <place id="122011081" parentId="122" refpoint="POINT(14.321397679509385 51.766038341427155)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.108a</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Name">Labor SDB</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.108a</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="122011251" parentId="122" refpoint="POINT(14.32187853059968 51.76604815113973)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.125a</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Name">PC - Labor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.125a</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="122011341" parentId="122" refpoint="POINT(14.321612266972247 51.76613608820613)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.134a</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">CO2 - Labor</placeInformation>
+    <placeInformation placeInformationName="Name">CO2 - Labor</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.134a</placeInformation>
     <placeInformation placeInformationName="Typ">Labor</placeInformation>
   </place>
   <place id="122011351" parentId="122" refpoint="POINT(14.321552760555003 51.76614330535182)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Erdgeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.135a</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Technik/ Lager</placeInformation>
+    <placeInformation placeInformationName="Name">Technik/ Lager</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.135a</placeInformation>
     <placeInformation placeInformationName="Typ">Mehrzweck</placeInformation>
   </place>
   <place id="122022421" parentId="122" refpoint="POINT(14.321380939196514 51.7660469489685)">
@@ -1774,8 +1683,8 @@
   <place id="122022425" parentId="122" refpoint="POINT(14.321594912052113 51.76604788273614)">
     <placeInformation placeInformationName="Barrierefreiheit">Voller Zugang</placeInformation>
     <placeInformation placeInformationName="Ebene">Obergeschoss</placeInformation>
-    <placeInformation placeInformationName="Name">MZG R.242e</placeInformation>
-    <placeInformation placeInformationName="Raumnummer">Aufenthaltsraum</placeInformation>
+    <placeInformation placeInformationName="Name">Aufenthaltsraum</placeInformation>
+    <placeInformation placeInformationName="Raumnummer">MZG R.242e</placeInformation>
     <placeInformation placeInformationName="Typ">Mehrzweck</placeInformation>
   </place>
 </root>

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;
 
     /// <summary>
     /// Feed object to handle favorite department feeds. 

CampusAppWP8/CampusAppWP8/File/Exams/ExamFile.cs

@@ -30,7 +30,7 @@ namespace CampusAppWP8.File.Exams
         /// <param name="fileName">Filename of the file.</param>
         /// <param name="url">     URL of the document.</param>
         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
         /// <remarks>Stubbfel, 03.09.2013.</remarks>
         public void SaveAndLaunchFile()
         {
-            if (this.file.Exist())
+            if (this.File.Exist())
             {
                 this.LaunchFile();
             }

CampusAppWP8/CampusAppWP8/File/Places/PlacesFile.cs

@@ -22,7 +22,7 @@ namespace CampusAppWP8.File.Places
         /// <summary>Initializes a new instance of the PlacesFile class.</summary>
         /// <remarks>Stubbfel, 09.09.2013.</remarks>
         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);

CampusAppWP8/CampusAppWP8/Model/BinaryModel.cs

@@ -8,6 +8,8 @@
 
 namespace CampusAppWP8.Model
 {
+    using CampusAppWPortalLib8.Model;
+
     /// <summary>Binary model.</summary>
     /// <remarks>Stubbfel, 03.09.2013.</remarks>
     public abstract class BinaryModel : MainModel<byte[]>

CampusAppWP8/CampusAppWP8/Model/Campusmap/CBMainMapModel.cs

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

CampusAppWP8/CampusAppWP8/Model/Exams/ExamListWp8Model.cs

@@ -0,0 +1,18 @@
+//-----------------------------------------------------------------------
+// <copyright file="ExamListWp8Model.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>02.09.2013</sience>
+//----------------------------------------------------------------------
+namespace CampusAppWP8.Model.Exams
+{
+    using System.Xml.Serialization;
+
+    /// <summary>Exam list model.</summary>
+    /// <remarks>Stubbfel, 02.09.2013.</remarks>
+    [XmlRoot("links")]
+    public class ExamListWp8Model : CampusAppWPortalLib8.Model.Exams.ExamListModel<ExamWp8Model>
+    {
+    }
+}

CampusAppWP8/CampusAppWP8/Model/Exams/ExamWp8Model.cs

@@ -0,0 +1,30 @@
+//-----------------------------------------------------------------------
+// <copyright file="ExamWp8Model.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>02.09.2013</sience>
+//----------------------------------------------------------------------
+namespace CampusAppWP8.Model.Exams
+{
+    using CampusAppWP8.Utility;
+
+    /// <summary>Exam model.</summary>
+    /// <remarks>Stubbfel, 02.09.2013.</remarks>
+    public class ExamWp8Model : CampusAppWPortalLib8.Model.Exams.ExamModel
+    {
+        #region Property
+
+        /// <summary>Gets the caption.</summary>
+        /// <value>The caption.</value>
+        public string Caption
+        {
+            get
+            {
+                return Wp8StringManager.StripAndDecodeHTML(this.CourseText + " (" + this.Type + "/" + this.Version + ")");
+            }
+        }
+
+        #endregion
+    }
+}

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

CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8Activity.cs

@@ -0,0 +1,79 @@
+//-----------------------------------------------------------------------
+// <copyright file="LectureWp8Activity.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>13.06.2013</sience>
+//----------------------------------------------------------------------
+namespace CampusAppWP8.Model.Lecture
+{
+    using CampusAppWP8.Resources;
+    using CampusAppWPortalLib8.Model.Lecture;
+
+    /// <summary>
+    /// Model for a Activity
+    /// </summary>
+    public class LectureWp8Activity : LectureActivity
+    {
+        #region Members
+
+        /// <summary>URL of the icon.</summary>
+        private string iconUrl;
+
+        #endregion
+
+        #region Proberty
+
+        /// <summary>Gets URL of the icon.</summary>
+        /// <value>The icon URL.</value>
+        public string IconUrl
+        {
+            get
+            {
+                this.CreateIconUrl();
+                return this.iconUrl;
+            }
+        }
+        #endregion
+
+        #region Methods
+
+        #region private
+
+        /// <summary>Creates icon URL.</summary>
+        /// <remarks>Stubbfel, 12.09.2013.</remarks>
+        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
+    }
+}

CampusAppWP8/CampusAppWP8/Model/Lecture/LectureWp8List.cs

@@ -0,0 +1,34 @@
+//-----------------------------------------------------------------------
+// <copyright file="LectureWp8List.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>10.06.2013</sience>
+//----------------------------------------------------------------------
+namespace CampusAppWP8.Model.Lecture
+{
+    using System.Linq;
+    using System.Xml.Serialization;
+
+    /// <summary>
+    /// Model for a List of LectureActivity
+    /// </summary>
+    [XmlRoot("lsf_auszug")]
+    public class LectureWp8List : CampusAppWPortalLib8.Model.Lecture.LectureList<LectureWp8Activity>
+    {
+        #region Methods
+
+        /// <summary>
+        /// Method return a certain activity
+        /// </summary>
+        /// <param name="id"> id of the  activity</param>
+        /// <returns> the activity (FirstOrDefault)</returns>
+        public new LectureWp8Activity GetActivity(int id)
+        {
+            LectureWp8Activity activity = this.Activities.Where(p => p.Id == id).FirstOrDefault();
+            return base.GetActivity(id) as LectureWp8Activity;
+        }
+
+        #endregion
+    }
+}

CampusAppWP8/CampusAppWP8/Model/MainModel.cs

@@ -5,60 +5,20 @@
 // <author>fiedlchr</author>
 // <sience>05.07.2013</sience>
 //-----------------------------------------------------------------------------
-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;
+
     /// <summary>
     /// Base model io handling class.
     /// </summary>
     /// <typeparam name="T">model type</typeparam>
-    public abstract class MainModel<T>
+    public abstract class MainModel<T> : AbstractMainModel<T>
     {
-        #region Member
-
-        /// <summary>
-        /// File object.
-        /// </summary>
-        protected CampusAppWP8.Utility.File file = null;
-
-        /// <summary>
-        /// Model io type.
-        /// </summary>
-        private ModelType modelType;
-
-        /// <summary>
-        /// Model object.
-        /// </summary>
-        private T model = default(T);
-
-        /// <summary>
-        /// Web object.
-        /// </summary>
-        private HttpRequest api = null;
-
-        /// <summary>
-        /// Filename of saved data.
-        /// </summary>
-        private string fileName = string.Empty;
-
-        /// <summary>
-        /// Url of the feed data.
-        /// </summary>
-        private Uri httpApiUri = null;
-
-        /// <summary>
-        /// Parameterized uri of the feed.
-        /// </summary>
-        private Uri paramizedUri = null;
-
-        #endregion
-
         #region Constructor
 
         /// <summary>
@@ -68,8 +28,8 @@ namespace CampusAppWP8
         /// <param name="fileName">name of the file</param>
         /// <param name="url">url of the feed</param>
         public MainModel(ModelType modelType, string fileName, string url)
+            : base(modelType, fileName, url)
         {
-            this.Init(modelType, fileName, url);
         }
 
         /// <summary>
@@ -78,42 +38,14 @@ namespace CampusAppWP8
         /// <param name="modelType">Model IO type</param>
         /// <param name="sourceName">name of the file or the url of the feed</param>
         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
 
-        /// <summary>
-        /// Delegate of the OnIO callback function.
-        /// </summary>
-        public delegate void OnIO();
-
-        /// <summary>
-        /// Delegate of the OnFailed(File/Web) callback function.
-        /// </summary>
-        public delegate void OnFailed();
-
-        /// <summary>
-        /// Delegate of the IsModelUpToDate callback function.
-        /// </summary>
-        /// <param name="model">data model</param>
-        /// <returns>true, model is up to date</returns>
-        public delegate bool IsModelUpToDate(T model);
-
         /// <summary>
         /// Delegate of the IsFileUpToDate callback function.
         /// </summary>
@@ -122,47 +54,6 @@ namespace CampusAppWP8
         /// <returns>true, is file is up to date</returns>
         public delegate bool IsFileUpToDate(T model, FileInfo fileInfo);
 
-        /// <summary>
-        /// Callback pointer, called before loading.
-        /// </summary>
-        public event OnIO OnLoading = null;
-
-        /// <summary>
-        /// Callback pointer, called after loading.
-        /// </summary>
-        public event OnIO OnLoaded = null;
-
-        /// <summary>
-        /// Callback pointer, called before saving.
-        /// </summary>
-        public event OnIO OnSaving = null;
-
-        /// <summary>
-        /// Callback pointer, called after saving.
-        /// </summary>
-        public event OnIO OnSaved = null;
-
-        /// <summary>
-        /// Callback pointer, called after failed file loading.
-        /// </summary>
-        public event OnFailed OnFailedFile = null;
-
-        /// <summary>
-        /// Callback pointer, called after failed web loading.
-        /// </summary>
-        public event OnFailed OnFailedWeb = null;
-
-        /// <summary>
-        /// Callback pointer, called after failed file or web loading, if there
-        /// is no specialized onFailed callback set.
-        /// </summary>
-        public event OnFailed OnFailedLoad = null;
-
-        /// <summary>
-        /// Callback pointer, called after failed saving data to file.
-        /// </summary>
-        public event OnFailed OnFailedSave = null;
-
         /// <summary>
         /// Callback pointer, for checking if file is up to date at loading.
         /// </summary>
@@ -173,314 +64,123 @@ namespace CampusAppWP8
         /// </summary>
         public event IsFileUpToDate IsFileUpToDateOnSave = null;
 
-        /// <summary>
-        /// Callback pointer, for checking if model is up to date at loading.
-        /// </summary>
-        public event IsModelUpToDate IsModelUpToDateOnLoad = null;
-
-        /// <summary>
-        /// Callback pointer, for checking if model is up to date at saving.
-        /// (currently unused)
-        /// </summary>
-        public event IsModelUpToDate IsModelUpToDateOnSave = null;
-
         #endregion
 
-        #region Enum
+        #region property
 
         /// <summary>
-        /// Specifies the I/O type of the model.
+        /// Gets or sets the file
         /// </summary>
-        public enum ModelType
-        {
-            /// <summary>
-            /// Invalid/unset state.
-            /// </summary>
-            INVALID = 0,
-
-            /// <summary>
-            /// File only (01).
-            /// </summary>
-            File = 1,
-
-            /// <summary>
-            /// Feed only (10).
-            /// </summary>
-            Feed = 2,
-
-            /// <summary>
-            /// File and feed (11).
-            /// </summary>
-            FileAndFeed = 3
-        }
-
-        /// <summary>Values that represent ForceType for load function.</summary>
-        public enum ForceType
-        {
-            /// <summary>An enumeration constant representing the invalid/default/unset option.</summary>
-            INVALID = 0,
-
-            /// <summary>An enumeration constant representing the force file option.</summary>
-            FORCE_FILE = 1,
-
-            /// <summary>An enumeration constant representing the force web option.</summary>
-            FORCE_WEB = 2
-        }
-
-        #endregion
-
-        #region Property
-
-        /// <summary>
-        /// Gets or sets the Model.
-        /// </summary>
-        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;
             }
         }
 
+        /// <summary>
+        /// Gets or sets the api
+        /// </summary>
+        public new HttpRequest Api
+        {
+            get
+            {
+                return (HttpRequest)base.Api;
+            }
+
+            protected set
+            {
+                base.Api = value;
+            }
+        }
         #endregion
 
         #region Method
 
-        #region public
-
-        /// <summary>
-        /// Forces a update from web.
-        /// </summary>
-        public void ForceWebUpdate()
-        {
-            this.LoadData(ForceType.FORCE_WEB);
-        }
-
-        /// <summary>
-        /// Forces a update from file.
-        /// </summary>
-        public void ForceReadFile()
-        {
-            this.LoadData(ForceType.FORCE_FILE);
-        }
-
-        /// <summary>
-        /// Load the data if necessary, from web or from file, regarding if
-        /// the file data is up to date.
-        /// </summary>
-        /// <param name="force">if set/not invalid/not default, force to load from web or file</param>
-        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);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Save the model data if necessary.
-        /// </summary>
-        /// <param name="force">force saving. DEFAULT: false</param>
-        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);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Return the model io type.
-        /// </summary>
-        /// <returns>model io type</returns>
-        public ModelType GetModelType()
-        {
-            return this.modelType;
-        }
-
-        /// <summary>
-        /// Return the model.
-        /// </summary>
-        /// <returns>model object</returns>
-        public T GetModel()
-        {
-            return this.model;
-        }
-
-        /// <summary>
-        /// Create the parameterized uri.
-        /// </summary>
-        /// <param name="parameters">uri parameter list</param>
-        public void SetUriParams(List<UrlParamModel> parameters)
-        {
-            if (this.api != null)
-            {
-                this.paramizedUri = this.api.CreateGetUrl(parameters);
-            }
-        }
-
-        /// <summary>
-        /// Clear the parameterized uri.
-        /// </summary>
-        public void ClearUriParams()
-        {
-            this.paramizedUri = null;
-        }
-
-        #endregion
-
         #region protected
 
         /// <summary>
-        /// Abstract declaration of the model deserialize function.
+        /// Method overrides the base CheckLoadFileIsNotUpToDate Method
         /// </summary>
-        /// <param name="modelData">model data as byte array</param>
-        /// <returns>true, is succeeded</returns>
-        protected abstract bool DeserializeModel(byte[] modelData);
-
-        /// <summary>
-        /// Abstract declaration of the model serialize function. 
-        /// </summary>
-        /// <returns>model data as byte array</returns>
-        protected abstract byte[] SerializeModel();
-
-        /// <summary>
-        /// Check if the model io type is file.
-        /// </summary>
-        /// <returns>true, if the model io type has file.</returns>
-        protected bool IsFile()
+        /// <returns>true if it is not up-to-date, otherwise false</returns>
+        protected override bool CheckLoadFileIsNotUpToDate()
         {
-            bool retValue = false;
-
-            if ((this.modelType & ModelType.File) != 0)
-            {
-                retValue = true;
-            }
-
-            return retValue;
+            return this.CheckIsNotUpToDate(this.IsFileUpToDateOnLoad);
         }
 
         /// <summary>
-        /// Check if the model io type is feed.
+        /// Method overrides the base CheckSaveFileIsNotUpToDate Method
         /// </summary>
-        /// <returns>true if the model io type has feed.</returns>
-        protected bool IsHttpApi()
+        /// <returns>true if it is not up-to-date, otherwise false</returns>
+        protected override bool CheckSaveFileIsNotUpToDate()
+        {
+            return this.CheckIsNotUpToDate(this.IsFileUpToDateOnSave);
+        }
+
+        /// <summary>
+        ///  Method overrides the base SendHttpGet Method
+        /// </summary>
+        /// <param name="url">the url</param>
+        protected override void SendHttpGet(Uri url)
+        {
+            ((HttpRequest)this.Api).HttpGet(url, this.OnLoadDataComplete);
+        }
+
+        /// <summary>
+        /// Initializes the file object.
+        /// </summary>
+        protected override void InitFile()
+        {
+            if ((this.IsFile() == true)
+            && (this.File == null))
+            {
+                this.File = new CampusAppWP8.Utility.File(this.FileName);
+            }
+        }
+
+        /// <summary>
+        /// Initializes the web object.
+        /// </summary>
+        protected override void InitHttpApi()
+        {
+            if ((this.IsHttpApi() == true)
+            && (this.Api == null))
+            {
+                this.Api = new HttpRequest(this.HttpApiUri);
+            }
+        }
+
+        /// <summary>Check if model or file is not up to date.</summary>
+        /// <param name="checkFunc">The check function.</param>
+        /// <returns>true if model or file is not up to date, false if it is.</returns>
+        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
 
-        /// <summary>
-        /// Initialize the class. Is called by the constructors.
-        /// </summary>
-        /// <param name="modelType">model IO type</param>
-        /// <param name="fileName">name of the data file</param>
-        /// <param name="url">url of the feed data</param>
-        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();
-            }
-        }
-
-        /// <summary>
-        /// Initializes the file object.
-        /// </summary>
-        private void InitFile()
-        {
-            if ((this.IsFile() == true)
-            && (this.file == null))
-            {
-                this.file = new CampusAppWP8.Utility.File(this.fileName);
-            }
-        }
-
-        /// <summary>
-        /// Initializes the web object.
-        /// </summary>
-        private void InitHttpApi()
-        {
-            if ((this.IsHttpApi() == true)
-            && (this.api == null))
-            {
-                this.api = new HttpRequest(this.httpApiUri);
-            }
-        }
-
         /// <summary>
         /// Is called after the loading from web is complete.
         /// </summary>
@@ -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();
             }
         }
 
-        /// <summary>
-        /// Executes the on i/o callback operation.
-        /// </summary>
-        /// <param name="callbackFunc">The callback function.</param>
-        private void RunOnIOCallback(OnIO callbackFunc)
-        {
-            if (callbackFunc != null)
-            {
-                callbackFunc();
-            }
-        }
-
-        /// <summary>Executes the on failed callback operation.</summary>
-        /// <param name="specialFunc">The special function.</param>
-        /// <param name="defaultFunc">The default function.</param>
-        private void RunOnFailedCallback(OnFailed specialFunc, OnFailed defaultFunc)
-        {
-            if (specialFunc != null)
-            {
-                specialFunc();
-            }
-            else if (defaultFunc != null)
-            {
-                defaultFunc();
-            }
-        }
-
-        /// <summary>Check if model or file is not up to date.</summary>
-        /// <param name="checkFunc">The check function.</param>
-        /// <returns>true if model or file is not up to date, false if it is.</returns>
-        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

CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursInstitutionWp8Model.cs

@@ -0,0 +1,156 @@
+//-----------------------------------------------------------------------------
+// <copyright file="OpeninghoursInstitutionWp8Model.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>fiedlchr</author>
+// <sience>24.06.2013</sience>
+//-----------------------------------------------------------------------------
+
+namespace CampusAppWP8.Model.Openinghours
+{
+    using System.Globalization;
+    using System.Windows;
+    using System.Xml.Serialization;
+    
+    /// <summary>
+    ///  Model for menu
+    /// </summary>
+    public class OpeninghoursInstitutionWp8Model : CampusAppWPortalLib8.Model.Openinghours.OpeninghoursInstitutionModel
+    {
+        #region Property       
+
+        /// <summary>
+        /// Gets the visibility state of the monday TextBlock.
+        /// </summary>
+        public Visibility VisibleMonday
+        {
+            get
+            {
+                return ((this.Monday == string.Empty) || (this.Monday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the tuesday TextBlock.
+        /// </summary>
+        public Visibility VisibleTuesday
+        {
+            get
+            {
+                return ((this.Tuesday == string.Empty) || (this.Tuesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the wednesday TextBlock.
+        /// </summary>
+        public Visibility VisibleWednesday
+        {
+            get
+            {
+                return ((this.Wednesday == string.Empty) || (this.Wednesday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the thursday TextBlock.
+        /// </summary>
+        public Visibility VisibleThursday
+        {
+            get
+            {
+                return ((this.Thursday == string.Empty) || (this.Thursday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the friday TextBlock.
+        /// </summary>
+        public Visibility VisibleFriday
+        {
+            get
+            {
+                return ((this.Friday == string.Empty) || (this.Friday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the saturday TextBlock.
+        /// </summary>
+        public Visibility VisibleSaturday
+        {
+            get
+            {
+                return ((this.Saturday == string.Empty) || (this.Saturday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the sunday TextBlock.
+        /// </summary>
+        public Visibility VisibleSunday
+        {
+            get
+            {
+                return ((this.Sunday == string.Empty) || (this.Sunday.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the comment.
+        /// </summary>
+        public Visibility VisibleComment
+        {
+            get
+            {
+                return ((this.Comment == string.Empty) || (this.Comment.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the email address.
+        /// </summary>
+        public Visibility VisibleEMail
+        {
+            get
+            {
+                return ((this.EMail == string.Empty) || (this.EMail.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the phone number.
+        /// </summary>
+        public Visibility VisiblePhone
+        {
+            get
+            {
+                return ((this.Phone == string.Empty) || (this.Phone.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the room.
+        /// </summary>
+        public Visibility VisibleRoom
+        {
+            get
+            {
+                return ((this.Room == string.Empty) || (this.Room.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        /// <summary>
+        /// Gets the visibility state of the building.
+        /// </summary>
+        public Visibility VisibleBuilding
+        {
+            get
+            {
+                return ((this.Building == string.Empty) || (this.Building.Length == 0)) ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        #endregion
+            }
+}

CampusAppWP8/CampusAppWP8/Model/Openinghours/OpeninghoursWp8Model.cs

@@ -0,0 +1,20 @@
+//-----------------------------------------------------------------------------
+// <copyright file="OpeninghoursWp8Model.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>fiedlchr</author>
+// <sience>24.06.2013</sience>
+//-----------------------------------------------------------------------------
+
+namespace CampusAppWP8.Model.Openinghours
+{
+    using System.Xml.Serialization;
+
+    /// <summary>
+    /// Model for opening hours.
+    /// </summary>
+    [XmlRoot("root")]
+    public class OpeninghoursWp8Model : CampusAppWPortalLib8.Model.Openinghours.OpeninghoursModel<OpeninghoursInstitutionWp8Model>
+    {
+    }
+}

CampusAppWP8/CampusAppWP8/Model/Person/PersonFunctionWp8Model.cs

@@ -0,0 +1,77 @@
+//-----------------------------------------------------------------------------
+// <copyright file="PersonFunctionWp8Model.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>05.09.2013</sience>
+//-----------------------------------------------------------------------------
+namespace CampusAppWP8.Model.Person
+{
+    using System.Xml.Serialization;
+    using CampusAppWP8.Utility;
+
+    /// <summary>Person function model.</summary>
+    /// <remarks>Stubbfel, 05.09.2013.</remarks>
+    public class PersonFunctionWp8Model : CampusAppWPortalLib8.Model.Person.PersonFunctionModel
+    {
+        #region Property
+
+        /// <summary>Gets or sets the function.</summary>
+        /// <value>The function.</value>
+        [XmlAttribute("funktion")]
+        public new string Function
+        {
+            get
+            {
+                return base.Function;
+            }
+
+            set
+            {
+                if (value != this.Function)
+                {
+                    base.Function = Wp8StringManager.StripAndDecodeHTML(value);
+                }
+            }
+        }
+
+        /// <summary>Gets or sets the appointment.</summary>
+        /// <value>The appointment.</value>
+        [XmlAttribute("einrichtung")]
+        public new string Appointment
+        {
+            get
+            {
+                return base.Appointment;
+            }
+
+            set
+            {
+                if (value != this.Appointment)
+                {
+                    base.Appointment = Wp8StringManager.StripAndDecodeHTML(value);
+                }
+            }
+        }
+
+        /// <summary>Gets or sets the building.</summary>
+        /// <value>The building.</value>
+        [XmlAttribute("gebaeude")]
+        public new string Building
+        {
+            get
+            {
+                return base.Building;
+            }
+
+            set
+            {
+                if (value != this.Building)
+                {
+                    base.Building = Wp8StringManager.StripAndDecodeHTML(value);
+                }
+            }
+        }
+        #endregion
+    }
+}

CampusAppWP8/CampusAppWP8/Model/Person/PersonListWp8Model.cs

@@ -0,0 +1,29 @@
+//-----------------------------------------------------------------------------
+// <copyright file="PersonListWp8Model.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>05.09.2013</sience>
+//-----------------------------------------------------------------------------
+
+namespace CampusAppWP8.Model.Person
+{
+    using System.Xml.Serialization;
+    using CampusAppWPortalLib8.Model.Person;
+
+    /// <summary>Person list model.</summary>
+    /// <remarks>Stubbfel, 05.09.2013.</remarks>
+    [XmlRoot("Uebersicht")]
+    public class PersonListWp8Model : CampusAppWPortalLib8.Model.Person.PersonListModel<PersonWp8Model>
+    {
+        /// <summary>Gets a person.</summary>
+        /// <remarks>Stubbfel, 05.09.2013.</remarks>
+        /// <param name="id">The identifier.</param>
+        /// <returns>The person.</returns>
+        public new PersonWp8Model GetPerson(string id)
+        {
+            IPersonModel<IPersonFunctionModel> tmpPerson = base.GetPerson(id);
+            return tmpPerson as PersonWp8Model;
+        }
+    }
+}

CampusAppWP8/CampusAppWP8/Model/Person/PersonWp8Model.cs

@@ -0,0 +1,77 @@
+//-----------------------------------------------------------------------------
+// <copyright file="PersonWp8Model.cs" company="BTU/IIT">
+//     Company copyright tag.
+// </copyright>
+// <author>stubbfel</author>
+// <sience>05.09.2013</sience>
+//-----------------------------------------------------------------------------
+namespace CampusAppWP8.Model.Person
+{
+    using System.Xml.Serialization;
+    using CampusAppWP8.Utility;    
+
+    /// <summary>Person model.</summary>
+    /// <remarks>Stubbfel, 05.09.2013.</remarks>
+    public class PersonWp8Model : CampusAppWPortalLib8.Model.Person.PersonModel<PersonFunctionWp8Model>
+    {
+        #region property
+
+        /// <summary>Gets or sets the akadgrad.</summary>
+        /// <value>The akadgrad.</value>
+        [XmlAttribute("akadgrad")]
+        public new string Akadgrad
+        {
+            get
+            {
+                return base.Akadgrad;
+            }
+
+            set
+            {
+                if (value != this.Akadgrad)
+                {
+                    base.Akadgrad = Wp8StringManager.StripAndDecodeHTML(value);
+                }
+            }
+        }
+
+        /// <summary>Gets or sets the name of the sur.</summary>
+        /// <value>The name of the sur.</value>
+        [XmlAttribute("nachname")]
+        public new string SurName
+        {
+            get
+            {
+                return base.SurName;
+            }
+
+            set
+            {
+                if (value != this.SurName)
+                {
+                    base.SurName = Wp8StringManager.StripAndDecodeHTML(value);
+                }
+            }
+        }
+
+        /// <summary>Gets or sets the person's first name.</summary>
+        /// <value>The name of the first.</value>
+        [XmlAttribute("vorname")]
+        public new string FirstName
+        {
+            get
+            {
+                return base.FirstName;
+            }
+
+            set
+            {
+                if (value != this.FirstName)
+                {
+                    base.FirstName = Wp8StringManager.StripAndDecodeHTML(value);
+                }
+            }
+        }
+        #endregion
+    }
+}

CampusAppWP8/CampusAppWP8/Model/Setting/AppSettings.cs

@@ -109,6 +109,21 @@ namespace CampusAppWP8.Model.Setting
             }
         }
 
+        /// <summary>
+        /// Gets or sets the DeploymentNumber of the app
+        /// </summary>
+        public int DeploymentNumber
+        {
+            get
+            {
+                return App.LoadFromAppState<int>(Constants.AppSetting_DeploymentNumber);
+            }
+            set
+            {
+                App.SaveToAppState<int>(Constants.AppSetting_DeploymentNumber,value);
+            }
+        }
+
         #endregion
     }
 }

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

CampusAppWP8/CampusAppWP8/Model/Utility/CourseListPickerItemListWp8Model.cs

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

CampusAppWP8/CampusAppWP8/Model/XmlModel.cs

@@ -9,12 +9,14 @@ namespace CampusAppWP8.Model
 {    
     using System.Text;
     using CampusAppWPortalLib8.Utility;
+    using CampusAppWPortalLib8.Model;
+    using CampusAppWPortalLib8.Resources;
     
     /// <summary>
     /// Xml model io handler class.
     /// </summary>
     /// <typeparam name="T">model type</typeparam>
-    public abstract class XmlModel<T> : MainModel<T>
+    public abstract class XmlModel<T> : MainModel<T>, 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;
         }
 
         /// <summary>
@@ -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
 
         /// <summary>
         /// Gets or sets for the name of the root-tag
         /// </summary>
-        protected string ValidRootName { get; set; }
+        public string ValidRootName { get; set; }
+
+        #endregion
+
+        #region Method
 
         /// <summary>
         /// Create the model from a xml byte array.

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;
 
     /// <summary>
@@ -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<DepartmentModel>(Constants.IsolatedStorage_DepartmentFavoriteModel, DepartmentIndexPage.FavoriteFile.GetModel());
+                App.SaveToIsolatedStorage<DepartmentModel>(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);
             }

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<Model.Departments.DepartmentModel>());
-        
+            DepartmentIndexPage.feed.LoadData(Utilities.GetLoadModus<CampusAppWPortalLib8.Model.Departments.DepartmentModel>());
+
             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
         /// </summary>
         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
         /// </summary>
         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"));
             }
         }
 

CampusAppWP8/CampusAppWP8/Pages/Departments/DepartmentPage.xaml

@@ -17,10 +17,6 @@
 
     <!-- LayoutRoot -->
     <Grid x:Name="LayoutRoot" Background="Transparent">
-        <Grid.DataContext>
-            <viewModel:DepartmentModel />
-        </Grid.DataContext>
-
         <ProgressBar x:Name="progressBar" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Collapsed" IsIndeterminate="True"/>
         <!-- Pivot -->
         <phone:Pivot x:Name="DepartmentPivot" Title="{Binding Path=LocalizedResources.DepartmentApp_Title, Source={StaticResource LocalizedStrings}}" ItemsSource="{Binding Faculties}">

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;
 
     /// <summary>
@@ -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<DepartmentModel>(Constants.IsolatedStorage_DepartmentModel, DepartmentIndexPage.Feed.GetModel());
+                App.SaveToIsolatedStorage<DepartmentModel>(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);
             }
         }
 

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<CameraOperationCompletedEventArgs>(this.Cam_Initialized);
                 this.cam.AutoFocusCompleted += new EventHandler<CameraOperationCompletedEventArgs>(this.Cam_AutoFocusCompl);
@@ -176,7 +176,7 @@ namespace CampusAppWP8.Pages.Dev
         /// <param name="e">Camera operation completed event information.</param>
         private void Cam_AutoFocusCompl(object sender, CameraOperationCompletedEventArgs e)
         {
-            this.isInAutofocus = false;
+            //this.isInAutofocus = false;
         }
 
         /// <summary>
@@ -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();
+            }
         }
 
         /// <summary>
@@ -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);
             }

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<RSSViewModel>(Constants.IsolatedStorage_EventRSSModel, EventIndexPage.GetEventFeed().GetModel());
+                App.SaveToIsolatedStorage<RSSViewModel>(Constants.IsolatedStorage_EventRSSModel, EventIndexPage.GetEventFeed().Model);
             }
 
             if (this.synth != null)
@@ -222,7 +222,7 @@ namespace CampusAppWP8.Pages.Events
             {
                 string ssmlPrompt = "<speak version=\"1.0\" ";
                 ssmlPrompt += "xmlns=\"http://www.w3.org/2001/10/synthesis\" xml:lang=\"de-DE\">";
-                ssmlPrompt += EventIndexPage.GetEventFeed().GetModel().Channel[0].Item[this.EventPivot.SelectedIndex].Text;
+                ssmlPrompt += EventIndexPage.GetEventFeed().Model.Channel[0].Item[this.EventPivot.SelectedIndex].Text;
                 ssmlPrompt += "</speak>";
 
                 this.isInSpeech = true;

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

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;
+
 
     /// <summary>
     /// Class for the LecturePage
@@ -73,7 +73,7 @@ namespace CampusAppWP8.Pages.Lecture
             {
                 // delete all models
                 App.SaveToIsolatedStorage<LecturePageModel>(Constants.IsolatedStorage_LecturePageModel, null);
-                App.SaveToIsolatedStorage<LectureList>(Constants.IsolatedStorage_LectureModel, null);
+                App.SaveToIsolatedStorage<LectureWp8List>(Constants.IsolatedStorage_LectureModel, null);
             }
             else
             {
@@ -207,7 +207,7 @@ namespace CampusAppWP8.Pages.Lecture
                 this.api.Model.FilterByCourseTitle(query);
             }
 
-            App.SaveToIsolatedStorage<LectureList>(Constants.IsolatedStorage_LectureModel, this.api.Model);
+            App.SaveToIsolatedStorage<LectureWp8List>(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);

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);

CampusAppWP8/CampusAppWP8/Pages/Lecture/ResultDetailPage.xaml.cs

@@ -57,10 +57,10 @@ namespace CampusAppWP8.Pages.Lecture
         /// <param name="activityId">id of the activity</param>
         private void LoadActivity(int activityId) 
         {
-            LectureList list = App.LoadFromIsolatedStorage<LectureList>(Constants.IsolatedStorage_LectureModel);
+            LectureWp8List list = App.LoadFromIsolatedStorage<LectureWp8List>(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
-
     }
 }

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<LectureList>(Constants.IsolatedStorage_LectureModel);
+            LectureWp8List list = App.LoadFromIsolatedStorage<LectureWp8List>(Constants.IsolatedStorage_LectureModel);
             if (list == null)
             {
                 Uri url = new Uri(Constants.PathLecture_LecturePage, UriKind.Relative);